From 68a21fcc0af5278ce18e2c2bd0c8ea0343893064 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 16 Nov 2021 15:32:35 +0100 Subject: [PATCH] fix: SA: Fix "...Instantiated class not found..." rules. SA stands for Static Analysis. --- phpstan-baseline.neon | 15 ------------- .../Controller/HouseholdMemberController.php | 22 +++++++++---------- .../ORM/LoadSocialWorkMetadata.php | 19 ++++++---------- 3 files changed, 18 insertions(+), 38 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 9d9a5affd..a3a2f6e04 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -80,26 +80,11 @@ parameters: count: 1 path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php - - - message: "#^Instantiated class Chill\\\\PersonBundle\\\\Controller\\\\BadRequestExceptions not found\\.$#" - count: 1 - path: src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php - - message: "#^Variable method call on mixed\\.$#" count: 1 path: src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php - - - message: "#^Caught class Chill\\\\PersonBundle\\\\DataFixtures\\\\ORM\\\\Throwable not found\\.$#" - count: 1 - path: src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php - - - - message: "#^Instantiated class Chill\\\\PersonBundle\\\\DataFixtures\\\\ORM\\\\Exception not found\\.$#" - count: 1 - path: src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php - - message: "#^Foreach overwrites \\$value with its value variable\\.$#" count: 1 diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php index 2cfd12842..2d6f70f85 100644 --- a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php +++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php @@ -38,7 +38,7 @@ class HouseholdMemberController extends ApiController $this->translator = $translator; $this->periodRepository = $periodRepository; } - + /** * @Route( * "/api/1.0/person/household/members/move.{_format}", @@ -75,7 +75,7 @@ class HouseholdMemberController extends ApiController } foreach ($editor->getPersistable() as $el) { - $em->persist($el); + $em->persist($el); } $em->flush(); @@ -89,8 +89,8 @@ class HouseholdMemberController extends ApiController * * * persons[]: an id of the person to add to the form * * household: the id of the destination household - * * allow_leave_without_household: if present, the editor will allow - * to leave household without joining another + * * allow_leave_without_household: if present, the editor will allow + * to leave household without joining another * * @Route( * "/{_locale}/person/household/members/editor", @@ -105,7 +105,7 @@ class HouseholdMemberController extends ApiController $ids = $request->query->get('persons', []); if (0 === count($ids)) { - throw new BadRequestExceptions("parameters persons in query ". + throw new BadRequestException("parameters persons in query ". "is not an array or empty"); } @@ -114,7 +114,7 @@ class HouseholdMemberController extends ApiController ; foreach ($persons as $person) { - $this->denyAccessUnlessGranted(PersonVoter::SEE, $person, + $this->denyAccessUnlessGranted(PersonVoter::SEE, $person, "You are not allowed to see person with id {$person->getId()}" ); } @@ -140,11 +140,11 @@ class HouseholdMemberController extends ApiController ; $data = [ - 'persons' => $persons ?? false ? + 'persons' => $persons ?? false ? $this->getSerializer()->normalize($persons, 'json', [ 'groups' => [ 'read' ]]) : [], 'household' => $household ?? false ? $this->getSerializer()->normalize($household, 'json', [ 'groups' => [ 'read' ]]) : null, - 'positions' => + 'positions' => $this->getSerializer()->normalize($positions, 'json', [ 'groups' => [ 'read' ]]), 'allowHouseholdCreate' => $allowHouseholdCreate ?? true, 'allowHouseholdSearch' => $allowHouseholdSearch ?? true, @@ -182,7 +182,7 @@ class HouseholdMemberController extends ApiController // TODO ACL $form = $this->createForm(HouseholdMemberType::class, $member, [ - 'validation_groups' => [ 'household_memberships' ] + 'validation_groups' => [ 'household_memberships' ] ]); $form->handleRequest($request); @@ -190,12 +190,12 @@ class HouseholdMemberController extends ApiController $this->getDoctrine()->getManager()->flush(); $this->addFlash('success', $this->translator - ->trans('household.successfully saved member')) + ->trans('household.successfully saved member')) ; return $this->redirect( $request->get('returnPath', null) ?? - $this->generator->generate('chill_person_household_summary', [ 'household_id' => + $this->generator->generate('chill_person_household_summary', [ 'household_id' => $member->getHousehold()->getId() ]) ); } diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php index f96fb5fc2..eee7df7b6 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php @@ -1,32 +1,30 @@ importer = $importer; } - /** - * @inheritDoc - */ public function load(ObjectManager $manager) { try { $csv = Reader::createFromPath(__DIR__.'/data/social_work_metadata.csv'); - } catch (Throwable $e) { - throw new Exception('Error while loading CSV.',0, $e); + } catch (\Throwable $e) { + throw new \Exception('Error while loading CSV.',0, $e); } $csv->setDelimiter(";"); @@ -34,9 +32,6 @@ class LoadSocialWorkMetadata extends \Doctrine\Bundle\FixturesBundle\Fixture imp $this->importer->import($csv); } - /** - * @inheritDoc - */ public function getOrder() { return 9500;