From 1c673db628942ef11ebb848d880b9c17d8d83985 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Fri, 27 Jan 2023 12:18:19 +0100 Subject: [PATCH] FIX [phpcsfixer][phpstan] --- phpstan-types.neon | 5 ----- .../Controller/AbsenceController.php | 1 - src/Bundle/ChillMainBundle/Form/AbsenceType.php | 2 -- src/Bundle/ChillMainBundle/Form/UserType.php | 2 -- .../Serializer/Normalizer/UserNormalizer.php | 2 +- .../ChillPersonBundle/Search/PersonSearch.php | 16 +++++++--------- 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/phpstan-types.neon b/phpstan-types.neon index 1aae06880..b11cbd153 100644 --- a/phpstan-types.neon +++ b/phpstan-types.neon @@ -340,11 +340,6 @@ parameters: count: 1 path: src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php - - - message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#" - count: 3 - path: src/Bundle/ChillPersonBundle/Search/PersonSearch.php - - message: "#^Method Chill\\\\PersonBundle\\\\Search\\\\PersonSearch\\:\\:renderResult\\(\\) should return string but return statement is missing\\.$#" count: 1 diff --git a/src/Bundle/ChillMainBundle/Controller/AbsenceController.php b/src/Bundle/ChillMainBundle/Controller/AbsenceController.php index 952435e68..73d9abd3e 100644 --- a/src/Bundle/ChillMainBundle/Controller/AbsenceController.php +++ b/src/Bundle/ChillMainBundle/Controller/AbsenceController.php @@ -64,6 +64,5 @@ class AbsenceController extends AbstractController $em->flush(); return $this->redirect($this->generateUrl('chill_main_user_absence_index')); - } } diff --git a/src/Bundle/ChillMainBundle/Form/AbsenceType.php b/src/Bundle/ChillMainBundle/Form/AbsenceType.php index e23e350c9..d0aed640c 100644 --- a/src/Bundle/ChillMainBundle/Form/AbsenceType.php +++ b/src/Bundle/ChillMainBundle/Form/AbsenceType.php @@ -12,12 +12,10 @@ declare(strict_types=1); namespace Chill\MainBundle\Form; use Chill\MainBundle\Entity\User; -use Chill\MainBundle\Form\Type\ChillDateTimeType; use Chill\MainBundle\Form\Type\ChillDateType; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Contracts\Translation\TranslatorInterface; class AbsenceType extends AbstractType { diff --git a/src/Bundle/ChillMainBundle/Form/UserType.php b/src/Bundle/ChillMainBundle/Form/UserType.php index f37c48a92..dc2140997 100644 --- a/src/Bundle/ChillMainBundle/Form/UserType.php +++ b/src/Bundle/ChillMainBundle/Form/UserType.php @@ -15,7 +15,6 @@ use Chill\MainBundle\Entity\Center; use Chill\MainBundle\Entity\Location; use Chill\MainBundle\Entity\Scope; use Chill\MainBundle\Entity\UserJob; -use Chill\MainBundle\Form\Type\ChillDateTimeType; use Chill\MainBundle\Form\Type\ChillDateType; use Chill\MainBundle\Form\Type\PickCivilityType; use Chill\MainBundle\Templating\TranslatableStringHelper; @@ -33,7 +32,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Validator\Constraints\Length; use Symfony\Component\Validator\Constraints\NotBlank; use Symfony\Component\Validator\Constraints\Regex; -use Symfony\Contracts\Translation\TranslatorInterface; class UserType extends AbstractType { diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php index 25bcdbc48..7f5b62be5 100644 --- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php +++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php @@ -87,7 +87,7 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware 'user_job' => $this->normalizer->normalize($object->getUserJob(), $format, $userJobContext), 'main_center' => $this->normalizer->normalize($object->getMainCenter(), $format, $centerContext), 'main_scope' => $this->normalizer->normalize($object->getMainScope(), $format, $scopeContext), - 'isAbsent' => $object->isAbsent() + 'isAbsent' => $object->isAbsent(), ]; if ('docgen' === $format) { diff --git a/src/Bundle/ChillPersonBundle/Search/PersonSearch.php b/src/Bundle/ChillPersonBundle/Search/PersonSearch.php index c85f1dabd..83b2cff69 100644 --- a/src/Bundle/ChillPersonBundle/Search/PersonSearch.php +++ b/src/Bundle/ChillPersonBundle/Search/PersonSearch.php @@ -26,7 +26,6 @@ use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface; use DateTime; use Exception; use libphonenumber\PhoneNumber; -use Symfony\Component\Form\Extension\Core\Type\TelType; use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Templating\EngineInterface; @@ -116,24 +115,23 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf { $string = '@person '; - $string .= empty($data['_default']) ? '' : $data['_default'] . ' '; + $string .= $data['_default'] ? '' : $data['_default'] . ' '; foreach (['firstname', 'lastname', 'gender', 'city'] as $key) { - $string .= empty($data[$key]) ? '' : $key . ':' . + $string .= $data[$key] ? '' : $key . ':' . // add quote if contains spaces (strpos($data[$key], ' ') !== false ? '"' . $data[$key] . '"' : $data[$key]) . ' '; - } foreach (['birthdate', 'birthdate-before', 'birthdate-after'] as $key) { - $string .= empty($data[$key]) ? + $string .= $data[$key] ? '' : $key . ':' . $data[$key]->format('Y-m-d') . ' '; } - $string .= empty($data['phonenumber']) ? '' : 'phonenumber:' . $data['phonenumber']->getNationalNumber(); + $string .= $data['phonenumber'] ? '' : 'phonenumber:' . $data['phonenumber']->getNationalNumber(); return $string; } @@ -164,13 +162,13 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf $phonenumber = new PhoneNumber(); $phonenumber->setNationalNumber($terms['phonenumber']); } catch (Exception $ex) { - throw new ParsingException("The date for {$key} is " + throw new ParsingException('The date for phonenumber is ' . 'not parsable', 0, $ex); } - - $data['phonenumber'] = $phonenumber ?? null; } + $data['phonenumber'] = $phonenumber ?? null; + return $data; }