Merge branch 'fixes/fixes-phpstan-2022-04-27' into 'master'

Fixes/fixes phpstan 2022 04 27

See merge request Chill-Projet/chill-bundles!420

phpstan-critical.neon

@@ -5,11 +5,6 @@ parameters:
             count: 1
             path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
 
-        -
-            message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$currentHouseholdParticipationAt\\.$#"
-            count: 3
-            path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
         -
             message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\PersonHouseholdAddress\\:\\:\\$relation\\.$#"
             count: 1

phpstan.neon.dist

@@ -3,6 +3,7 @@ parameters:
     paths:
         - src/
     excludePaths:
+        - .php_cs*
         - docs/
         - src/Bundle/*/Tests/*
         - src/Bundle/*/tests/*

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

@@ -16,9 +16,9 @@ use Chill\MainBundle\Serializer\Model\Collection;
 use Exception;
 use LogicException;
 use RuntimeException;
-use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Serializer\Exception\NotEncodableValueException;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\SerializerInterface;
@@ -55,7 +55,7 @@ class ApiController extends AbstractCRUDController
                 return $this->entityDelete('_entity', $request, $id, $_format);
 
             default:
-                throw new \Symfony\Component\HttpFoundation\Exception\BadRequestException('This method is not implemented');
+                throw new BadRequestHttpException('This method is not implemented');
         }
     }
 
@@ -120,7 +120,7 @@ class ApiController extends AbstractCRUDController
                 return $this->entityPostAction('_entity', $request, $_format);
 
             default:
-                throw new \Symfony\Component\HttpFoundation\Exception\BadRequestException('This method is not implemented');
+                throw new BadRequestHttpException('This method is not implemented');
         }
     }
 
@@ -160,7 +160,7 @@ class ApiController extends AbstractCRUDController
         try {
             $entity = $this->deserialize($action, $request, $_format, $entity);
         } catch (NotEncodableValueException $e) {
-            throw new BadRequestException('invalid json', 400, $e);
+            throw new BadRequestHttpException('invalid json', 400, $e);
         }
 
         $errors = $this->validate($action, $request, $_format, $entity);
@@ -273,7 +273,7 @@ class ApiController extends AbstractCRUDController
         try {
             $postedData = $this->getSerializer()->deserialize($request->getContent(), $postedDataType, $_format, $postedDataContext);
         } catch (\Symfony\Component\Serializer\Exception\UnexpectedValueException $e) {
-            throw new BadRequestException(sprintf('Unable to deserialize posted ' .
+            throw new BadRequestHttpException(sprintf('Unable to deserialize posted ' .
                 'data: %s', $e->getMessage()), 0, $e);
         }
 
@@ -290,7 +290,7 @@ class ApiController extends AbstractCRUDController
                 break;
 
             default:
-                throw new BadRequestException('this method is not supported');
+                throw new BadRequestHttpException('this method is not supported');
         }
 
         $errors = $this->validate($action, $request, $_format, $entity, [$postedData]);
@@ -408,7 +408,7 @@ class ApiController extends AbstractCRUDController
             return $this->json($entity, Response::HTTP_OK, [], $context);
         }
 
-        throw new \Symfony\Component\HttpFoundation\Exception\BadRequestException('This format is not implemented');
+        throw new BadRequestHttpException('This format is not implemented');
     }
 
     protected function entityPostAction($action, Request $request, string $_format): Response
@@ -418,7 +418,7 @@ class ApiController extends AbstractCRUDController
         try {
             $entity = $this->deserialize($action, $request, $_format, $entity);
         } catch (NotEncodableValueException $e) {
-            throw new BadRequestException('invalid json', 400, $e);
+            throw new BadRequestHttpException('invalid json', 400, $e);
         }
 
         $errors = $this->validate($action, $request, $_format, $entity);

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

@@ -25,6 +25,7 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -1140,6 +1141,6 @@ class CRUDController extends AbstractController
             return $this->json($entity, Response::HTTP_OK, [], $context);
         }
 
-        throw new \Symfony\Component\HttpFoundation\Exception\BadRequestException('This format is not implemented');
+        throw new BadRequestHttpException('This format is not implemented');
     }
 }

src/Bundle/ChillMainBundle/Controller/SearchController.php

@@ -22,7 +22,6 @@ use Chill\MainBundle\Search\UnknowSearchNameException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
@@ -216,7 +215,7 @@ class SearchController extends AbstractController
         $types = $request->query->get('type', []);
 
         if (count($types) === 0) {
-            throw new BadRequestException('The request must contains at '
+            throw new BadRequestHttpException('The request must contains at '
                 . ' one type');
         }
 

src/Bundle/ChillMainBundle/Controller/WorkflowController.php

@@ -25,7 +25,6 @@ use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
@@ -144,7 +143,7 @@ class WorkflowController extends AbstractController
     public function getAccessByAccessKey(EntityWorkflowStep $entityWorkflowStep, Request $request): Response
     {
         if (null === $accessKey = $request->query->get('accessKey', null)) {
-            throw new BadRequestException('accessKey is missing');
+            throw new BadRequestHttpException('accessKey is missing');
         }
 
         if (!$this->getUser() instanceof User) {

src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php

@@ -33,10 +33,10 @@ use DateInterval;
 use DateTimeImmutable;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Serializer\Exception\RuntimeException;
@@ -185,7 +185,7 @@ final class AccompanyingCourseApiController extends ApiController
             ->deserialize($request->getContent(), Person::class, $_format, []);
 
         if (null === $person) {
-            throw new BadRequestException('person id not found');
+            throw new BadRequestHttpException('person id not found');
         }
 
         // TODO add acl
@@ -204,7 +204,7 @@ final class AccompanyingCourseApiController extends ApiController
                 break;
 
             default:
-                throw new BadRequestException('This method is not supported');
+                throw new BadRequestHttpException('This method is not supported');
         }
 
         $errors = $this->validator->validate($accompanyingPeriod);
@@ -247,12 +247,12 @@ final class AccompanyingCourseApiController extends ApiController
             }
 
             if (null === $requestor) {
-                throw new BadRequestException('Could not find any person or thirdparty', 0, null);
+                throw new BadRequestHttpException('Could not find any person or thirdparty', 0, null);
             }
 
             $accompanyingPeriod->setRequestor($requestor);
         } else {
-            throw new BadRequestException('method not supported');
+            throw new BadRequestHttpException('method not supported');
         }
 
         $errors = $this->validator->validate($accompanyingPeriod);

src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php

@@ -21,9 +21,9 @@ use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Validator\ConstraintViolationInterface;
@@ -255,7 +255,7 @@ class AccompanyingCourseController extends Controller
             $personIds = $request->query->get('person_id');
 
             if (false === is_array($personIds)) {
-                throw new BadRequestException('person_id parameter should be an array');
+                throw new BadRequestHttpException('person_id parameter should be an array');
             }
 
             foreach ($personIds as $personId) {

src/Bundle/ChillPersonBundle/Controller/HouseholdController.php

@@ -21,8 +21,8 @@ use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
@@ -202,7 +202,7 @@ class HouseholdController extends AbstractController
         $this->denyAccessUnlessGranted(HouseholdVoter::EDIT, $household);
 
         if (!$request->query->has('address_id')) {
-            throw new BadRequestException('parameter address_id is missing');
+            throw new BadRequestHttpException('parameter address_id is missing');
         }
 
         $address_id = $request->query->getInt('address_id');
@@ -218,7 +218,7 @@ class HouseholdController extends AbstractController
         }
 
         if (null === $address) {
-            throw new BadRequestException('The edited address does not belongs to the household');
+            throw new BadRequestHttpException('The edited address does not belongs to the household');
         }
 
         $form = $this->createForm(AddressDateType::class, $address, []);

src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php

@@ -20,9 +20,9 @@ use Chill\PersonBundle\Form\HouseholdMemberType;
 use Chill\PersonBundle\Household\MembersEditor;
 use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Serializer\Exception;
@@ -105,7 +105,7 @@ class HouseholdMemberController extends ApiController
             $ids = $request->query->get('persons', []);
 
             if (0 === count($ids)) {
-                throw new BadRequestException('parameters persons in query ' .
+                throw new BadRequestHttpException('parameters persons in query ' .
                     'is not an array or empty');
             }
 
@@ -121,7 +121,8 @@ class HouseholdMemberController extends ApiController
             }
         }
 
-        if ($householdId = $request->query->get('household', false)) {
+        if ($request->query->has('household')) {
+            $householdId = $request->query->get('household', false);
             $household = $em->getRepository(Household::class)
                 ->find($householdId);
             $allowHouseholdCreate = false;
@@ -189,7 +190,7 @@ class HouseholdMemberController extends ApiController
                     ['groups' => ['read']]
                 );
         } catch (Exception\InvalidArgumentException|Exception\UnexpectedValueException $e) {
-            throw new BadRequestException("Deserialization error: {$e->getMessage()}", 45896, $e);
+            throw new BadRequestHttpException("Deserialization error: {$e->getMessage()}", 45896, $e);
         }
 
         // TODO ACL

src/Bundle/ChillPersonBundle/Entity/Person.php

@@ -240,6 +240,11 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      */
     private array $currentHouseholdAt = [];
 
+    /**
+     * Cache for the computation of current household participation.
+     */
+    private array $currentHouseholdParticipationAt = [];
+
     /**
      * The current person address.
      *

src/Bundle/ChillReportBundle/Controller/ReportController.php

@@ -334,7 +334,7 @@ class ReportController extends AbstractController
 
         $cFGroupId = $request->query->get('cFGroup');
 
-        if ($cFGroupId) {
+        if ($request->query->has('cFGroup')) {
             return $this->redirect(
                 $this->generateUrl(
                     'report_new',
@@ -391,7 +391,7 @@ class ReportController extends AbstractController
     {
         $cFGroupId = $request->query->get('cFGroup');
 
-        if ($cFGroupId) {
+        if ($request->query->has('cFGroup')) {
             return $this->redirect(
                 $this->generateUrl(
                     'report_export_list',

src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php

@@ -33,7 +33,6 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormFactoryInterface;
-use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -494,7 +493,7 @@ final class SingleTaskController extends AbstractController
                 );
 
             default:
-                throw new BadRequestException("format not supported: {$_format}");
+                throw new BadRequestHttpException("format not supported: {$_format}");
         }
     }