Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles

composer.json

@@ -54,6 +54,9 @@
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "fakerphp/faker": "^1.13",
         "nelmio/alice": "^3.8",
+        "phpstan/extension-installer": "^1.1",
+        "phpstan/phpstan": "^1.0",
+        "phpstan/phpstan-strict-rules": "^1.0",
         "phpunit/phpunit": "^7.0",
         "symfony/debug-bundle": "^5.1",
         "symfony/dotenv": "^5.1",

phpstan.neon.dist

@@ -0,0 +1,21 @@
+parameters:
+    level: 1
+    paths:
+        - src/
+    excludePaths:
+        - src/Bundle/*/Tests/*
+        - src/Bundle/*/Test/*
+        - src/Bundle/*/config/*
+        - src/Bundle/*/migrations/*
+        - src/Bundle/*/translations/*
+        - src/Bundle/*/Resources/*
+        - src/Bundle/*/src/Tests/*
+        - src/Bundle/*/src/Test/*
+        - src/Bundle/*/src/config/*
+        - src/Bundle/*/src/migrations/*
+        - src/Bundle/*/src/translations/*
+        - src/Bundle/*/src/Resources/*
+
+includes:
+    - phpstan-baseline.neon
+

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php

@@ -105,12 +105,12 @@ class ActivityTypeAggregator implements AggregatorInterface
         return new Role(ActivityStatsVoter::STATS);
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): \Closure
     {
         // for performance reason, we load data from db only once
         $this->typeRepository->findBy(array('id' => $values));
 
-        return function($value) use ($data) {
+        return function($value): string {
             if ($value === '_header') {
                 return 'Activity type';
             }
@@ -120,12 +120,11 @@ class ActivityTypeAggregator implements AggregatorInterface
 
             return $this->stringHelper->localize($t->getName());
         };
-        
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
-        return array(self::KEY);
+        return [self::KEY];
     }
 
 }

src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php

@@ -19,8 +19,6 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
 {
     /**
      * {@inheritdoc}
-     *
-     * @phpstan-ignore-next-line
      */
     public function load(array $configs, ContainerBuilder $container): void
     {

src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php

@@ -30,7 +30,9 @@ final class CategoryRender implements ChillEntityRenderInterface
     {
         $options = array_merge(self::DEFAULT_ARGS, $options);
 
-        $titles[] = $this->translatableStringHelper->localize($asideActivityCategory->getTitle());
+        $titles = [
+            $this->translatableStringHelper->localize($asideActivityCategory->getTitle()),
+        ];
 
         while ($asideActivityCategory->hasParent()) {
             $asideActivityCategory = $asideActivityCategory->getParent();

src/Bundle/ChillCalendarBundle/Controller/CalendarController.php

@@ -97,9 +97,9 @@ class CalendarController extends AbstractController
                 'calendarItems' => $calendarItems,
                 'user' => $user
             ]);
+        }
 
-        } elseif ($accompanyingPeriod instanceof AccompanyingPeriod) {
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-
             $total = $this->calendarRepository->countByAccompanyingPeriod($accompanyingPeriod);
             $paginator = $this->paginator->create($total);
             $calendarItems = $this->calendarRepository->findBy(
@@ -117,6 +117,8 @@ class CalendarController extends AbstractController
                 'paginator' => $paginator
             ]);
         }
