Add support for doctrine/common 3

nucleos · Aug 20, 2020 · 68aae8c · 68aae8c
1 parent 4146d63
commit 68aae8c
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -22,10 +22,11 @@
     ],
     "require": {
         "php": "^7.3",
-        "doctrine/common": "^2.8",
+        "doctrine/common": "^2.12 || ^3.0",
         "doctrine/dbal": "^2.6",
         "doctrine/event-manager": "^1.0",
         "doctrine/orm": "^2.5",
+        "doctrine/persistence": "^1.1 || ^2.0",
         "symfony/property-access": "^4.2 || ^5.0"
     },
     "conflict": {

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -70,6 +70,16 @@ parameters:
 			count: 1
 			path: tests/Fixtures/DemoEntityManager.php
 
+		-
+			message: "#^Parameter \\#1 \\$className of method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:getRepository\\(\\) expects class\\-string\\<mixed\\>, string given\\.$#"
+			count: 1
+			path: tests/Fixtures/DemoEntityManager.php
+
+		-
+			message: "#^Unable to resolve the template type T in call to method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:getRepository\\(\\)$#"
+			count: 1
+			path: tests/Fixtures/DemoEntityManager.php
+
 		-
 			message: "#^Only booleans are allowed in a negated boolean, Doctrine\\\\Persistence\\\\ObjectManager\\|null given\\.$#"
 			count: 1

diff --git a/tests/Adapter/ORM/EntityManagerTraitTest.php b/tests/Adapter/ORM/EntityManagerTraitTest.php
@@ -11,15 +11,18 @@
 
 namespace Nucleos\Doctrine\Tests\Adapter\ORM;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
-use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ObjectManager;
 use Nucleos\Doctrine\Tests\Fixtures\DemoEntityManager;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 final class EntityManagerTraitTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function testCreateQueryBuilder(): void
     {
         $queryBuilder = $this->prophesize(QueryBuilder::class);

diff --git a/tests/EventListener/ORM/ConfirmableListenerTest.php b/tests/EventListener/ORM/ConfirmableListenerTest.php
@@ -19,10 +19,13 @@
 use Nucleos\Doctrine\Tests\Fixtures\EmptyClass;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use ReflectionClass;
 
 final class ConfirmableListenerTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function testGetSubscribedEvents(): void
     {
         $listener = new ConfirmableListener();

diff --git a/tests/EventListener/ORM/DeletableListenerTest.php b/tests/EventListener/ORM/DeletableListenerTest.php
@@ -19,10 +19,13 @@
 use Nucleos\Doctrine\Tests\Fixtures\EmptyClass;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use ReflectionClass;
 
 final class DeletableListenerTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function testGetSubscribedEvents(): void
     {
         $listener = new DeletableListener();

diff --git a/tests/EventListener/ORM/LifecycleDateListenerTest.php b/tests/EventListener/ORM/LifecycleDateListenerTest.php
@@ -23,11 +23,14 @@
 use Nucleos\Doctrine\Tests\Fixtures\EmptyClass;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use ReflectionClass;
 use stdClass;
 
 final class LifecycleDateListenerTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function testGetSubscribedEvents(): void
     {
         $listener = new LifecycleDateListener();

diff --git a/tests/EventListener/ORM/SortableListenerTest.php b/tests/EventListener/ORM/SortableListenerTest.php
@@ -22,11 +22,14 @@
 use Nucleos\Doctrine\Tests\Fixtures\EmptyClass;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use ReflectionClass;
 use stdClass;
 
 final class SortableListenerTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function testGetSubscribedEvents(): void
     {
         $listener = new SortableListener();

diff --git a/tests/EventListener/ORM/TablePrefixEventListenerTest.php b/tests/EventListener/ORM/TablePrefixEventListenerTest.php
@@ -14,9 +14,12 @@
 use Doctrine\ORM\Events;
 use Nucleos\Doctrine\EventListener\ORM\TablePrefixEventListener;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 final class TablePrefixEventListenerTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function testGetSubscribedEvents(): void
     {
         $listener = new TablePrefixEventListener('acme_');

diff --git a/tests/EventListener/ORM/UniqueActiveListenerTest.php b/tests/EventListener/ORM/UniqueActiveListenerTest.php
@@ -22,11 +22,14 @@
 use Nucleos\Doctrine\Tests\Fixtures\EmptyClass;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use ReflectionClass;
 use stdClass;
 
 final class UniqueActiveListenerTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function testGetSubscribedEvents(): void
     {
         $listener = new UniqueActiveListener();

diff --git a/tests/Fixtures/DemoEntityManager.php b/tests/Fixtures/DemoEntityManager.php
@@ -11,11 +11,11 @@
 
 namespace Nucleos\Doctrine\Tests\Fixtures;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
-use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\Expr\Composite;
 use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ObjectManager;
 use Nucleos\Doctrine\Adapter\ORM\EntityManagerTrait;
 use Nucleos\Doctrine\Manager\ORM\BaseQueryTrait;
 use Nucleos\Doctrine\Manager\ORM\SearchQueryTrait;

diff --git a/tests/Manager/ORM/BaseQueryTraitTest.php b/tests/Manager/ORM/BaseQueryTraitTest.php
@@ -11,15 +11,18 @@
 
 namespace Nucleos\Doctrine\Tests\Manager\ORM;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
-use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ObjectManager;
 use Nucleos\Doctrine\Tests\Fixtures\DemoEntityManager;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 final class BaseQueryTraitTest extends TestCase
 {
+    use ProphecyTrait;
+
     /**
      * @var DemoEntityManager
      */

diff --git a/tests/Manager/ORM/SearchQueryTraitTest.php b/tests/Manager/ORM/SearchQueryTraitTest.php
@@ -11,18 +11,21 @@
 
 namespace Nucleos\Doctrine\Tests\Manager\ORM;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
-use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\Query\Expr\Orx;
 use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ObjectManager;
 use Nucleos\Doctrine\Tests\Fixtures\DemoEntityManager;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 
 final class SearchQueryTraitTest extends TestCase
 {
+    use ProphecyTrait;
+
     /**
      * @var DemoEntityManager
      */