From d19c5c9e41c84b9936424096a5b9aeae59863561 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 4 Jan 2022 15:07:41 +0100 Subject: [PATCH] cs: Autofix. --- .../Controller/PersonApiController.php | 78 +++++++++---------- .../Normalizer/PersonJsonNormalizer.php | 10 ++- 2 files changed, 46 insertions(+), 42 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php b/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php index 77c0e296d..48e68c5ac 100644 --- a/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php @@ -28,17 +28,54 @@ use function array_values; class PersonApiController extends ApiController { private AuthorizationHelper $authorizationHelper; + private ConfigPersonAltNamesHelper $configPersonAltNameHelper; public function __construct( AuthorizationHelper $authorizationHelper, ConfigPersonAltNamesHelper $configPersonAltNameHelper - ) - { + ) { $this->authorizationHelper = $authorizationHelper; $this->configPersonAltNameHelper = $configPersonAltNameHelper; } + /** + * @Route("/api/1.0/person/config/alt_names.{_format}", + * name="chill_person_config_alt_names", + * requirements={ + * "_format": "json" + * } + * ) + */ + public function configAltNames(Request $request, string $_format): Response + { + // TODO: I CANT process php array + $configAltNamesChoices = $this->configPersonAltNameHelper->getChoices(); + dump($configAltNamesChoices); + dump(array_keys($configAltNamesChoices)); + dump(array_values($configAltNamesChoices)); + $keys = []; + + foreach (array_keys($configAltNamesChoices) as $k) { + $keys[] = ['key' => $k]; + } + dump($keys); + $values = []; + + foreach (array_values($configAltNamesChoices) as $v) { + $values[] = ['labels' => $v]; + } + dump($values); + // dump(array_combine($keys, $values)); + + $configAltNames = [ + ['key' => 'jeune_fille', 'labels' => ['fr' => 'Nom de naissance']], + ['key' => 'surnom', 'labels' => ['fr' => 'Surnom']], + ]; + + return $this->json($configAltNames, Response::HTTP_OK, [], ['groups' => ['read']]); + } + public function personAddressApi($id, Request $request, string $_format): Response { return $this->addRemoveSomething('address', $id, $request, $_format, 'address', Address::class, ['groups' => ['read']]); @@ -75,41 +112,4 @@ class PersonApiController extends ApiController return $this->json(array_values($addresses), Response::HTTP_OK, [], ['groups' => ['read']]); } - - - /** - * @Route("/api/1.0/person/config/alt_names.{_format}", - * name="chill_person_config_alt_names", - * requirements={ - * "_format": "json" - * } - * ) - */ - public function configAltNames(Request $request, string $_format): Response - { - - // TODO: I CANT process php array - $configAltNamesChoices = $this->configPersonAltNameHelper->getChoices(); - dump($configAltNamesChoices); - dump(array_keys($configAltNamesChoices)); - dump(array_values($configAltNamesChoices)); - $keys = []; - foreach(array_keys($configAltNamesChoices) as $k){ - array_push($keys, ['key' => $k]); - } - dump($keys); - $values = []; - foreach(array_values($configAltNamesChoices) as $v){ - array_push($values, ['labels' => $v]); - } - dump($values); - // dump(array_combine($keys, $values)); - - $configAltNames = [ - ["key" => "jeune_fille", "labels" => ["fr" => "Nom de naissance" ]], - ["key" => "surnom", "labels" => ["fr" => "Surnom" ]] - ]; - return $this->json($configAltNames, Response::HTTP_OK, [], ['groups' => ['read']]); - } - } diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php index 74955a382..66d41b3f2 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php @@ -80,7 +80,7 @@ class PersonJsonNormalizer implements } foreach (['firstName', 'lastName', 'phonenumber', 'mobilenumber', 'gender', - 'birthdate', 'deathdate', 'center', 'altNames'] + 'birthdate', 'deathdate', 'center', 'altNames', ] as $item) { if (!array_key_exists($item, $data)) { continue; @@ -133,8 +133,11 @@ class PersonJsonNormalizer implements break; case 'altNames': - foreach($data[$item] as $altName){ - $oldAltName = $person->getAltNames()->filter(function (PersonAltName $n) use ($altName) { return $n->getKey() === $altName['key']; })->first(); + foreach ($data[$item] as $altName) { + $oldAltName = $person + ->getAltNames() + ->filter(static fn (PersonAltName $n): bool => $n->getKey() === $altName['key'])->first(); + if (false === $oldAltName) { $newAltName = new PersonAltName(); $newAltName->setKey($altName['key']); @@ -144,6 +147,7 @@ class PersonJsonNormalizer implements $oldAltName->setLabel($altName['label']); } } + break; default: