From f7a8b0faa0f55562967495bd18545a1693a4f76d Mon Sep 17 00:00:00 2001 From: Kevin Defives Date: Fri, 4 Sep 2020 11:28:49 +0200 Subject: [PATCH 1/6] 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/6] 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/6] 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; From 640e4108bf9b12e87e26e1392475746137de206e Mon Sep 17 00:00:00 2001 From: Niv Penso Date: Tue, 13 Oct 2020 19:06:17 +0300 Subject: [PATCH 4/6] fixing some files according to php-cs-fixer --- .../Extension/DoctrineClosedEntityManagerExtensionTest.php | 2 +- .../Extension/DoctrinePingConnectionExtensionTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClosedEntityManagerExtensionTest.php b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClosedEntityManagerExtensionTest.php index aa12bf7b8..8e7120325 100644 --- a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClosedEntityManagerExtensionTest.php +++ b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClosedEntityManagerExtensionTest.php @@ -2,8 +2,8 @@ namespace Enqueue\Bundle\Tests\Unit\Consumption\Extension; -use Doctrine\Persistence\ManagerRegistry; use Doctrine\ORM\EntityManagerInterface; +use Doctrine\Persistence\ManagerRegistry; use Enqueue\Bundle\Consumption\Extension\DoctrineClosedEntityManagerExtension; use Enqueue\Consumption\Context\PostConsume; use Enqueue\Consumption\Context\PostMessageReceived; diff --git a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrinePingConnectionExtensionTest.php b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrinePingConnectionExtensionTest.php index b6eddfa93..fd2ae06aa 100644 --- a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrinePingConnectionExtensionTest.php +++ b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrinePingConnectionExtensionTest.php @@ -2,8 +2,8 @@ namespace Enqueue\Bundle\Tests\Unit\Consumption\Extension; -use Doctrine\Persistence\ManagerRegistry; use Doctrine\DBAL\Connection; +use Doctrine\Persistence\ManagerRegistry; use Enqueue\Bundle\Consumption\Extension\DoctrinePingConnectionExtension; use Enqueue\Consumption\Context\MessageReceived; use Interop\Queue\Consumer; From 091f359486ab7acce1d964752d15aa71083b7f17 Mon Sep 17 00:00:00 2001 From: Niv Penso Date: Tue, 13 Oct 2020 19:43:25 +0300 Subject: [PATCH 5/6] fix for namespace changed from Doctrine\Common\Persistence\ManagerRegistry to Doctrine\Persistence\ManagerRegistry --- composer.json | 7 ++---- docs/transport/dbal.md | 2 +- pkg/dbal/ManagerRegistryConnectionFactory.php | 5 +--- .../ManagerRegistryConnectionFactoryTest.php | 2 +- .../DoctrineClearIdentityMapExtension.php | 5 +--- .../DoctrineClosedEntityManagerExtension.php | 2 +- .../DoctrinePingConnectionExtension.php | 2 +- .../Extension/ResetServicesExtensionTest.php | 2 +- pkg/job-queue/Doctrine/JobStorage.php | 23 ++++--------------- .../Tests/Doctrine/JobStorageTest.php | 2 +- 10 files changed, 15 insertions(+), 37 deletions(-) diff --git a/composer.json b/composer.json index 4a38f76bf..21cf655c1 100644 --- a/composer.json +++ b/composer.json @@ -62,9 +62,6 @@ "kwn/php-rdkafka-stubs": "^1.0.2 | ^2.0", "friendsofphp/php-cs-fixer": "^2" }, - "conflict": { - "doctrine/persistence": ">=1.3.0" - }, "autoload": { "psr-4": { "Enqueue\\AmqpBunny\\": "pkg/amqp-bunny/", @@ -124,6 +121,6 @@ "prefer-stable": true }, "conflict": { - "doctrine/persistence": "<1.3.0" - } + "doctrine/persistence": "<1.3.0" + } } diff --git a/docs/transport/dbal.md b/docs/transport/dbal.md index ab1107b60..559414a74 100644 --- a/docs/transport/dbal.md +++ b/docs/transport/dbal.md @@ -48,7 +48,7 @@ $context = $factory->createContext(); ```php 1000, - How often query for new messages (milliseconds) * 'lazy' => true, - Use lazy database connection (boolean) * ]. - * - * @param ManagerRegistry $registry - * @param array $config */ public function __construct(ManagerRegistry $registry, array $config = []) { diff --git a/pkg/dbal/Tests/ManagerRegistryConnectionFactoryTest.php b/pkg/dbal/Tests/ManagerRegistryConnectionFactoryTest.php index 953921b87..3adefff01 100644 --- a/pkg/dbal/Tests/ManagerRegistryConnectionFactoryTest.php +++ b/pkg/dbal/Tests/ManagerRegistryConnectionFactoryTest.php @@ -2,8 +2,8 @@ namespace Enqueue\Dbal\Tests; -use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\DBAL\Connection; +use Doctrine\Persistence\ManagerRegistry; use Enqueue\Dbal\DbalContext; use Enqueue\Dbal\ManagerRegistryConnectionFactory; use Enqueue\Test\ClassExtensionTrait; diff --git a/pkg/enqueue-bundle/Consumption/Extension/DoctrineClearIdentityMapExtension.php b/pkg/enqueue-bundle/Consumption/Extension/DoctrineClearIdentityMapExtension.php index a8f258f21..d02b9a274 100644 --- a/pkg/enqueue-bundle/Consumption/Extension/DoctrineClearIdentityMapExtension.php +++ b/pkg/enqueue-bundle/Consumption/Extension/DoctrineClearIdentityMapExtension.php @@ -2,7 +2,7 @@ namespace Enqueue\Bundle\Consumption\Extension; -use Doctrine\Common\Persistence\ManagerRegistry; +use Doctrine\Persistence\ManagerRegistry; use Enqueue\Consumption\Context\MessageReceived; use Enqueue\Consumption\MessageReceivedExtensionInterface; @@ -13,9 +13,6 @@ class DoctrineClearIdentityMapExtension implements MessageReceivedExtensionInter */ protected $registry; - /** - * @param ManagerRegistry $registry - */ public function __construct(ManagerRegistry $registry) { $this->registry = $registry; diff --git a/pkg/enqueue-bundle/Consumption/Extension/DoctrineClosedEntityManagerExtension.php b/pkg/enqueue-bundle/Consumption/Extension/DoctrineClosedEntityManagerExtension.php index d2765231a..e5ad0c6cf 100644 --- a/pkg/enqueue-bundle/Consumption/Extension/DoctrineClosedEntityManagerExtension.php +++ b/pkg/enqueue-bundle/Consumption/Extension/DoctrineClosedEntityManagerExtension.php @@ -2,8 +2,8 @@ namespace Enqueue\Bundle\Consumption\Extension; -use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\ORM\EntityManagerInterface; +use Doctrine\Persistence\ManagerRegistry; use Enqueue\Consumption\Context\PostConsume; use Enqueue\Consumption\Context\PostMessageReceived; use Enqueue\Consumption\Context\PreConsume; diff --git a/pkg/enqueue-bundle/Consumption/Extension/DoctrinePingConnectionExtension.php b/pkg/enqueue-bundle/Consumption/Extension/DoctrinePingConnectionExtension.php index 88453e77c..77212508f 100644 --- a/pkg/enqueue-bundle/Consumption/Extension/DoctrinePingConnectionExtension.php +++ b/pkg/enqueue-bundle/Consumption/Extension/DoctrinePingConnectionExtension.php @@ -2,8 +2,8 @@ namespace Enqueue\Bundle\Consumption\Extension; -use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\DBAL\Connection; +use Doctrine\Persistence\ManagerRegistry; use Enqueue\Consumption\Context\MessageReceived; use Enqueue\Consumption\MessageReceivedExtensionInterface; diff --git a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/ResetServicesExtensionTest.php b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/ResetServicesExtensionTest.php index 8fbe29791..bfd772a5c 100644 --- a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/ResetServicesExtensionTest.php +++ b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/ResetServicesExtensionTest.php @@ -2,7 +2,7 @@ namespace Enqueue\Bundle\Tests\Unit\Consumption\Extension; -use Doctrine\Common\Persistence\ManagerRegistry; +use Doctrine\Persistence\ManagerRegistry; use Enqueue\Bundle\Consumption\Extension\ResetServicesExtension; use Enqueue\Consumption\Context\MessageReceived; use Interop\Queue\Consumer; diff --git a/pkg/job-queue/Doctrine/JobStorage.php b/pkg/job-queue/Doctrine/JobStorage.php index 32e20fe8d..385ee4d38 100644 --- a/pkg/job-queue/Doctrine/JobStorage.php +++ b/pkg/job-queue/Doctrine/JobStorage.php @@ -2,12 +2,12 @@ namespace Enqueue\JobQueue\Doctrine; -use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\DBAL\Connection; use Doctrine\DBAL\Exception\UniqueConstraintViolationException; use Doctrine\DBAL\LockMode; use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityRepository; +use Doctrine\Persistence\ManagerRegistry; use Enqueue\JobQueue\DuplicateJobException; use Enqueue\JobQueue\Job; @@ -39,9 +39,8 @@ class JobStorage private $uniqueTableName; /** - * @param ManagerRegistry $doctrine - * @param string $entityClass - * @param string $uniqueTableName + * @param string $entityClass + * @param string $uniqueTableName */ public function __construct(ManagerRegistry $doctrine, $entityClass, $uniqueTableName) { @@ -90,7 +89,6 @@ public function findRootJobByOwnerIdAndJobName($ownerId, $jobName) /** * @param string $name - * @param Job $rootJob * * @return Job */ @@ -119,20 +117,13 @@ public function createJob() } /** - * @param Job $job - * @param \Closure|null $lockCallback - * * @throws DuplicateJobException */ public function saveJob(Job $job, \Closure $lockCallback = null) { $class = $this->getEntityRepository()->getClassName(); if (!$job instanceof $class) { - throw new \LogicException(sprintf( - 'Got unexpected job instance: expected: "%s", actual" "%s"', - $class, - get_class($job) - )); + throw new \LogicException(sprintf('Got unexpected job instance: expected: "%s", actual" "%s"', $class, get_class($job))); } if ($lockCallback) { @@ -175,11 +166,7 @@ public function saveJob(Job $job, \Closure $lockCallback = null) ]); } } catch (UniqueConstraintViolationException $e) { - throw new DuplicateJobException(sprintf( - 'Duplicate job. ownerId:"%s", name:"%s"', - $job->getOwnerId(), - $job->getName() - )); + throw new DuplicateJobException(sprintf('Duplicate job. ownerId:"%s", name:"%s"', $job->getOwnerId(), $job->getName())); } $this->getEntityManager()->persist($job); diff --git a/pkg/job-queue/Tests/Doctrine/JobStorageTest.php b/pkg/job-queue/Tests/Doctrine/JobStorageTest.php index 622a79819..38d72a81c 100644 --- a/pkg/job-queue/Tests/Doctrine/JobStorageTest.php +++ b/pkg/job-queue/Tests/Doctrine/JobStorageTest.php @@ -2,12 +2,12 @@ namespace Enqueue\JobQueue\Tests\Doctrine; -use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\DBAL\Connection; use Doctrine\DBAL\Exception\UniqueConstraintViolationException; use Doctrine\DBAL\LockMode; use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityRepository; +use Doctrine\Persistence\ManagerRegistry; use Enqueue\JobQueue\Doctrine\JobStorage; use Enqueue\JobQueue\DuplicateJobException; use Enqueue\JobQueue\Job; From c981b565a612ac9dc583009457d6fcda4b976f7d Mon Sep 17 00:00:00 2001 From: Niv Penso Date: Tue, 13 Oct 2020 22:20:05 +0300 Subject: [PATCH 6/6] update pkg/dbdal --- pkg/dbal/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/dbal/composer.json b/pkg/dbal/composer.json index 868cc7266..e097f228c 100644 --- a/pkg/dbal/composer.json +++ b/pkg/dbal/composer.json @@ -18,7 +18,7 @@ "queue-interop/queue-spec": "^0.6" }, "conflict": { - "doctrine/persistence": ">=1.3.0" + "doctrine/persistence": "<1.3.0" }, "support": { "email": "opensource@forma-pro.com",