Drop support of doctrine/persistence with the Common namespace

ondrejmirtes · ondrejmirtes · commit b43fe3e68202 · 2020-06-01T15:11:40.000+02:00
diff --git a/composer.json b/composer.json
@@ -13,7 +13,8 @@
 		"doctrine/collections": "<1.0",
 		"doctrine/common": "<2.7",
 		"doctrine/mongodb-odm": "<1.2",
-		"doctrine/orm": "<2.5"
+		"doctrine/orm": "<2.5",
+		"doctrine/persistence": "<1.3"
 	},
 	"require-dev": {
 		"consistence/coding-standard": "^3.0.1",
diff --git a/extension.neon b/extension.neon
@@ -17,11 +17,7 @@ parameters:
 		- stubs/EntityManagerDecorator.stub
 		- stubs/EntityManagerInterface.stub
 		- stubs/EntityRepository.stub
-		- stubs/ManagerRegistry.stub
 		- stubs/MongoClassMetadataInfo.stub
-		- stubs/ObjectManager.stub
-		- stubs/ObjectManagerDecorator.stub
-		- stubs/ObjectRepository.stub
 		- stubs/Persistence/ManagerRegistry.stub
 		- stubs/Persistence/ObjectManager.stub
 		- stubs/Persistence/ObjectManagerDecorator.stub
@@ -118,14 +114,14 @@ services:
 		tags:
 			- phpstan.broker.dynamicMethodReturnTypeExtension
 		arguments:
-			managerClass: Doctrine\Common\Persistence\ManagerRegistry
+			managerClass: Doctrine\Persistence\ManagerRegistry
 
 	objectManagerGetRepository:
 		class: PHPStan\Type\Doctrine\GetRepositoryDynamicReturnTypeExtension
 		tags:
 			- phpstan.broker.dynamicMethodReturnTypeExtension
 		arguments:
-			managerClass: Doctrine\Common\Persistence\ObjectManager
+			managerClass: Doctrine\Persistence\ObjectManager
 
 	persistenceManagerRegistryGetRepository:
 		class: PHPStan\Type\Doctrine\GetRepositoryDynamicReturnTypeExtension
diff --git a/src/Reflection/Doctrine/EntityRepositoryClassReflectionExtension.php b/src/Reflection/Doctrine/EntityRepositoryClassReflectionExtension.php
@@ -2,7 +2,7 @@
 
 namespace PHPStan\Reflection\Doctrine;
 
-use Doctrine\Common\Persistence\ObjectRepository;
+use Doctrine\Persistence\ObjectRepository;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Doctrine\ObjectMetadataResolver;
 use PHPStan\Type\IntegerType;
diff --git a/src/Rules/Doctrine/ORM/RepositoryMethodCallRule.php b/src/Rules/Doctrine/ORM/RepositoryMethodCallRule.php
@@ -2,7 +2,7 @@
 
 namespace PHPStan\Rules\Doctrine\ORM;
 
-use Doctrine\Common\Persistence\ObjectRepository;
+use Doctrine\Persistence\ObjectRepository;
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
 use PHPStan\Rules\Rule;
diff --git a/src/Type/Doctrine/ObjectMetadataResolver.php b/src/Type/Doctrine/ObjectMetadataResolver.php
@@ -2,7 +2,7 @@
 
 namespace PHPStan\Type\Doctrine;
 
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use PHPStan\Reflection\ReflectionProvider;
 use function file_exists;
 use function is_readable;
diff --git a/stubs/DocumentManager.stub b/stubs/DocumentManager.stub
@@ -2,8 +2,8 @@
 
 namespace Doctrine\ODM\MongoDB;
 
-use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ODM\MongoDB\Repository\DocumentRepository;
+use Doctrine\Persistence\ObjectManager;
 
 class DocumentManager implements ObjectManager
 {
diff --git a/stubs/DocumentRepository.stub b/stubs/DocumentRepository.stub
@@ -2,15 +2,13 @@
 
 namespace Doctrine\ODM\MongoDB\Repository;
 
-use Doctrine\Common\Persistence\ObjectRepository;
-use Doctrine\Persistence\ObjectRepository as PersistenceObjectRepository;
+use Doctrine\Persistence\ObjectRepository;
 
 /**
  * @template TDocumentClass
  * @implements ObjectRepository<TDocumentClass>
- * @implements PersistenceObjectRepository<TDocumentClass>
  */
-class DocumentRepository implements ObjectRepository, PersistenceObjectRepository
+class DocumentRepository implements ObjectRepository
 {
 
 	/**
diff --git a/stubs/EntityManagerInterface.stub b/stubs/EntityManagerInterface.stub
@@ -2,8 +2,8 @@
 
 namespace Doctrine\ORM;
 
-use Doctrine\Common\Persistence\ObjectManager;
-use Doctrine\Common\Persistence\ObjectRepository;
+use Doctrine\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectRepository;
 
 interface EntityManagerInterface extends ObjectManager
 {
diff --git a/stubs/EntityRepository.stub b/stubs/EntityRepository.stub
@@ -2,15 +2,13 @@
 
 namespace Doctrine\ORM;
 
-use Doctrine\Common\Persistence\ObjectRepository;
-use Doctrine\Persistence\ObjectRepository as PersistenceObjectRepository;
+use Doctrine\Persistence\ObjectRepository;
 
 /**
  * @template TEntityClass
  * @implements ObjectRepository<TEntityClass>
- * @implements PersistenceObjectRepository<TEntityClass>
  */
-class EntityRepository implements ObjectRepository, PersistenceObjectRepository
+class EntityRepository implements ObjectRepository
 {
 
 	/**
diff --git a/stubs/ManagerRegistry.stub b/stubs/ManagerRegistry.stub
diff --git a/stubs/ObjectManager.stub b/stubs/ObjectManager.stub
diff --git a/stubs/ObjectManagerDecorator.stub b/stubs/ObjectManagerDecorator.stub
diff --git a/stubs/ObjectRepository.stub b/stubs/ObjectRepository.stub
diff --git a/stubs/RepositoryFactory.stub b/stubs/RepositoryFactory.stub
@@ -2,7 +2,7 @@
 
 namespace Doctrine\ORM\Repository;
 
-use Doctrine\Common\Persistence\ObjectRepository;
+use Doctrine\Persistence\ObjectRepository;
 use Doctrine\ORM\EntityManagerInterface;
 
 interface RepositoryFactory
diff --git a/tests/DoctrineIntegration/Persistence/data/managerRegistryRepositoryDynamicReturn.php b/tests/DoctrineIntegration/Persistence/data/managerRegistryRepositoryDynamicReturn.php
@@ -2,7 +2,7 @@
 
 namespace PHPStan\DoctrineIntegration\Persistence\ManagerRegistryRepositoryDynamicReturn;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping as ORM;
 use RuntimeException;

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Doctrine\ODM\MongoDB;`
`4`	`4`
`5`		`-use Doctrine\Common\Persistence\ObjectManager;`
`6`	`5`	`use Doctrine\ODM\MongoDB\Repository\DocumentRepository;`
	`6`	`+use Doctrine\Persistence\ObjectManager;`
`7`	`7`
`8`	`8`	`class DocumentManager implements ObjectManager`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Doctrine\ORM;`
`4`	`4`
`5`		`-use Doctrine\Common\Persistence\ObjectManager;`
`6`		`-use Doctrine\Common\Persistence\ObjectRepository;`
	`5`	`+use Doctrine\Persistence\ObjectManager;`
	`6`	`+use Doctrine\Persistence\ObjectRepository;`
`7`	`7`
`8`	`8`	`interface EntityManagerInterface extends ObjectManager`
`9`	`9`	`{`