mapper type extension: fix resolving parent class

nextras · Aug 31, 2020 · c7a64f8 · c7a64f8
1 parent dc15377
commit c7a64f8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/Types/MapperMethodReturnTypeExtension.php b/src/Types/MapperMethodReturnTypeExtension.php
@@ -70,11 +70,20 @@ public function getTypeFromMethodCall(
 			return $defaultReturn;
 		}
 
-		$mapperClass = $mapper->getClassName();
+		$currentMapper = $this->reflectionProvider->getClass($mapper->getClassName());
+		assert($currentMapper !== false);
+
 		do {
+			$mapperClass = $currentMapper->getName();
 			/** @phpstan-var class-string<\Nextras\Orm\Repository\Repository> $repositoryClass */
 			$repositoryClass = \str_replace('Mapper', 'Repository', $mapperClass);
-			$mapperClass = \get_parent_class($mapperClass);
+
+			$currentMapper = $this->reflectionProvider->getClass($mapperClass)->getParentClass();
+			if ($currentMapper === false) {
+				break;
+			}
+			$mapperClass = $currentMapper->getName();
+
 			assert(is_string($mapperClass));
 		} while (!\class_exists($repositoryClass) && $mapperClass !== DbalMapper::class);
 

diff --git a/tests/testbox/Types/fixtures/AuthorsMapper.php b/tests/testbox/Types/fixtures/AuthorsMapper.php
@@ -2,9 +2,16 @@
 
 namespace NextrasTests\OrmPhpStan\Types;
 
+use Nextras\Orm\Collection\ICollection;
 use Nextras\Orm\Mapper\Mapper;
 
 
 class AuthorsMapper extends Mapper
 {
+	public function findAllWithTranslatedIps(): ICollection
+	{
+		return $this->toCollection(
+			$this->builder()->addSelect('inet6_ntoa([ip]) as [ip]')
+		);
+	}
 }