[All Bundles] - use EntityManagerInterface in place of concrete class

Kunstmaan · Feb 28, 2024 · 16f93d8 · 16f93d8
1 parent c4810d7
commit 16f93d8
Show file tree

Hide file tree

Showing 95 changed files with 249 additions and 272 deletions.
diff --git a/src/Kunstmaan/AdminBundle/AdminList/ExceptionAdminListConfigurator.php b/src/Kunstmaan/AdminBundle/AdminList/ExceptionAdminListConfigurator.php
@@ -2,7 +2,7 @@
 
 namespace Kunstmaan\AdminBundle\AdminList;
 
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
 use Kunstmaan\AdminBundle\Entity\Exception;
 use Kunstmaan\AdminBundle\Helper\Security\Acl\AclHelper;
@@ -13,7 +13,7 @@
 
 class ExceptionAdminListConfigurator extends AbstractDoctrineORMAdminListConfigurator
 {
-    public function __construct(EntityManager $em, AclHelper $aclHelper = null)
+    public function __construct(EntityManagerInterface $em, AclHelper $aclHelper = null)
     {
         parent::__construct($em, $aclHelper);
     }

diff --git a/src/Kunstmaan/AdminBundle/Controller/DefaultController.php b/src/Kunstmaan/AdminBundle/Controller/DefaultController.php
@@ -2,7 +2,6 @@
 
 namespace Kunstmaan\AdminBundle\Controller;
 
-use Doctrine\ORM\EntityManager;
 use Doctrine\Persistence\ManagerRegistry;
 use Kunstmaan\AdminBundle\Entity\DashboardConfiguration;
 use Kunstmaan\AdminBundle\FlashMessages\FlashTypes;
@@ -59,7 +58,6 @@ public function indexAction(): Response
     #[Route(path: '/adminindex', name: 'KunstmaanAdminBundle_homepage_admin')]
     public function editIndexAction(Request $request): Response
     {
-        /* @var $em EntityManager */
         $em = $this->managerRegistry->getManager();
 
         /* @var DashboardConfiguration $dashboardConfiguration */

diff --git a/src/Kunstmaan/AdminBundle/Controller/ExceptionController.php b/src/Kunstmaan/AdminBundle/Controller/ExceptionController.php
@@ -2,7 +2,7 @@
 
 namespace Kunstmaan\AdminBundle\Controller;
 
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Kunstmaan\AdminBundle\AdminList\ExceptionAdminListConfigurator;
 use Kunstmaan\AdminBundle\Entity\Exception;
 use Kunstmaan\AdminListBundle\Controller\AbstractAdminListController;
@@ -62,7 +62,6 @@ public function toggleResolveAction(Request $request, Exception $model)
             return new RedirectResponse($this->generateUrl('kunstmaanadminbundle_admin_exception'));
         }
 
-        /* @var EntityManager $em */
         $em = $this->getEntityManager();
 
         $this->getAdminListConfigurator();

diff --git a/src/Kunstmaan/AdminBundle/Helper/CloneHelper.php b/src/Kunstmaan/AdminBundle/Helper/CloneHelper.php
@@ -2,7 +2,7 @@
 
 namespace Kunstmaan\AdminBundle\Helper;
 
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Kunstmaan\AdminBundle\Event\DeepCloneAndSaveEvent;
 use Kunstmaan\AdminBundle\Event\Events;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -13,7 +13,7 @@
 class CloneHelper
 {
     /**
-     * @var EntityManager
+     * @var EntityManagerInterface
      */
     private $em;
 
@@ -22,7 +22,7 @@ class CloneHelper
      */
     private $eventDispatcher;
 
-    public function __construct(EntityManager $em, EventDispatcherInterface $eventDispatcher)
+    public function __construct(EntityManagerInterface $em, EventDispatcherInterface $eventDispatcher)
     {
         $this->em = $em;
         $this->eventDispatcher = $eventDispatcher;

diff --git a/src/Kunstmaan/AdminBundle/Helper/FormWidgets/FormWidget.php b/src/Kunstmaan/AdminBundle/Helper/FormWidgets/FormWidget.php
@@ -2,7 +2,7 @@
 
 namespace Kunstmaan\AdminBundle\Helper\FormWidgets;
 
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Kunstmaan\AdminBundle\Helper\FormHelper;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -76,7 +76,7 @@ public function bindRequest(Request $request)
     {
     }
 
-    public function persist(EntityManager $em)
+    public function persist(EntityManagerInterface $em)
     {
         foreach ($this->data as $item) {
             $em->persist($item);

diff --git a/src/Kunstmaan/AdminBundle/Helper/FormWidgets/FormWidgetInterface.php b/src/Kunstmaan/AdminBundle/Helper/FormWidgets/FormWidgetInterface.php
@@ -2,7 +2,7 @@
 
 namespace Kunstmaan\AdminBundle\Helper\FormWidgets;
 
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Kunstmaan\AdminBundle\Helper\FormWidgets\Tabs\TabInterface;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormView;
@@ -21,9 +21,9 @@ public function buildForm(FormBuilderInterface $builder);
     public function bindRequest(Request $request);
 
     /**
-     * @param EntityManager $em The entity manager
+     * @param EntityManagerInterface $em The entity manager
      */
-    public function persist(EntityManager $em);
+    public function persist(EntityManagerInterface $em);
 
     /**
      * @return array

diff --git a/src/Kunstmaan/AdminBundle/Helper/FormWidgets/ListWidget.php b/src/Kunstmaan/AdminBundle/Helper/FormWidgets/ListWidget.php
@@ -2,7 +2,7 @@
 
 namespace Kunstmaan\AdminBundle\Helper\FormWidgets;
 
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\HttpFoundation\Request;
@@ -49,9 +49,9 @@ public function bindRequest(Request $request)
     }
 
     /**
-     * @param EntityManager $em The entity manager
+     * @param EntityManagerInterfacer $em The entity manager
      */
-    public function persist(EntityManager $em)
+    public function persist(EntityManagerInterface $em)
     {
         foreach ($this->widgets as $widget) {
             $widget->persist($em);

diff --git a/src/Kunstmaan/AdminBundle/Helper/FormWidgets/Tabs/Tab.php b/src/Kunstmaan/AdminBundle/Helper/FormWidgets/Tabs/Tab.php
@@ -2,7 +2,7 @@
 
 namespace Kunstmaan\AdminBundle\Helper\FormWidgets\Tabs;
 
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Kunstmaan\AdminBundle\Helper\FormHelper;
 use Kunstmaan\AdminBundle\Helper\FormWidgets\FormWidget;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -92,7 +92,7 @@ public function bindRequest(Request $request)
         $this->widget->bindRequest($request);
     }
 
-    public function persist(EntityManager $em)
+    public function persist(EntityManagerInterface $em)
     {
         $this->widget->persist($em);
     }

diff --git a/src/Kunstmaan/AdminBundle/Helper/FormWidgets/Tabs/TabPane.php b/src/Kunstmaan/AdminBundle/Helper/FormWidgets/Tabs/TabPane.php
@@ -2,7 +2,7 @@
 
 namespace Kunstmaan\AdminBundle\Helper\FormWidgets\Tabs;
 
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Kunstmaan\UtilitiesBundle\Helper\Slugifier;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\Form;
@@ -93,9 +93,9 @@ public function bindRequest(Request $request)
     }
 
     /**
-     * @param EntityManager $em The entity manager
+     * @param EntityManagerInterface $em The entity manager
      */
-    public function persist(EntityManager $em)
+    public function persist(EntityManagerInterface $em)
     {
         foreach ($this->tabs as $tab) {
             $tab->persist($em);

diff --git a/src/Kunstmaan/AdminBundle/Helper/Security/Acl/AclHelper.php b/src/Kunstmaan/AdminBundle/Helper/Security/Acl/AclHelper.php
@@ -2,7 +2,7 @@
 
 namespace Kunstmaan\AdminBundle\Helper\Security\Acl;
 
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\QuoteStrategy;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\Parameter;
@@ -47,11 +47,11 @@ class AclHelper
     private $permissionsEnabled;
 
     /**
-     * @param EntityManager          $em           The entity manager
+     * @param EntityManagerInterface $em           The entity manager
      * @param TokenStorageInterface  $tokenStorage The security token storage
      * @param RoleHierarchyInterface $rh           The role hierarchies
      */
-    public function __construct(EntityManager $em, TokenStorageInterface $tokenStorage, RoleHierarchyInterface $rh, $permissionsEnabled = true)
+    public function __construct(EntityManagerInterface $em, TokenStorageInterface $tokenStorage, RoleHierarchyInterface $rh, $permissionsEnabled = true)
     {
         $this->em = $em;
         $this->tokenStorage = $tokenStorage;

diff --git a/src/Kunstmaan/AdminBundle/Helper/Security/Acl/AclNativeHelper.php b/src/Kunstmaan/AdminBundle/Helper/Security/Acl/AclNativeHelper.php
@@ -3,7 +3,7 @@
 namespace Kunstmaan\AdminBundle\Helper\Security\Acl;
 
 use Doctrine\DBAL\Query\QueryBuilder;
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\MaskBuilder;
 use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\PermissionDefinition;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
@@ -18,7 +18,7 @@
 class AclNativeHelper
 {
     /**
-     * @var EntityManager
+     * @var EntityManagerInterface
      */
     private $em;
 
@@ -38,11 +38,11 @@ class AclNativeHelper
     private $permissionsEnabled;
 
     /**
-     * @param EntityManager          $em           The entity manager
+     * @param EntityManagerInterface $em           The entity manager
      * @param TokenStorageInterface  $tokenStorage The security context
      * @param RoleHierarchyInterface $rh           The role hierarchies
      */
-    public function __construct(EntityManager $em, TokenStorageInterface $tokenStorage, RoleHierarchyInterface $rh, $permissionsEnabled = true)
+    public function __construct(EntityManagerInterface $em, TokenStorageInterface $tokenStorage, RoleHierarchyInterface $rh, $permissionsEnabled = true)
     {
         $this->em = $em;
         $this->tokenStorage = $tokenStorage;

diff --git a/src/Kunstmaan/AdminBundle/Helper/Security/Acl/Permission/PermissionAdmin.php b/src/Kunstmaan/AdminBundle/Helper/Security/Acl/Permission/PermissionAdmin.php
@@ -2,7 +2,7 @@
 
 namespace Kunstmaan\AdminBundle\Helper\Security\Acl\Permission;
 
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Kunstmaan\AdminBundle\Entity\AbstractEntity;
 use Kunstmaan\AdminBundle\Entity\AclChangeset;
 use Kunstmaan\AdminBundle\Entity\BaseUser;
@@ -36,7 +36,7 @@ class PermissionAdmin
     protected $resource;
 
     /**
-     * @var EntityManager
+     * @var EntityManagerInterface
      */
     protected $em;
 
@@ -81,7 +81,7 @@ class PermissionAdmin
     protected $shellHelper;
 
     /**
-     * @param EntityManager                            $em                   The EntityManager
+     * @param EntityManagerInterface                   $em                   The EntityManager
      * @param TokenStorageInterface                    $tokenStorage         The token storage
      * @param AclProviderInterface                     $aclProvider          The ACL provider
      * @param ObjectIdentityRetrievalStrategyInterface $oidRetrievalStrategy The object retrieval strategy
@@ -90,7 +90,7 @@ class PermissionAdmin
      * @param KernelInterface                          $kernel               The kernel
      */
     public function __construct(
-        EntityManager $em,
+        EntityManagerInterface $em,
         TokenStorageInterface $tokenStorage,
         AclProviderInterface $aclProvider,
         ObjectIdentityRetrievalStrategyInterface $oidRetrievalStrategy,

diff --git a/src/Kunstmaan/AdminBundle/Tests/Helper/FormWidgets/FormWidgetTest.php b/src/Kunstmaan/AdminBundle/Tests/Helper/FormWidgets/FormWidgetTest.php
@@ -2,7 +2,7 @@
 
 namespace Kunstmaan\AdminBundle\Tests\Helper\FormWidgets;
 
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Kunstmaan\AdminBundle\Entity\User;
 use Kunstmaan\AdminBundle\Helper\FormWidgets\FormWidget;
 use PHPUnit\Framework\TestCase;
@@ -16,7 +16,7 @@ class FormWidgetTest extends TestCase
     public function testWidget()
     {
         $builder = $this->createMock(FormBuilder::class);
-        $em = $this->createMock(EntityManager::class);
+        $em = $this->createMock(EntityManagerInterface::class);
         $em->expects($this->once())->method('persist')->willReturn(new User());
         $builder->expects($this->once())->method('getData');
         $builder->expects($this->atLeastOnce())->method('add');

diff --git a/src/Kunstmaan/AdminBundle/Tests/Helper/FormWidgets/ListWidgetTest.php b/src/Kunstmaan/AdminBundle/Tests/Helper/FormWidgets/ListWidgetTest.php
@@ -2,7 +2,7 @@
 
 namespace Kunstmaan\AdminBundle\Tests\Helper\FormWidgets;
 
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Kunstmaan\AdminBundle\Helper\FormWidgets\FormWidget;
 use Kunstmaan\AdminBundle\Helper\FormWidgets\ListWidget;
 use PHPUnit\Framework\TestCase;
@@ -19,7 +19,7 @@ public function testWidget()
 
         $widget = $this->createMock(FormWidget::class);
         $builder = $this->createMock(FormBuilder::class);
-        $em = $this->createMock(EntityManager::class);
+        $em = $this->createMock(EntityManagerInterface::class);
 
         $widget->expects($this->exactly(2))->method('bindRequest')->willReturn(true);
         $widget->expects($this->exactly(2))->method('persist')->willReturn(true);

diff --git a/src/Kunstmaan/AdminBundle/Tests/Helper/FormWidgets/Tabs/TabTest.php b/src/Kunstmaan/AdminBundle/Tests/Helper/FormWidgets/Tabs/TabTest.php
@@ -2,7 +2,7 @@
 
 namespace Kunstmaan\AdminBundle\Tests\Helper\FormWidgets\Tabs;
 
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Kunstmaan\AdminBundle\Helper\FormHelper;
 use Kunstmaan\AdminBundle\Helper\FormWidgets\FormWidget;
 use Kunstmaan\AdminBundle\Helper\FormWidgets\Tabs\Tab;
@@ -18,7 +18,7 @@ class TabTest extends TestCase
      */
     public function testTab()
     {
-        $em = $this->createMock(EntityManager::class);
+        $em = $this->createMock(EntityManagerInterface::class);
         $builder = $this->createMock(FormBuilder::class);
         $view = $this->createMock(FormView::class);
         $widget = $this->createMock(FormWidget::class);

diff --git a/src/Kunstmaan/AdminBundle/Tests/Helper/Security/Acl/AclHelperTest.php b/src/Kunstmaan/AdminBundle/Tests/Helper/Security/Acl/AclHelperTest.php
@@ -5,7 +5,7 @@
 use Doctrine\DBAL\Platforms\MySQL57Platform;
 use Doctrine\DBAL\Result;
 use Doctrine\ORM\Configuration;
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\QuoteStrategy;
 use Doctrine\ORM\NativeQuery;
@@ -26,7 +26,7 @@
 class AclHelperTest extends TestCase
 {
     /**
-     * @var EntityManager
+     * @var EntityManagerInterface
      */
     protected $em;
 

diff --git a/src/Kunstmaan/AdminBundle/Tests/Helper/Security/Acl/AclNativeHelperTest.php b/src/Kunstmaan/AdminBundle/Tests/Helper/Security/Acl/AclNativeHelperTest.php
@@ -5,7 +5,7 @@
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Platforms\MySQL57Platform;
 use Doctrine\DBAL\Query\QueryBuilder;
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Kunstmaan\AdminBundle\Entity\User;
 use Kunstmaan\AdminBundle\Entity\UserInterface;
@@ -21,7 +21,7 @@
 class AclNativeHelperTest extends TestCase
 {
     /**
-     * @var EntityManager
+     * @var EntityManagerInterface
      */
     protected $em;
 

diff --git a/src/Kunstmaan/AdminBundle/Tests/Helper/Security/Acl/AclWalkerTest.php b/src/Kunstmaan/AdminBundle/Tests/Helper/Security/Acl/AclWalkerTest.php
@@ -6,7 +6,7 @@
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\Configuration;
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\QuoteStrategy;
 use Doctrine\ORM\Query;
@@ -40,7 +40,7 @@ public function testWalker()
         $conn = $this->createMock(Connection::class);
         $conn->expects($this->any())->method('getDatabasePlatform')->willReturn($platform);
 
-        $em = $this->createMock(EntityManager::class);
+        $em = $this->createMock(EntityManagerInterface::class);
         $query = $this->createMock(AbstractQuery::class);
         $mapping = $this->createMock(ResultSetMapping::class);
         $result = $this->createMock(ParserResult::class);

diff --git a/src/Kunstmaan/AdminBundle/Tests/Helper/Security/Acl/Permission/PermissionAdminTest.php b/src/Kunstmaan/AdminBundle/Tests/Helper/Security/Acl/Permission/PermissionAdminTest.php
@@ -3,7 +3,7 @@
 namespace Kunstmaan\AdminBundle\Tests\Helper\Security\Acl\Permission;
 
 use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Kunstmaan\AdminBundle\Entity\AbstractEntity;
 use Kunstmaan\AdminBundle\Entity\Role;
@@ -143,7 +143,7 @@ public function testCreateAclChangeset()
     /**
      * Return entity manager mock
      */
-    public function getEntityManager(): EntityManager
+    public function getEntityManager(): EntityManagerInterface
     {
         return $this->getMockBuilder('Doctrine\ORM\EntityManager')
             ->disableOriginalConstructor()