+
+        throw new \Exception('Unable to list actions.');
     }
 
     /**

src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php

@@ -46,7 +46,11 @@ class ChillCustomFieldsExtension extends Extension implements PrependExtensionIn
     public function prepend(ContainerBuilder $container)
     {
         // add form layout to twig resources
-        $twigConfig['form_themes'][] = 'ChillCustomFieldsBundle:Form:fields.html.twig';
+        $twigConfig = [
+            'form_themes' => [
+                'ChillCustomFieldsBundle:Form:fields.html.twig',
+            ],
+        ];
         $container->prependExtensionConfig('twig', $twigConfig);
 
         //add routes for custom bundle

src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php

@@ -145,5 +145,7 @@ class DocGeneratorTemplateController extends AbstractController
         } catch (TransferException $e) {
             throw $e;
         }
+
+        throw new \Exception('Unable to generate document.');
     }
 }

src/Bundle/ChillDocStoreBundle/EntityRepository/AccompanyingCourseDocumentRepository.php

@@ -1,8 +1,10 @@
 <?php
 
-namespace Chill\DocStoreBundle\Repository;
+declare(strict_types=1);
 
-use App\Entity\AccompanyingCourseDocument;
+namespace Chill\DocStoreBundle\EntityRepository;
+
+use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 

src/Bundle/ChillEventBundle/Controller/ParticipationController.php

@@ -181,7 +181,7 @@ class ParticipationController extends AbstractController
     protected function newMultiple(Request $request)
     {
         $participations = $this->handleRequest($request, new Participation(), true);
-        
+        $ignoredParticipations = $newParticipations = [];
 
         foreach ($participations as $i => $participation) {
             // check for authorization
@@ -209,7 +209,7 @@ class ParticipationController extends AbstractController
 
         // this is where the function redirect depending on valid participation
 
-        if (!isset($newParticipations)) {
+        if ([] === $newParticipations) {
             // if we do not have nay participants, redirect to event view
             $this->addFlash('error', $this->get('translator')->trans(
                     'None of the requested people may participate '
@@ -222,22 +222,27 @@ class ParticipationController extends AbstractController
             // if we have multiple participations, show a form with multiple participations
             $form = $this->createCreateFormMultiple($newParticipations);
 
-            return $this->render('ChillEventBundle:Participation:new-multiple.html.twig', array(
+            return $this->render(
+                'ChillEventBundle:Participation:new-multiple.html.twig',
+                [
                 'form' => $form->createView(),
                 'participations' => $newParticipations,
-                'ignored_participations' => isset($ignoredParticipations) ? $ignoredParticipations : array()
+                'ignored_participations' => $ignoredParticipations
-            ));
+                ]
-        } else {
+            );
+        }
+
         // if we have only one participation, show the same form than for single participation
         $form = $this->createCreateForm($participation);
 
-            return $this->render('ChillEventBundle:Participation:new.html.twig', array(
+        return $this->render(
+            'ChillEventBundle:Participation:new.html.twig',
+            [
                 'form' => $form->createView(),
                 'participation' => $participation,
-                'ignored_participations' => isset($ignoredParticipations) ? $ignoredParticipations : array()
+                'ignored_participations' => $ignoredParticipations,
-            ));
+            ]
-            
+        );
-        }
     }
 
     /**

src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php

@@ -504,6 +504,8 @@ class ApiController extends AbstractCRUDController
                     $this->getContextForSerializationPostAlter($action, $request, $_format, $entity, [$postedData])
                 );
         }
+
+        throw new \Exception('Unable to handle such request method.');
     }
     
     /**

src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php

@@ -72,6 +72,7 @@ class LoadCountriesCommand extends Command
     public static function prepareCountryList($languages)
     {
         $regionBundle = Intl::getRegionBundle();
+        $countries = [];
 
         foreach ($languages as $language) {
             $countries[$language] = $regionBundle->getCountryNames($language);

src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php

@@ -63,12 +63,13 @@ class LoadLanguages extends AbstractFixture implements ContainerAwareInterface,
     }
 
     /**
-     * prepare names for languages
+     * Prepare names for languages.
      *
-     * @param string $languageCode
      * @return string[] languages name indexed by available language code
      */
