From 64cdba07d4de448845f80ea55d5af578020bc661 Mon Sep 17 00:00:00 2001 From: Lctrs Date: Mon, 5 Aug 2019 10:30:21 +0200 Subject: [PATCH] [DoctrineClearIdentityMapExtension] allow instances of ManagerRegistry We only use the method `getManagers()` which comes from this interface, and not the RegistryInterface from Sf's doctrine bridge. So it makes sense to allow passing implementations of parent interfaces. This will also allow us to use this class with Doctrine ODM. --- .../Extension/DoctrineClearIdentityMapExtension.php | 8 ++++---- .../Extension/DoctrineClearIdentityMapExtensionTest.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/enqueue-bundle/Consumption/Extension/DoctrineClearIdentityMapExtension.php b/pkg/enqueue-bundle/Consumption/Extension/DoctrineClearIdentityMapExtension.php index 3a973d6b2..a8f258f21 100644 --- a/pkg/enqueue-bundle/Consumption/Extension/DoctrineClearIdentityMapExtension.php +++ b/pkg/enqueue-bundle/Consumption/Extension/DoctrineClearIdentityMapExtension.php @@ -2,21 +2,21 @@ namespace Enqueue\Bundle\Consumption\Extension; +use Doctrine\Common\Persistence\ManagerRegistry; use Enqueue\Consumption\Context\MessageReceived; use Enqueue\Consumption\MessageReceivedExtensionInterface; -use Symfony\Bridge\Doctrine\RegistryInterface; class DoctrineClearIdentityMapExtension implements MessageReceivedExtensionInterface { /** - * @var RegistryInterface + * @var ManagerRegistry */ protected $registry; /** - * @param RegistryInterface $registry + * @param ManagerRegistry $registry */ - public function __construct(RegistryInterface $registry) + public function __construct(ManagerRegistry $registry) { $this->registry = $registry; } diff --git a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClearIdentityMapExtensionTest.php b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClearIdentityMapExtensionTest.php index db3f28e00..47dceeb36 100644 --- a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClearIdentityMapExtensionTest.php +++ b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClearIdentityMapExtensionTest.php @@ -2,6 +2,7 @@ namespace Enqueue\Bundle\Tests\Unit\Consumption\Extension; +use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\Common\Persistence\ObjectManager; use Enqueue\Bundle\Consumption\Extension\DoctrineClearIdentityMapExtension; use Enqueue\Consumption\Context\MessageReceived; @@ -11,7 +12,6 @@ use Interop\Queue\Processor; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; -use Symfony\Bridge\Doctrine\RegistryInterface; class DoctrineClearIdentityMapExtensionTest extends TestCase { @@ -59,11 +59,11 @@ protected function createContext(): MessageReceived } /** - * @return \PHPUnit_Framework_MockObject_MockObject|RegistryInterface + * @return \PHPUnit_Framework_MockObject_MockObject|ManagerRegistry */ - protected function createRegistryMock(): RegistryInterface + protected function createRegistryMock(): ManagerRegistry { - return $this->createMock(RegistryInterface::class); + return $this->createMock(ManagerRegistry::class); } /**