Compatibility with doctrine/persistence 1.3.0

Author: ondrejmirtes

extension.neon

@@ -20,6 +20,10 @@ parameters:
 		- stubs/ObjectManager.php
 		- stubs/ObjectManagerDecorator.php
 		- stubs/ObjectRepository.php
+		- stubs/Persistence/ManagerRegistry.php
+		- stubs/Persistence/ObjectManager.php
+		- stubs/Persistence/ObjectManagerDecorator.php
+		- stubs/Persistence/ObjectRepository.php
 
 parametersSchema:
 	doctrine: structure([
@@ -120,6 +124,20 @@ services:
 		arguments:
 			managerClass: Doctrine\Common\Persistence\ObjectManager
 
+	persistenceManagerRegistryGetRepository:
+		class: PHPStan\Type\Doctrine\GetRepositoryDynamicReturnTypeExtension
+		tags:
+			- phpstan.broker.dynamicMethodReturnTypeExtension
+		arguments:
+			managerClass: Doctrine\Persistence\ManagerRegistry
+
+	persistenceObjectManagerGetRepository:
+		class: PHPStan\Type\Doctrine\GetRepositoryDynamicReturnTypeExtension
+		tags:
+			- phpstan.broker.dynamicMethodReturnTypeExtension
+		arguments:
+			managerClass: Doctrine\Persistence\ObjectManager
+
 	## NewExprDynamicReturnTypeExtensions
 
 	-

src/Reflection/Doctrine/EntityRepositoryClassReflectionExtension.php

@@ -44,7 +44,10 @@ public function hasMethod(\PHPStan\Reflection\ClassReflection $classReflection,
 
 		$repositoryAncesor = $classReflection->getAncestorWithClassName(ObjectRepository::class);
 		if ($repositoryAncesor === null) {
-			return false;
+			$repositoryAncesor = $classReflection->getAncestorWithClassName(\Doctrine\Persistence\ObjectRepository::class);
+			if ($repositoryAncesor === null) {
+				return false;
+			}
 		}
 
 		$templateTypeMap = $repositoryAncesor->getActiveTemplateTypeMap();
@@ -77,7 +80,10 @@ public function getMethod(\PHPStan\Reflection\ClassReflection $classReflection,
 	{
 		$repositoryAncesor = $classReflection->getAncestorWithClassName(ObjectRepository::class);
 		if ($repositoryAncesor === null) {
-			throw new \PHPStan\ShouldNotHappenException();
+			$repositoryAncesor = $classReflection->getAncestorWithClassName(\Doctrine\Persistence\ObjectRepository::class);
+			if ($repositoryAncesor === null) {
+				throw new \PHPStan\ShouldNotHappenException();
+			}
 		}
 
 		$templateTypeMap = $repositoryAncesor->getActiveTemplateTypeMap();

src/Rules/Doctrine/ORM/RepositoryMethodCallRule.php

@@ -50,7 +50,10 @@ public function processNode(Node $node, Scope $scope): array
 		}
 		$entityClassType = GenericTypeVariableResolver::getType($calledOnType, ObjectRepository::class, 'TEntityClass');
 		if ($entityClassType === null) {
-			return [];
+			$entityClassType = GenericTypeVariableResolver::getType($calledOnType, \Doctrine\Persistence\ObjectRepository::class, 'TEntityClass');
+			if ($entityClassType === null) {
+				return [];
+			}
 		}
 		if (!$entityClassType instanceof TypeWithClassName) {
 			return [];

stubs/Persistence/ManagerRegistry.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Doctrine\Persistence;
+
+interface ManagerRegistry
+{
+
+	/**
+	 * @template T
+	 * @phpstan-param class-string<T> $persistentObject
+	 * @phpstan-param string $persistentManagerName
+	 * @phpstan-return ObjectRepository<T>
+	 */
+	public function getRepository($persistentObject, $persistentManagerName = null);
+
+}

stubs/Persistence/ObjectManager.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Doctrine\Persistence;
+
+interface ObjectManager
+{
+
+	/**
+	 * @template T
+	 * @phpstan-param class-string<T> $className
+	 * @phpstan-param mixed  $id
+	 * @phpstan-return T|null
+	 */
+	public function find($className, $id);
+
+	/**
+	 * @template T
+	 * @phpstan-param T $object
+	 * @phpstan-return T
+	 */
+	public function merge($object);
+
+	/**
+	 * @template T
+	 * @phpstan-param class-string<T> $className
+	 * @phpstan-return ObjectRepository<T>
+	 */
+	public function getRepository($className);
+
+}

stubs/Persistence/ObjectManagerDecorator.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Doctrine\Persistence;
+
+class ObjectManagerDecorator
+{
+
+	/**
+	 * @template T
+	 * @phpstan-param class-string<T> $className
+	 * @phpstan-param mixed  $id
+	 * @phpstan-return T|null
+	 */
+	public function find($className, $id);
+
+	/**
+	 * @template T
+	 * @phpstan-param T $object
+	 * @phpstan-return T
+	 */
+	public function merge($object);
+
+	/**
+	 * @template T
+	 * @phpstan-param class-string<T> $className
+	 * @phpstan-return ObjectRepository<T>
+	 */
+	public function getRepository($className);
+
+}

stubs/Persistence/ObjectRepository.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace Doctrine\Persistence;
+
+/**
+ * @template TEntityClass
+ */
+interface ObjectRepository
+{
+
+	/**
+	 * @phpstan-param mixed $id
+	 * @phpstan-return TEntityClass|null
+	 */
+	public function find($id);
+
+	/**
+	 * @phpstan-return TEntityClass[]
+	 */
+	public function findAll();
+
+	/**
+	 * @phpstan-param mixed[] $criteria
+	 * @phpstan-param string[]|null $orderBy
+	 * @phpstan-param int|null $limit
+	 * @phpstan-param int|null $offset
+	 * @phpstan-return TEntityClass[]
+	 */
+	public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null);
+
+	/**
+	 * @phpstan-param mixed[] $criteria The criteria.
+	 * @phpstan-return TEntityClass|null
+	 */
+	public function findOneBy(array $criteria);
+
+	/**
+	 * @phpstan-return class-string<TEntityClass>
+	 */
+	public function getClassName();
+
+}