-    private function prepareName($languageCode) {
+    private function prepareName(string $languageCode): array {
+        $names = [];
+
         foreach ($this->container->getParameter('chill_main.available_languages') as $lang) {
             $names[$lang] = Intl::getLanguageBundle()->getLanguageName($languageCode);
         }

src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ACLFlagsCompilerPass.php

@@ -1,18 +1,15 @@
 <?php
-/*
+
- */
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DependencyInjection\CompilerPass;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Chill\MainBundle\Form\PermissionsGroupType;
 use Symfony\Component\DependencyInjection\Reference;
+use LogicException;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class ACLFlagsCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
@@ -29,7 +26,7 @@ class ACLFlagsCompilerPass implements CompilerPassInterface
                         $permissionGroupType->addMethodCall('addFlagProvider', [ $reference ]);
                         break;
                     default:
-                        throw new \LogicalException(sprintf(
+                        throw new LogicException(sprintf(
                             "This tag 'scope' is not implemented: %s, on service with id %s", $tag['scope'], $id)
                             );
                 }

src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php

@@ -19,14 +19,11 @@ class Configuration implements ConfigurationInterface
 
     use AddWidgetConfigurationTrait;
 
-    /**
+    private ContainerBuilder $containerBuilder;
-     *
-     * @var ContainerBuilder
-     */
-    private $containerBuilder;
 
 
-    public function __construct(array $widgetFactories = array(),
+    public function __construct(
+            array $widgetFactories,
             ContainerBuilder $containerBuilder)
     {
         $this->setWidgetFactories($widgetFactories);

src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php

@@ -124,11 +124,12 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
      * @param string $containerWidgetConfigParameterName the key under which we can use the widget configuration
      * @throws \LogicException
      * @throws \UnexpectedValueException if the given extension does not implement HasWidgetExtensionInterface
-     * @throws \InvalidConfigurationException if there are errors in the config
      */
-    public function doProcess(ContainerBuilder $container, $extension,
+    public function doProcess(
-            $containerWidgetConfigParameterName)
+        ContainerBuilder $container,
-    {
+        $extension,
+        $containerWidgetConfigParameterName
+    ) {
         if (!$container->hasDefinition(self::WIDGET_MANAGER)) {
             throw new \LogicException("the service ".self::WIDGET_MANAGER." should".
                 " be present. It is required by ".self::class);
@@ -171,7 +172,7 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
 
                 // check that the widget is allowed at this place
                 if (!$this->isPlaceAllowedForWidget($place, $alias, $container)) {
-                    throw new \InvalidConfigurationException(sprintf(
+                    throw new InvalidConfigurationException(sprintf(
                         "The widget with alias %s is not allowed at place %s",
                         $alias,
                         $place

src/Bundle/ChillMainBundle/Doctrine/Model/Point.php

@@ -4,13 +4,9 @@ namespace Chill\MainBundle\Doctrine\Model;
 
 use \JsonSerializable;
 
-/**
- * Description of Point
- *
- */
 class Point implements JsonSerializable {
-    private ?float $lat = null;
+    private ?float $lat;
-    private ?float $lon = null;
+    private ?float $lon;
     public static string $SRID = '4326';
 
     private function __construct(?float $lon, ?float $lat)
@@ -22,6 +18,7 @@ class Point implements JsonSerializable {
     public function toGeoJson(): string
     {
         $array = $this->toArrayGeoJson();
+
         return \json_encode($array);
     }
 
@@ -33,60 +30,53 @@ class Point implements JsonSerializable {
     public function toArrayGeoJson(): array
     {
         return [
-            "type" => "Point",
+            'type' => 'Point',
-            "coordinates" => [ $this->lon, $this->lat ]
+            'coordinates' => [$this->lon, $this->lat],
         ];
     }
 
-    /**
-     *
-     * @return string
-     */
     public function toWKT(): string
     {
-        return 'SRID='.self::$SRID.';POINT('.$this->lon.' '.$this->lat.')';
+        return sprintf("SRID=%s;POINT(%s %s)", self::$SRID, $this->lon, $this->lat);
     }
 
-    /**
+    public static function fromGeoJson(string $geojson): self
-     *
-     * @param type $geojson
-     * @return Point
-     */
-    public static function fromGeoJson(string $geojson): Point
     {
         $a = json_decode($geojson);
-        //check if the geojson string is correct
+
-        if (NULL === $a or !isset($a->type) or !isset($a->coordinates)){
+        if (null === $a) {
             throw PointException::badJsonString($geojson);
         }
 
-        if ($a->type != 'Point'){
+        if (null === $a->type || null === $a->coordinates) {
+            throw PointException::badJsonString($geojson);
+        }
+
+        if ($a->type !== 'Point'){
             throw PointException::badGeoType();
         }
 
-        $lat = $a->coordinates[1];
+        [$lon, $lat] = $a->coordinates;
-        $lon = $a->coordinates[0];
 
         return Point::fromLonLat($lon, $lat);
     }
 
-    public static function fromLonLat(float $lon, float $lat): Point
+    public static function fromLonLat(float $lon, float $lat): self
-    {
-        if (($lon > -180 && $lon < 180) && ($lat > -90 && $lat < 90))
     {
+        if (($lon > -180 && $lon < 180) && ($lat > -90 && $lat < 90)) {
             return new Point($lon, $lat);
-        } else {
-            throw PointException::badCoordinates($lon, $lat);
-        }
         }
 
-    public static function fromArrayGeoJson(array $array): Point
+        throw PointException::badCoordinates($lon, $lat);
-    {
+    }
-        if ($array['type'] == 'Point' &&
+
-                isset($array['coordinates']))
+    public static function fromArrayGeoJson(array $array): self
     {
+        if ($array['type'] === 'Point' && isset($array['coordinates'])) {
             return self::fromLonLat($array['coordinates'][0], $array['coordinates'][1]);
         }
+
+        throw new \Exception('Unable to build a point from input data.');
     }
 
     public function getLat(): float

src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php

@@ -51,8 +51,10 @@ class CenterTransformer implements DataTransformerInterface
             }
         }
 
+        $ids = [];
+
         if ($this->multiple) {
-            $ids = \explode(',', $id);
+            $ids = explode(',', $id);
         } else {
             $ids[] = (int) $id;
         }
@@ -68,9 +70,9 @@ class CenterTransformer implements DataTransformerInterface
 
         if ($this->multiple) {
             return new ArrayCollection($centers);
-        } else {
-            return $centers[0];
         }
+
+        return $centers[0];
     }
 
     public function transform($center)

src/Bundle/ChillMainBundle/Repository/UserRepository.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Repository;
 
+use Chill\MainBundle\Entity\GroupCenter;
 use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;

src/Bundle/ChillMainBundle/Search/SearchApi.php

@@ -139,7 +139,7 @@ class SearchApi
         return $nq->getResult();
     }
 
-    private function prepareProviders($rawResults)
+    private function prepareProviders(array $rawResults)
     {
         $metadatas = [];
         foreach ($rawResults as $r) {
@@ -156,8 +156,10 @@ class SearchApi
         }
     }
 
-    private function buildResults($rawResults)
+    private function buildResults(array $rawResults): array
     {
+        $items = [];
+
         foreach ($rawResults as $r) {
             foreach ($this->providers as $k => $p) {
                 if ($p->supportsResult($r['key'], $r['metadata'])) {
@@ -170,6 +172,6 @@ class SearchApi
             }
         }
 
-        return $items ?? [];
+        return $items;
     }
 }

src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverVoter.php

@@ -98,5 +98,7 @@ class PasswordRecoverVoter extends Voter
                 return true;
                 
         }
+
+        return false;
     }
 }

src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\Address;
@@ -12,31 +14,41 @@ class AddressNormalizer implements NormalizerAwareInterface, NormalizerInterface
 {
     use NormalizerAwareTrait;
 
+    /**
+     * @param Address $address
+     */
     public function normalize($address, string $format = null, array $context = [])
     {
-        /** @var Address $address */
+        $data = [
-        $data['address_id'] = $address->getId();
+            'address_id' => $address->getId(),
-        $data['text'] = $address->isNoAddress() ? '' : $address->getStreetNumber().', '.$address->getStreet();
+            'text' => $address->isNoAddress() ? '' : $address->getStreetNumber().', '.$address->getStreet(),
-        $data['street'] = $address->getStreet();
+            'street' => $address->getStreet(),
-        $data['streetNumber'] = $address->getStreetNumber();
+            'streetNumber' => $address->getStreetNumber(),
-        $data['postcode']['id'] = $address->getPostCode()->getId();
+            'postcode' => [
-        $data['postcode']['name'] = $address->getPostCode()->getName();
+                'id' => $address->getPostCode()->getId(),
-        $data['postcode']['code'] = $address->getPostCode()->getCode();
+                'name' => $address->getPostCode()->getName(),
-        $data['country']['id'] = $address->getPostCode()->getCountry()->getId();
+                'code' => $address->getPostCode()->getCode(),
-        $data['country']['name'] = $address->getPostCode()->getCountry()->getName();
+            ],
-        $data['country']['code'] = $address->getPostCode()->getCountry()->getCountryCode();
+            'country' => [
-        $data['floor'] = $address->getFloor();
+                'id' => $address->getPostCode()->getCountry()->getId(),
-        $data['corridor'] = $address->getCorridor();
+                'name' => $address->getPostCode()->getCountry()->getName(),
-        $data['steps'] = $address->getSteps();
+                'code' => $address->getPostCode()->getCountry()->getCountryCode(),
-        $data['flat'] = $address->getFlat();
+            ],
-        $data['buildingName'] = $address->getBuildingName();
+            'floor' => $address->getFloor(),
-        $data['distribution'] = $address->getDistribution();
+            'corridor' => $address->getCorridor(),
-        $data['extra'] = $address->getExtra();
+            'steps' => $address->getSteps(),
-        $data['validFrom'] = $address->getValidFrom();
+            'flat' => $address->getFlat(),
-        $data['validTo'] = $address->getValidTo();
+            'buildingName' => $address->getBuildingName(),
-        $data['addressReference'] = $this->normalizer->normalize($address->getAddressReference(), $format, [
+            'distribution' => $address->getDistribution(),
-            AbstractNormalizer::GROUPS => ['read']
+            'extra' => $address->getExtra(),
-        ]);
+            'validFrom' => $address->getValidFrom(),
+            'validTo' => $address->getValidTo(),
+            'addressReference' => $this->normalizer->normalize(
+                $address->getAddressReference(),
+                $format,
+                [AbstractNormalizer::GROUPS => ['read']]
+            ),
+        ];
 
         return $data;
     }

src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php

@@ -11,30 +11,28 @@ class CollectionNormalizer implements NormalizerInterface, NormalizerAwareInterf
 {
     use NormalizerAwareTrait;
 
+    /**
+     * @param Collection $collection
+     */
+    public function normalize($collection, string $format = null, array $context = [])
+    {
+        $paginator = $collection->getPaginator();
+
+        return [
+            'count' => $paginator->getTotalItems(),
+            'pagination' => [
+                'first' => $paginator->getCurrentPageFirstItemNumber(),
+                'items_per_page' => $paginator->getItemsPerPage(),
+                'next' => $paginator->hasNextPage() ? $paginator->getNextPage()->generateUrl() : null,
+                'previous' => $paginator->hasPreviousPage() ? $paginator->getPreviousPage()->generateUrl() : null,
+                'more' => $paginator->hasNextPage(),
+            ],
+            'results' => $this->normalizer->normalize($collection->getItems(), $format, $context),
+        ];
+    }
+
     public function supportsNormalization($data, string $format = null): bool
     {
         return $data instanceof Collection;
     }
-
-    public function normalize($collection, string $format = null, array $context = [])
-    {
-        /** @var $collection Collection */
-        $paginator = $collection->getPaginator();
-
-        $data['count'] = $paginator->getTotalItems();
-        $pagination['first'] = $paginator->getCurrentPageFirstItemNumber();
-        $pagination['items_per_page'] = $paginator->getItemsPerPage();
-        $pagination['next']  = $paginator->hasNextPage() ? 
-            $paginator->getNextPage()->generateUrl() : null;
-        $pagination['previous'] = $paginator->hasPreviousPage() ?
-            $paginator->getPreviousPage()->generateUrl() : null;
-        $pagination['more'] = $paginator->hasNextPage();
-        $data['pagination'] = $pagination;
-
-        // normalize results
-        $data['results'] = $this->normalizer->normalize($collection->getItems(),
-            $format, $context);
-
-        return $data;
-    }
 }

src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php

@@ -291,11 +291,12 @@ class TimelineBuilder implements ContainerAwareInterface
                     $entitiesByType[$result['type']][$result['id']], //the entity
                     $context,
                     $args);
-            $timelineEntry['date'] = new \DateTime($result['date']);
-            $timelineEntry['template'] = $data['template'];
-            $timelineEntry['template_data'] = $data['template_data'];
 
-            $timelineEntries[] = $timelineEntry;
+            $timelineEntries[] = [
+                'date' => new \DateTime($result['date']),
+                'template' => $data['template'],
+                'template_data' => $data['template_data']
+            ];
         }
 
         return $this->container->get('templating')

src/Bundle/ChillMainBundle/Util/DateRangeCovering.php

@@ -205,7 +205,7 @@ class DateRangeCovering
     {
         if (!$this->computed) {
             throw new \LogicException(sprintf("You cannot call the method %s before ".
-                "'process'", __METHOD));
+                "'process'", __METHOD__));
         }
 
         return count($this->intersections) > 0;
@@ -215,7 +215,7 @@ class DateRangeCovering
     {
         if (!$this->computed) {
             throw new \LogicException(sprintf("You cannot call the method %s before ".
-                "'process'", __METHOD));
+                "'process'", __METHOD__));
         }
 
         return $this->intersections;

src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php

@@ -1,20 +1,7 @@
 <?php
-/*
+
- * Copyright (C) 2016-2019 Champs-Libres <info@champs-libres.coop>
+declare(strict_types=1);
- *
+
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 namespace Chill\PersonBundle\CRUD\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
@@ -23,11 +10,8 @@ use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use BadMethodCallException;
 
-/**
- * Controller for entities attached as one-to-on to a person
- * 
- */
 class OneToOneEntityPersonCRUDController extends CRUDController
 {
     protected function getTemplateFor($action, $entity, Request $request)
@@ -83,7 +67,7 @@ class OneToOneEntityPersonCRUDController extends CRUDController
 
     protected function generateRedirectOnCreateRoute($action, Request $request, $entity)
     {
-        throw new BadMethodCallException("not implemtented yet");
+        throw new BadMethodCallException('Not implemented yet.');
     }
 
 }

src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php

@@ -959,6 +959,8 @@ EOF
                 $table->setHeaders(array('#', 'label', 'value'));
                 $i = 0;
 
+                $matchingTableRowAnswer = [];
+
                 foreach($answers as $key => $answer) {
                     $table->addRow(array(
                         $i, $answer, $key

src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php

@@ -161,8 +161,10 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
         \shuffle($this->personIds);
     }
 
-    private function getRandomPersons(int $min, int $max)
+    private function getRandomPersons(int $min, int $max): array
     {
+        $persons = [];
+
         $nb = \random_int($min, $max);
 
         for ($i=0; $i < $nb; $i++) {
@@ -172,7 +174,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
                 ;
         }
 
-        return $persons ?? [];
+        return $persons;
     }
 
     public function getDependencies()

src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php

@@ -143,6 +143,8 @@ final class CountryOfBirthAggregator implements AggregatorInterface, ExportEleme
 
     public function getLabels($key, array $values, $data)
     {
+        $labels = [];
+
         if ($data['group_by_level'] === 'country') {
             $qb = $this->countriesRepository->createQueryBuilder('c');
 
@@ -153,15 +155,17 @@ final class CountryOfBirthAggregator implements AggregatorInterface, ExportEleme
                     ->getResult(\Doctrine\ORM\Query::HYDRATE_SCALAR);
 
             // initialize array and add blank key for null values
-            $labels[''] = $this->translator->trans('without data');
+            $labels = [
-            $labels['_header'] = $this->translator->trans('Country of birth');
+                '' => $this->translator->trans('without data'),
+                '_header' => $this->translator->trans('Country of birth'),
+            ];
+
             foreach($countries as $row) {
                 $labels[$row['c_countryCode']] = $this->translatableStringHelper->localize($row['c_name']);
             }
+        }
 
-
+        if ($data['group_by_level'] === 'continent') {
-        } elseif ($data['group_by_level'] === 'continent') {
-
             $labels = array(
                 'EU' => $this->translator->trans('Europe'),
                 'AS' => $this->translator->trans('Asia'),
@@ -175,8 +179,7 @@ final class CountryOfBirthAggregator implements AggregatorInterface, ExportEleme
              );
         }
 
-
+        return function(string $value) use ($labels): string {
-        return function($value) use ($labels) {
             return $labels[$value];
         };
 

src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php

@@ -144,6 +144,8 @@ final class NationalityAggregator implements AggregatorInterface, ExportElementV
 
     public function getLabels($key, array $values, $data)
     {
+        $labels = [];
+
         if ($data['group_by_level'] === 'country') {
             $qb = $this->countriesRepository->createQueryBuilder('c');
 
@@ -154,15 +156,17 @@ final class NationalityAggregator implements AggregatorInterface, ExportElementV
                     ->getResult(\Doctrine\ORM\Query::HYDRATE_SCALAR);
 
             // initialize array and add blank key for null values
-            $labels[''] = $this->translator->trans('without data');
+            $labels = [
-            $labels['_header'] = $this->translator->trans('Nationality');
+                '' => $this->translator->trans('without data'),
+                '_header' => $this->translator->trans('Nationality'),
+            ];
+
             foreach($countries as $row) {
                 $labels[$row['c_countryCode']] = $this->translatableStringHelper->localize($row['c_name']);
             }
+        }
 
-
+        if ($data['group_by_level'] === 'continent') {
-        } elseif ($data['group_by_level'] === 'continent') {
-
             $labels = array(
                 'EU' => $this->translator->trans('Europe'),
                 'AS' => $this->translator->trans('Asia'),
@@ -176,8 +180,7 @@ final class NationalityAggregator implements AggregatorInterface, ExportElementV
              );
         }
 
-
+        return function(string $value) use ($labels): string {
-        return function($value) use ($labels) {
             return $labels[$value];
         };
 

src/Bundle/ChillPersonBundle/Repository/Household/HouseholdMembersRepository.php

@@ -1,8 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository\Household;
 
-use Chill\PersonBundle\Entity\Household\HouseholdMembers;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
@@ -12,6 +14,6 @@ final class HouseholdMembersRepository
 
     public function __construct(EntityManagerInterface $entityManager)
     {
-        $this->repository = $entityManager->getRepository(HouseholdMembers::class);
+        $this->repository = $entityManager->getRepository(HouseholdMember::class);
     }
 }

src/Bundle/ChillPersonBundle/Search/PersonSearch.php

@@ -263,8 +263,9 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
 
     public function convertTermsToFormData(array $terms)
     {
-        foreach(['firstname', 'lastname', 'gender', '_default']
+        $data = [];
-            as $key) {
+
+        foreach(['firstname', 'lastname', 'gender', '_default'] as $key) {
             $data[$key] = $terms[$key] ?? null;
         }
 

src/Bundle/ChillPersonBundle/Templating/Entity/SocialActionRender.php

@@ -38,7 +38,7 @@ class SocialActionRender implements ChillEntityRenderInterface
     {
         /** @var $socialAction SocialAction */
         $options = \array_merge(self::DEFAULT_ARGS, $options);
-        $titles[] = $this->translatableStringHelper->localize($socialAction->getTitle());
+        $titles = [$this->translatableStringHelper->localize($socialAction->getTitle())];
 
         while ($socialAction->hasParent()) {
             $socialAction = $socialAction->getParent();

src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php

@@ -38,8 +38,7 @@ final class SocialIssueRender implements ChillEntityRenderInterface
         /** @var $socialIssue SocialIssue */
         $options = array_merge(self::DEFAULT_ARGS, $options);
 
-        $titles[] = $this->translatableStringHelper
+        $titles = [$this->translatableStringHelper->localize($socialIssue->getTitle())];
-            ->localize($socialIssue->getTitle());
 
         // loop to parent, until root
         while ($socialIssue->hasParent()) {

src/Bundle/ChillReportBundle/Export/Export/ReportList.php

@@ -196,9 +196,8 @@ class ReportList implements ListInterface, ExportElementValidatedInterface
      * @param type $key
      * @param array $values
      * @param type $data
-     * @return type
      */
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): \Closure
     {
         switch ($key) {
             case 'person_birthdate':
@@ -237,12 +236,13 @@ class ReportList implements ListInterface, ExportElementValidatedInterface
                     ;
                 $rows = $qb->getQuery()->getResult(Query::HYDRATE_ARRAY);
 
+                $scopes = [];
+
                 foreach($rows as $row) {
-                    $scopes[$row['id']] = $this->translatableStringHelper
+                    $scopes[$row['id']] = $this->translatableStringHelper->localize($row['name']);
-                        ->localize($row['name']);
                 }
 
-                return function($value) use ($scopes) {
+                return function($value) use ($scopes): string {
                     if ($value === '_header') {
                         return 'circle';
                     }
@@ -258,11 +258,13 @@ class ReportList implements ListInterface, ExportElementValidatedInterface
                     ;
                 $rows = $qb->getQuery()->getResult(Query::HYDRATE_ARRAY);
 
+                $users = [];
+
                 foreach($rows as $row) {
                     $users[$row['id']] = $row['username'];
                 }
 
-                return function($value) use ($users) {
+                return function($value) use ($users): string {
                     if ($value === '_header') {
                         return 'user';
                     }

src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php

@@ -157,7 +157,7 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
 
 
         // the parameters
-        $parameters = [];
+        $parameters = $circleIds = [];
 
         // the clause that we will fill
         $clause = "{person}.{person_id} = ? AND {task}.{circle} IN ({circle_ids})";

src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\Serializer\Normalizer;
 
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
@@ -20,23 +22,24 @@ class ThirdPartyNormalizer implements NormalizerInterface, NormalizerAwareInterf
         $this->thirdPartyRender = $thirdPartyRender;
     }
 
+    /**
+     * @param ThirdParty $thirdParty
+     */
     public function normalize($thirdParty, string $format = null, array $context = [])
     {
-        /** @var $thirdParty ThirdParty */
+        return [
-        $data['type'] = 'thirdparty';
+            'type' => 'thirdparty',
-        $data['text'] = $this->thirdPartyRender->renderString($thirdParty, []);
+            'text' => $this->thirdPartyRender->renderString($thirdParty, []),
-        $data['id'] = $thirdParty->getId();
+            'id' => $thirdParty->getId(),
-        $data['kind'] = $thirdParty->getKind();
+            'kind' => $thirdParty->getKind(),
-        $data['address'] = $this->normalizer->normalize($thirdParty->getAddress(), $format,
+            'address' => $this->normalizer->normalize($thirdParty->getAddress(), $format, [ 'address_rendering' => 'short' ]),
-            [ 'address_rendering' => 'short' ]);
+            'phonenumber' => $thirdParty->getTelephone(),
-        $data['phonenumber'] = $thirdParty->getTelephone();
+            'email' => $thirdParty->getEmail(),
-        $data['email'] = $thirdParty->getEmail();
+            'isChild' => $thirdParty->isChild(),
-        $data['isChild'] = $thirdParty->isChild();
+            'parent' => $this->normalizer->normalize($thirdParty->getParent(), $format, $context),
-        $data['parent'] = $this->normalizer->normalize($thirdParty->getParent(), $format, $context);
+            'civility' => $this->normalizer->normalize($thirdParty->getCivility(), $format, $context),
-        $data['civility'] = $this->normalizer->normalize($thirdParty->getCivility(), $format, $context);
+            'contactDataAnonymous' => $thirdParty->isContactDataAnonymous(),
-        $data['contactDataAnonymous'] = $thirdParty->isContactDataAnonymous();
+        ];
-
-        return $data;
     }
 
     public function supportsNormalization($data, string $format = null)