From f7a8b0faa0f55562967495bd18545a1693a4f76d Mon Sep 17 00:00:00 2001 From: Kevin Defives Date: Fri, 4 Sep 2020 11:28:49 +0200 Subject: [PATCH 1/3] Fix #1085 Fix #1085 - Fix to be compatible with doctrine v3 . Since Doctrine v3, seems some changes with doctrine/common --- pkg/enqueue/Doctrine/DoctrineConnectionFactoryFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/enqueue/Doctrine/DoctrineConnectionFactoryFactory.php b/pkg/enqueue/Doctrine/DoctrineConnectionFactoryFactory.php index b6e684cdd..1fd336c4e 100644 --- a/pkg/enqueue/Doctrine/DoctrineConnectionFactoryFactory.php +++ b/pkg/enqueue/Doctrine/DoctrineConnectionFactoryFactory.php @@ -2,7 +2,7 @@ namespace Enqueue\Doctrine; -use Doctrine\Common\Persistence\ManagerRegistry; +use Doctrine\Persistence\ManagerRegistry; use Enqueue\ConnectionFactoryFactoryInterface; use Enqueue\Dbal\ManagerRegistryConnectionFactory; use Enqueue\Dsn\Dsn; From 4a8265f550c058d117f63ea1423ae00b412765ab Mon Sep 17 00:00:00 2001 From: Kevin Defives Date: Fri, 4 Sep 2020 15:56:45 +0200 Subject: [PATCH 2/3] Add conflict "doctrine/persistence": "<1.3.0" Add conflict "doctrine/persistence": "<1.3.0" --- composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d9418163c..793c1294f 100644 --- a/composer.json +++ b/composer.json @@ -119,5 +119,8 @@ "ext-mongo": "1.6.14" }, "prefer-stable": true - } + }, + "conflict": { + "doctrine/persistence": "<1.3.0" + } } From 95959bd112d1cedeb6d56dd20ab70cbb85a1e72f Mon Sep 17 00:00:00 2001 From: Kevin Date: Fri, 4 Sep 2020 20:48:09 +0200 Subject: [PATCH 3/3] Change doctine\common by doctrine --- .../Extension/DoctrineClearIdentityMapExtensionTest.php | 4 ++-- .../Extension/DoctrineClosedEntityManagerExtensionTest.php | 2 +- .../Extension/DoctrinePingConnectionExtensionTest.php | 2 +- pkg/enqueue/Tests/DoctrineConnectionFactoryFactoryTest.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClearIdentityMapExtensionTest.php b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClearIdentityMapExtensionTest.php index 852960458..604012e78 100644 --- a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClearIdentityMapExtensionTest.php +++ b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClearIdentityMapExtensionTest.php @@ -2,8 +2,8 @@ namespace Enqueue\Bundle\Tests\Unit\Consumption\Extension; -use Doctrine\Common\Persistence\ManagerRegistry; -use Doctrine\Common\Persistence\ObjectManager; +use Doctrine\Persistence\ManagerRegistry; +use Doctrine\Persistence\ObjectManager; use Enqueue\Bundle\Consumption\Extension\DoctrineClearIdentityMapExtension; use Enqueue\Consumption\Context\MessageReceived; use Interop\Queue\Consumer; diff --git a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClosedEntityManagerExtensionTest.php b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClosedEntityManagerExtensionTest.php index 59587adfb..aa12bf7b8 100644 --- a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClosedEntityManagerExtensionTest.php +++ b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClosedEntityManagerExtensionTest.php @@ -2,7 +2,7 @@ namespace Enqueue\Bundle\Tests\Unit\Consumption\Extension; -use Doctrine\Common\Persistence\ManagerRegistry; +use Doctrine\Persistence\ManagerRegistry; use Doctrine\ORM\EntityManagerInterface; use Enqueue\Bundle\Consumption\Extension\DoctrineClosedEntityManagerExtension; use Enqueue\Consumption\Context\PostConsume; diff --git a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrinePingConnectionExtensionTest.php b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrinePingConnectionExtensionTest.php index 829882d4f..b6eddfa93 100644 --- a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrinePingConnectionExtensionTest.php +++ b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrinePingConnectionExtensionTest.php @@ -2,7 +2,7 @@ namespace Enqueue\Bundle\Tests\Unit\Consumption\Extension; -use Doctrine\Common\Persistence\ManagerRegistry; +use Doctrine\Persistence\ManagerRegistry; use Doctrine\DBAL\Connection; use Enqueue\Bundle\Consumption\Extension\DoctrinePingConnectionExtension; use Enqueue\Consumption\Context\MessageReceived; diff --git a/pkg/enqueue/Tests/DoctrineConnectionFactoryFactoryTest.php b/pkg/enqueue/Tests/DoctrineConnectionFactoryFactoryTest.php index cf1e5918a..7282aa42e 100644 --- a/pkg/enqueue/Tests/DoctrineConnectionFactoryFactoryTest.php +++ b/pkg/enqueue/Tests/DoctrineConnectionFactoryFactoryTest.php @@ -4,7 +4,7 @@ namespace Enqueue\Tests; -use Doctrine\Common\Persistence\ManagerRegistry; +use Doctrine\Persistence\ManagerRegistry; use Enqueue\ConnectionFactoryFactoryInterface; use Enqueue\Dbal\ManagerRegistryConnectionFactory; use Enqueue\Doctrine\DoctrineConnectionFactoryFactory;