Fixes after PHPStan update

phpstan · Oct 4, 2024 · 4f51333 · 4f51333
1 parent 261b19d
commit 4f51333
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 11 deletions.
diff --git a/src/Rules/Doctrine/ORM/EntityColumnRule.php b/src/Rules/Doctrine/ORM/EntityColumnRule.php
@@ -16,7 +16,6 @@
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NeverType;
 use PHPStan\Type\ObjectType;
-use PHPStan\Type\ParserNodeTypeToPHPStanType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\TypehintHelper;
@@ -176,7 +175,7 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		$phpDocType = $node->getPhpDocType();
-		$nativeType = $node->getNativeType() !== null ? ParserNodeTypeToPHPStanType::resolve($node->getNativeType(), $scope->getClassReflection()) : new MixedType();
+		$nativeType = $node->getNativeType() ?? new MixedType();
 		$propertyType = TypehintHelper::decideType($nativeType, $phpDocType);
 
 		if (get_class($propertyType) === MixedType::class || $propertyType instanceof ErrorType || $propertyType instanceof NeverType) {

diff --git a/src/Rules/Doctrine/ORM/EntityRelationRule.php b/src/Rules/Doctrine/ORM/EntityRelationRule.php
@@ -13,7 +13,6 @@
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NeverType;
 use PHPStan\Type\ObjectType;
-use PHPStan\Type\ParserNodeTypeToPHPStanType;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\TypehintHelper;
 use PHPStan\Type\VerbosityLevel;
@@ -96,7 +95,7 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		$phpDocType = $node->getPhpDocType();
-		$nativeType = $node->getNativeType() !== null ? ParserNodeTypeToPHPStanType::resolve($node->getNativeType(), $scope->getClassReflection()) : new MixedType();
+		$nativeType = $node->getNativeType() ?? new MixedType();
 		$propertyType = TypehintHelper::decideType($nativeType, $phpDocType);
 
 		$errors = [];

diff --git a/src/Type/Doctrine/DBAL/RowCountMethodDynamicReturnTypeExtension.php b/src/Type/Doctrine/DBAL/RowCountMethodDynamicReturnTypeExtension.php
@@ -16,6 +16,7 @@
 class RowCountMethodDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
 
+	/** @var class-string */
 	private string $class;
 
 	private ObjectMetadataResolver $objectMetadataResolver;
@@ -24,6 +25,9 @@ class RowCountMethodDynamicReturnTypeExtension implements DynamicMethodReturnTyp
 
 	private ReflectionProvider $reflectionProvider;
 
+	/**
+	 * @param class-string $class
+	 */
 	public function __construct(
 		string $class,
 		ObjectMetadataResolver $objectMetadataResolver,

diff --git a/src/Type/Doctrine/GetRepositoryDynamicReturnTypeExtension.php b/src/Type/Doctrine/GetRepositoryDynamicReturnTypeExtension.php
@@ -35,10 +35,14 @@ class GetRepositoryDynamicReturnTypeExtension implements DynamicMethodReturnType
 
 	private ?string $odmRepositoryClass = null;
 
+	/** @var class-string */
 	private string $managerClass;
 
 	private ObjectMetadataResolver $metadataResolver;
 
+	/**
+	 * @param class-string $managerClass
+	 */
 	public function __construct(
 		ReflectionProvider $reflectionProvider,
 		?string $repositoryClass,

diff --git a/src/Type/Doctrine/QueryBuilder/Expr/NewExprDynamicReturnTypeExtension.php b/src/Type/Doctrine/QueryBuilder/Expr/NewExprDynamicReturnTypeExtension.php
@@ -20,10 +20,14 @@ class NewExprDynamicReturnTypeExtension implements DynamicStaticMethodReturnType
 
 	private ArgumentsProcessor $argumentsProcessor;
 
+	/** @var class-string */
 	private string $class;
 
 	private ReflectionProvider $reflectionProvider;
 
+	/**
+	 * @param class-string $class
+	 */
 	public function __construct(
 		ArgumentsProcessor $argumentsProcessor,
 		string $class,

diff --git a/src/Type/Doctrine/QueryBuilder/QueryBuilderGetDqlDynamicReturnTypeExtension.php b/src/Type/Doctrine/QueryBuilder/QueryBuilderGetDqlDynamicReturnTypeExtension.php
@@ -13,8 +13,12 @@
 class QueryBuilderGetDqlDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
 
+	/** @var class-string|null */
 	private ?string $queryBuilderClass = null;
 
+	/**
+	 * @param class-string|null $queryBuilderClass
+	 */
 	public function __construct(
 		?string $queryBuilderClass
 	)

diff --git a/src/Type/Doctrine/QueryBuilder/QueryBuilderGetQueryDynamicReturnTypeExtension.php b/src/Type/Doctrine/QueryBuilder/QueryBuilderGetQueryDynamicReturnTypeExtension.php
@@ -59,6 +59,7 @@ class QueryBuilderGetQueryDynamicReturnTypeExtension implements DynamicMethodRet
 
 	private ArgumentsProcessor $argumentsProcessor;
 
+	/** @var class-string|null */
 	private ?string $queryBuilderClass = null;
 
 	private DescriptorRegistry $descriptorRegistry;
@@ -67,6 +68,9 @@ class QueryBuilderGetQueryDynamicReturnTypeExtension implements DynamicMethodRet
 
 	private DriverDetector $driverDetector;
 
+	/**
+	 * @param class-string|null $queryBuilderClass
+	 */
 	public function __construct(
 		ObjectMetadataResolver $objectMetadataResolver,
 		ArgumentsProcessor $argumentsProcessor,

diff --git a/src/Type/Doctrine/QueryBuilder/QueryBuilderMethodDynamicReturnTypeExtension.php b/src/Type/Doctrine/QueryBuilder/QueryBuilderMethodDynamicReturnTypeExtension.php
@@ -22,8 +22,12 @@ class QueryBuilderMethodDynamicReturnTypeExtension implements DynamicMethodRetur
 
 	private const MAX_COMBINATIONS = 16;
 
+	/** @var class-string|null */
 	private ?string $queryBuilderClass = null;
 
+	/**
+	 * @param class-string|null $queryBuilderClass
+	 */
 	public function __construct(
 		?string $queryBuilderClass
 	)

diff --git a/src/Type/Doctrine/QueryBuilder/QueryBuilderTypeSpecifyingExtension.php b/src/Type/Doctrine/QueryBuilder/QueryBuilderTypeSpecifyingExtension.php
@@ -24,10 +24,14 @@ class QueryBuilderTypeSpecifyingExtension implements MethodTypeSpecifyingExtensi
 
 	private const MAX_COMBINATIONS = 16;
 
+	/** @var class-string|null */
 	private ?string $queryBuilderClass = null;
 
 	private TypeSpecifier $typeSpecifier;
 
+	/**
+	 * @param class-string|null $queryBuilderClass
+	 */
 	public function __construct(?string $queryBuilderClass)
 	{
 		$this->queryBuilderClass = $queryBuilderClass;

diff --git a/stubs/MongoClassMetadataInfo.stub b/stubs/MongoClassMetadataInfo.stub
@@ -15,11 +15,6 @@ class ClassMetadata implements BaseClassMetadata
 	/** @var string|null */
 	public $customRepositoryClassName;
 
-	/**
-	 * @var class-string<T>
-	 */
-	public $name;
-
 	/**
 	 * @param class-string<T> $documentName
 	 */

diff --git a/tests/DoctrineIntegration/ORM/EntityRepositoryDynamicReturnIntegrationTest.php b/tests/DoctrineIntegration/ORM/EntityRepositoryDynamicReturnIntegrationTest.php
@@ -10,7 +10,7 @@ final class EntityRepositoryDynamicReturnIntegrationTest extends LevelsTestCase
 	/**
 	 * @return string[][]
 	 */
-	public function dataTopics(): array
+	public static function dataTopics(): array
 	{
 		return [
 			['entityRepositoryDynamicReturn'],

diff --git a/...ntegration/ORM/EntityRepositoryWithoutObjectManagerLoaderDynamicReturnIntegrationTest.php b/...ntegration/ORM/EntityRepositoryWithoutObjectManagerLoaderDynamicReturnIntegrationTest.php
@@ -10,7 +10,7 @@ final class EntityRepositoryWithoutObjectManagerLoaderDynamicReturnIntegrationTe
 	/**
 	 * @return string[][]
 	 */
-	public function dataTopics(): array
+	public static function dataTopics(): array
 	{
 		return [
 			['entityRepositoryDynamicReturn'],

diff --git a/tests/Rules/Doctrine/ORM/FakeTestingUuidType.php b/tests/Rules/Doctrine/ORM/FakeTestingUuidType.php
@@ -47,6 +47,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str
 			return null;
 		}
 
+		/** @throws ConversionException */
 		return (string) $value;
 	}
-Original file line number
+Diff line change
@@ Expand Up @@
     			return null;
     		}
+    		/** @throws ConversionException */
     		return (string) $value;
     	}
@@ Expand Down @@