Merge branch 'master' into 295_resume_retouches

src/Bundle/ChillPersonBundle/Entity/Person.php

@@ -63,7 +63,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private int $id;
+    private ?int $id = null;
 
     /**
      * The person's first name
@@ -305,11 +305,10 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
 
     /**
      * The person's center
-     * @var Center
      *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Center")
      */
-    private $center;
+    private ?Center $center = null;
 
     /**
      * The person's accompanying periods (when the person was accompanied by the center)
@@ -713,7 +712,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return false;
     }
 
-    public function getId(): int
+    public function getId(): ?int
     {
         return $this->id;
     }

src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php

@@ -1,83 +1,49 @@
 <?php
-/*
- *
- * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * 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/>.
- */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Form\SocialWork;
 
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 
-/**
- * Class SocialIssueType
- *
- * @package Chill\PersonBundle\Form
- */
 class SocialIssueType extends AbstractType
 {
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
+    protected TranslatableStringHelperInterface $translatableStringHelper;
 
-    public function __construct(TranslatableStringHelper $translatableStringHelper) {
+    public function __construct(
+        TranslatableStringHelperInterface $translatableStringHelper
+    ) {
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('title', TranslatableStringFormType::class, [
                 'label' => 'Nom'
             ])
-
             ->add('parent', EntityType::class, [
                 'class' => SocialIssue::class,
                 'required'   => false,
-                'choice_label' => function (SocialIssue $issue) {
-                    return $this->translatableStringHelper->localize($issue->getTitle());
-                }
+                'choice_label' => fn (SocialIssue $issue): ?string => $this->translatableStringHelper->localize($issue->getTitle())
             ])
-
             ->add('desactivationDate', DateType::class, [
                 'attr'  => ['class' => 'datepicker'],
                 'widget'=> 'single_text',
                 'format' => 'dd-MM-yyyy',
                 'required' => false,
             ]);
-}
+    }
 
-    /**
-     * @param OptionsResolver $resolver
-     */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver
-            ->setDefault('class', SocialIssue::class)
-            ;
+        $resolver->setDefault('class', SocialIssue::class);
     }
 }

src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php

@@ -1,14 +1,18 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Validator\Person;
 
 use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter;
 use Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenterValidator;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
-class PersonHasCenterValidatorTest extends \Symfony\Component\Validator\Test\ConstraintValidatorTestCase
+class PersonHasCenterValidatorTest extends ConstraintValidatorTestCase
 {
     public function testValidateRequired()
     {
@@ -42,9 +46,10 @@ class PersonHasCenterValidatorTest extends \Symfony\Component\Validator\Test\Con
                 'validation' => [
                     'center_required' => true
                 ]
-            ])
-            ;
+            ]);
 
-        return new PersonHasCenterValidator($parameterBag);
+        $centerResolverDispatcher = $this->createMock(CenterResolverDispatcher::class);
+
+        return new PersonHasCenterValidator($parameterBag, $centerResolverDispatcher);
     }
 }