Fix DI on other services depending on updated repositories.

src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php

@@ -19,26 +19,18 @@
 
 namespace Chill\MainBundle\Form\Type\DataTransformer;
 
+use Chill\MainBundle\Entity\Center;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Form\DataTransformerInterface;
-use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 
-/**
- * Transform a center object to his id, and vice-versa
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class CenterTransformer implements DataTransformerInterface
 {
-    /**
-     *
-     * @var ObjectManager
-     */
-    private $om;
-    
-    public function __construct(ObjectManager $om) 
+    private EntityManagerInterface $em;
+
+    public function __construct(EntityManagerInterface $em)
     {
-        $this->om = $om;
+        $this->em = $em;
     }
 
     public function reverseTransform($id)
@@ -46,15 +38,17 @@ class CenterTransformer implements DataTransformerInterface
         if ($id === NULL) {
             return NULL;
         }
-        
-        $center = $this->om->getRepository('ChillMainBundle:Center')
-                ->find($id);
-        
+
+        $center = $this
+            ->em
+            ->getRepository(Center::class)
+            ->find($id);
+
         if ($center === NULL) {
             throw new TransformationFailedException(sprintf(
                     'No center found with id %d', $id));
         }
-        
+
         return $center;
     }
 
@@ -63,7 +57,7 @@ class CenterTransformer implements DataTransformerInterface
         if ($center === NULL) {
             return '';
         }
-        
+
         return $center->getId();
     }
 

src/Bundle/ChillMainBundle/Form/Type/DataTransformer/MultipleObjectsToIdTransformer.php

@@ -24,28 +24,20 @@ use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 use Doctrine\Persistence\ObjectManager;
 use Doctrine\Common\Collections\ArrayCollection;
- 
+use Doctrine\ORM\EntityManagerInterface;
+
 class MultipleObjectsToIdTransformer implements DataTransformerInterface
 {
-    /**
-    * @var ObjectManager
-    */
-    private $em;
- 
-    /**
-    * @var string
-    */
-    private $class;
- 
-    /**
-    * @param ObjectManager $em
-    */
-    public function __construct(ObjectManager $em, $class)
+    private EntityManagerInterface $em;
+
+    private ?string $class;
+
+    public function __construct(EntityManagerInterface $em, ?string $class = null)
     {
         $this->em = $em;
         $this->class = $class;
     }
- 
+
     /**
     * Transforms an object (use) to a string (id).
     *

src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php

@@ -20,28 +20,20 @@
 
 namespace Chill\MainBundle\Form\Type\DataTransformer;
 
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 use Doctrine\Persistence\ObjectManager;
 
 class ObjectToIdTransformer implements DataTransformerInterface
 {
-    /**
-     * @var ObjectManager
-     */
-    private $om;
+    private EntityManagerInterface $em;
 
-    /**
-     * @var string
-     */
-    private $class;
+    private ?string $class;
 
-    /**
-     * @param ObjectManager $om
-     */
-    public function __construct(ObjectManager $om, $class)
+    public function __construct(EntityManagerInterface $em, ?string $class = null)
     {
-        $this->om = $om;
+        $this->em = $em;
         $this->class = $class;
     }
 
@@ -73,7 +65,7 @@ class ObjectToIdTransformer implements DataTransformerInterface
             return null;
         }
 
-        $object = $this->om
+        $object = $this->em
             ->getRepository($this->class)
             ->find($id)
         ;

src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ScopeTransformer.php

@@ -19,41 +19,28 @@
 
 namespace Chill\MainBundle\Form\Type\DataTransformer;
 
+use Chill\MainBundle\Entity\Scope;
 use Symfony\Component\Form\DataTransformerInterface;
 use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\EntityManagerInterface;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class ScopeTransformer implements DataTransformerInterface
 {
-    /**
-     *
-     * @var ObjectManager
-     */
-    protected $om;
-    
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $helper;
-    
-    public function __construct(ObjectManager $om)
+    private EntityManagerInterface $em;
+
+    public function __construct(EntityManagerInterface $em)
     {
-        $this->om = $om;
+        $this->em = $em;
     }
-    
+
     public function transform($scope)
     {
         if ($scope === NULL) {
             return NULL;
         }
-        
+
         return $scope->getId();
     }
 
@@ -62,15 +49,17 @@ class ScopeTransformer implements DataTransformerInterface
         if ($id == NULL) {
             return NULL;
         }
-        
-        $scope = $this->om->getRepository('ChillMainBundle:Scope')
-                ->find($id);
-        
+
+        $scope = $this
+            ->em
+            ->getRepository(Scope::class)
+            ->find($id);
+
         if ($scope === NULL) {
             throw new TransformationFailedException(sprintf("The scope with id "
                     . "'%d' were not found", $id));
         }
-        
+
         return $scope;
     }
 

src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php

@@ -22,6 +22,7 @@ use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\DataMapper\ScopePickerDataMapper;
+use Chill\MainBundle\Repository\ScopeRepository;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\EntityRepository;
@@ -60,7 +61,7 @@ class ScopePickerType extends AbstractType
     protected $tokenStorage;
 
     /**
-     * @var EntityRepository
+     * @var ScopeRepository
      */
     protected $scopeRepository;
 
@@ -72,7 +73,7 @@ class ScopePickerType extends AbstractType
     public function __construct(
         AuthorizationHelper $authorizationHelper,
         TokenStorageInterface $tokenStorage,
-        EntityRepository $scopeRepository,
+        ScopeRepository $scopeRepository,
         TranslatableStringHelper $translatableStringHelper
     ) {
         $this->authorizationHelper = $authorizationHelper;

src/Bundle/ChillMainBundle/Form/Type/UserPickerType.php

@@ -25,6 +25,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Repository\UserRepository;
 use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
 use Symfony\Component\Security\Core\Role\Role;
 
@@ -53,16 +54,12 @@ class UserPickerType extends AbstractType
      */
     protected $tokenStorage;
 
-    /**
-     *
-     * @var \Chill\MainBundle\Repository\UserRepository
-     */
-    protected $userRepository;
+    protected UserRepository $userRepository;
 
     public function __construct(
         AuthorizationHelper $authorizationHelper,
         TokenStorageInterface $tokenStorage,
-        EntityRepository $userRepository
+        UserRepository $userRepository
     ) {
         $this->authorizationHelper = $authorizationHelper;
         $this->tokenStorage = $tokenStorage;