chore: bump phpstan version

Author: VincentLanglet

composer.json

@@ -141,17 +141,17 @@
         "illuminate/pagination": "^11.0 || ^12.0",
         "illuminate/routing": "^11.0 || ^12.0",
         "illuminate/support": "^11.0 || ^12.0",
-        "jangregor/phpstan-prophecy": "^1.0",
+        "jangregor/phpstan-prophecy": "^2.0",
         "justinrainbow/json-schema": "^5.2.11",
         "laravel/framework": "^11.0 || ^12.0",
         "orchestra/testbench": "^9.1",
         "phpspec/prophecy-phpunit": "^2.2",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpdoc-parser": "^1.29 || ^2.0",
-        "phpstan/phpstan": "^1.10",
-        "phpstan/phpstan-doctrine": "^1.0",
-        "phpstan/phpstan-phpunit": "^1.0",
-        "phpstan/phpstan-symfony": "^1.0",
+        "phpstan/phpstan": "^2.1",
+        "phpstan/phpstan-doctrine": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0",
+        "phpstan/phpstan-symfony": "^2.0",
         "phpunit/phpunit": "11.5.x-dev",
         "psr/log": "^1.0 || ^2.0 || ^3.0",
         "ramsey/uuid": "^4.7",

phpstan.neon.dist

@@ -17,7 +17,6 @@ parameters:
 	excludePaths:
 		# uses larastan
 		- src/Laravel
-		- src/Symfony/Bundle/Command/OpenApiCommand.php
 		# Symfony config
 		- tests/Fixtures/app/config/config_swagger.php
 		# Symfony cache
@@ -33,10 +32,7 @@ parameters:
 		- src/Doctrine/*/vendor/*
 		- src/*/vendor/*
 		# Symfony 6 support
-		- src/OpenApi/Serializer/CacheableSupportsMethodInterface.php
-		- src/Serializer/CacheableSupportsMethodInterface.php
 		- tests/Hal/Serializer/ItemNormalizerTest.php
-		- tests/Symfony/Validator/Metadata/Property/ValidatorPropertyMetadataFactoryTest.php
 		- src/Symfony/Bundle/ArgumentResolver/CompatibleValueResolverInterface.php
 	earlyTerminatingMethodCalls:
 		PHPUnit\Framework\Constraint\Constraint:
@@ -75,6 +71,15 @@ parameters:
 		# Expected, due to backward compatibility
 		- '#Method GraphQL\\Type\\Definition\\WrappingType::getWrappedType\(\) invoked with 1 parameter, 0 required\.#'
 		- '#Access to an undefined property GraphQL\\Type\\Definition\\NamedType&GraphQL\\Type\\Definition\\Type::\$name\.#'
+		- "#Call to function method_exists\\(\\) with GraphQL\\\\Type\\\\Definition\\\\Type&GraphQL\\\\Type\\\\Definition\\\\WrappingType and 'getInnermostType' will always evaluate to true\\.#"
+		- "#Call to function method_exists\\(\\) with Symfony\\\\Component\\\\Console\\\\Application and 'addCommand' will always evaluate to false\\.#"
+		- "#Call to function method_exists\\(\\) with 'Symfony\\\\\\\\Component\\\\\\\\PropertyInfo\\\\\\\\PropertyInfoExtractor' and 'getType' will always evaluate to true\\.#"
+		- "#Call to function method_exists\\(\\) with 'Symfony\\\\\\\\Component\\\\\\\\HttpFoundation\\\\\\\\Request' and 'getContentTypeFormat' will always evaluate to true\\.#"
+		- '#Call to an undefined method Symfony\\Component\\HttpFoundation\\Request::getContentType\(\)\.#'
+		- "#Call to function method_exists\\(\\) with 'Symfony\\\\\\\\Component\\\\\\\\Serializer\\\\\\\\Serializer' and 'getSupportedTypes' will always evaluate to true\\.#"
+		- "#Call to function method_exists\\(\\) with Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface and 'getSupportedTypes' will always evaluate to true\\.#"
+		- "#Call to function method_exists\\(\\) with Doctrine\\\\ODM\\\\MongoDB\\\\Configuration and 'setMetadataCache' will always evaluate to true\\.#"
+		- "#Call to function method_exists\\(\\) with Doctrine\\\\ODM\\\\MongoDB\\\\Mapping\\\\ClassMetadata\\|Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadata and 'isChangeTrackingDef…' will always evaluate to true\\.#"
 		-
 			message: '#Instanceof between Symfony\\Component\\Serializer\\NameConverter\\NameConverterInterface and Symfony\\Component\\Serializer\\NameConverter\\MetadataAwareNameConverter will always evaluate to false\.#'
 			paths:
@@ -90,4 +95,28 @@ parameters:
 		-
 			message: '#^Service "[^"]+" is private.$#'
 			path: src
-		- '#Call to an undefined method Symfony\\Component\\HttpFoundation\\Request::getContentType\(\)\.#'
+
+		# Allow extra assertions in tests: https://github.com/phpstan/phpstan-strict-rules/issues/130
+		- '#^Call to (static )?method PHPUnit\\Framework\\Assert::.* will always evaluate to true\.$#'
+
+		# TODO For PHPStan 2.0
+		-
+		    path: tests/
+		    identifier: function.alreadyNarrowedType
+		-
+		    identifier: property.unusedType
+		-
+		    identifier: return.unusedType
+		-
+		    path: tests/
+		    identifier: void.pure
+		-
+		    identifier: varTag.nativeType
+		-
+		    identifier: isset.offset
+		-
+		    identifier: trait.unused
+		-
+		    identifier: instanceof.alwaysTrue
+		-
+		    identifier: catch.neverThrown

src/Doctrine/Orm/State/CollectionProvider.php

@@ -56,7 +56,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $manager = $this->managerRegistry->getManagerForClass($entityClass);
 
         $repository = $manager->getRepository($entityClass);
-        if (!method_exists($repository, 'createQueryBuilder')) {
+        if (!method_exists($repository, 'createQueryBuilder')) { // @phpstan-ignore-line function.alreadyNarrowedType
             throw new RuntimeException('The repository class must have a "createQueryBuilder" method.');
         }
 

src/Doctrine/Orm/State/ItemProvider.php

@@ -65,7 +65,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         }
 
         $repository = $manager->getRepository($entityClass);
-        if (!method_exists($repository, 'createQueryBuilder')) {
+        if (!method_exists($repository, 'createQueryBuilder')) { // @phpstan-ignore-line function.alreadyNarrowedType
             throw new RuntimeException('The repository class must have a "createQueryBuilder" method.');
         }
 

src/Elasticsearch/Extension/SortExtension.php

@@ -49,7 +49,6 @@ public function applyToCollection(array $requestBody, string $resourceClass, ?Op
         if (
             $operation
             && null !== ($defaultOrder = $operation->getOrder())
-            && \is_array($defaultOrder)
         ) {
             foreach ($defaultOrder as $property => $direction) {
                 if (\is_int($property)) {

src/GraphQl/State/Provider/ReadProvider.php

@@ -82,10 +82,6 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
                 return $item;
             }
 
-            if (!\is_object($item)) {
-                throw new \LogicException('Item from read provider should be a nullable object.');
-            }
-
             if (isset($context['graphql_context']) && !enum_exists($item::class)) {
                 $context['graphql_context']['previous_object'] = clone $item;
             }
@@ -124,6 +120,9 @@ private function getNormalizedFilters(array $args): array
         $filters = $args;
 
         foreach ($filters as $name => $value) {
+            // Prevent numeric keys like `'1'`
+            $name = (string) $name;
+
             if (\is_array($value)) {
                 if (strpos($name, '_list')) {
                     $name = substr($name, 0, \strlen($name) - \strlen('_list'));
@@ -136,7 +135,7 @@ private function getNormalizedFilters(array $args): array
                 $filters[$name] = $this->getNormalizedFilters($value);
             }
 
-            if (\is_string($name) && strpos($name, $this->nestingSeparator)) {
+            if (strpos($name, $this->nestingSeparator)) {
                 // Gives a chance to relations/nested fields.
                 $index = array_search($name, array_keys($filters), true);
                 $filters =

src/GraphQl/Tests/Serializer/SerializerContextBuilderTest.php

@@ -77,8 +77,6 @@ private function buildOperationFromContext(bool $isMutation, bool $isSubscriptio
             }
         }
 
-        \assert($operation instanceof Operation);
-
         return $operation;
     }
 

src/GraphQl/Tests/State/Processor/NormalizeProcessorTest.php

@@ -49,7 +49,7 @@ public function testProcess($body, $operation): void
         $serializerContext = ['resource_class' => $operation->getClass()];
         $normalizer = $this->createMock(NormalizerInterface::class);
         $serializerContextBuilder = $this->createMock(SerializerContextBuilderInterface::class);
-        $serializerContextBuilder->expects($this->once())->method('create')->with($operation->getClass(), $operation, $context, normalization: true)->willReturn($serializerContext);
+        $serializerContextBuilder->expects($this->once())->method('create')->with($operation->getClass(), $operation, $context, true)->willReturn($serializerContext);
         $normalizer->expects($this->once())->method('normalize')->with($body, 'graphql', $serializerContext);
         $processor = new NormalizeProcessor($normalizer, $serializerContextBuilder, new Pagination());
         $processor->process($body, $operation, [], $context);
@@ -73,7 +73,7 @@ public function testProcessCollection($collection, $operation, $args, ?array $ex
         $normalizer = $this->prophesize(NormalizerInterface::class);
 
         $serializerContextBuilder = $this->createMock(SerializerContextBuilderInterface::class);
-        $serializerContextBuilder->expects($this->once())->method('create')->with($operation->getClass(), $operation, $context, normalization: true)->willReturn($serializerContext);
+        $serializerContextBuilder->expects($this->once())->method('create')->with($operation->getClass(), $operation, $context, true)->willReturn($serializerContext);
         foreach ($collection as $v) {
             $normalizer->normalize($v, 'graphql', $serializerContext)->willReturn(['normalized_item'])->shouldBeCalledOnce();
         }

src/GraphQl/Tests/State/Provider/DenormalizeProviderTest.php

@@ -33,7 +33,7 @@ public function testProvide(): void
         $decorated->expects($this->once())->method('provide')->willReturn($objectToPopulate);
         $denormalizer = $this->createMock(DenormalizerInterface::class);
         $serializerContextBuilder = $this->createMock(SerializerContextBuilderInterface::class);
-        $serializerContextBuilder->expects($this->once())->method('create')->with($operation->getClass(), $operation, $context, normalization: false)->willReturn($serializerContext);
+        $serializerContextBuilder->expects($this->once())->method('create')->with($operation->getClass(), $operation, $context, false)->willReturn($serializerContext);
         $denormalizer->expects($this->once())->method('denormalize')->with(['test'], 'dummy', 'graphql', $serializerContext)->willReturn(new \stdClass());
         $provider = new DenormalizeProvider($decorated, $denormalizer, $serializerContextBuilder);
         $provider->provide($operation, [], $context);
@@ -49,7 +49,7 @@ public function testProvideWithObjectToPopulate(): void
         $decorated->expects($this->once())->method('provide')->willReturn($objectToPopulate);
         $denormalizer = $this->createMock(DenormalizerInterface::class);
         $serializerContextBuilder = $this->createMock(SerializerContextBuilderInterface::class);
-        $serializerContextBuilder->expects($this->once())->method('create')->with($operation->getClass(), $operation, $context, normalization: false)->willReturn($serializerContext);
+        $serializerContextBuilder->expects($this->once())->method('create')->with($operation->getClass(), $operation, $context, false)->willReturn($serializerContext);
         $denormalizer->expects($this->once())->method('denormalize')->with(['test'], 'dummy', 'graphql', $serializerContext)->willReturn(new \stdClass());
         $provider = new DenormalizeProvider($decorated, $denormalizer, $serializerContextBuilder);
         $provider->provide($operation, [], $context);
@@ -65,7 +65,7 @@ public function testProvideNotCalledWithQuery(): void
         $decorated->expects($this->once())->method('provide')->willReturn($objectToPopulate);
         $denormalizer = $this->createMock(DenormalizerInterface::class);
         $serializerContextBuilder = $this->createMock(SerializerContextBuilderInterface::class);
-        $serializerContextBuilder->expects($this->never())->method('create')->with($operation->getClass(), $operation, $context, normalization: false)->willReturn($serializerContext);
+        $serializerContextBuilder->expects($this->never())->method('create')->with($operation->getClass(), $operation, $context, false)->willReturn($serializerContext);
         $denormalizer->expects($this->never())->method('denormalize')->with(['test'], 'dummy', 'graphql', $serializerContext)->willReturn(new \stdClass());
         $provider = new DenormalizeProvider($decorated, $denormalizer, $serializerContextBuilder);
         $provider->provide($operation, [], $context);
@@ -81,7 +81,7 @@ public function testProvideNotCalledWithoutDeserialize(): void
         $decorated->expects($this->once())->method('provide')->willReturn($objectToPopulate);
         $denormalizer = $this->createMock(DenormalizerInterface::class);
         $serializerContextBuilder = $this->createMock(SerializerContextBuilderInterface::class);
-        $serializerContextBuilder->expects($this->never())->method('create')->with($operation->getClass(), $operation, $context, normalization: false)->willReturn($serializerContext);
+        $serializerContextBuilder->expects($this->never())->method('create')->with($operation->getClass(), $operation, $context, false)->willReturn($serializerContext);
         $denormalizer->expects($this->never())->method('denormalize')->with(['test'], 'dummy', 'graphql', $serializerContext)->willReturn(new \stdClass());
         $provider = new DenormalizeProvider($decorated, $denormalizer, $serializerContextBuilder);
         $provider->provide($operation, [], $context);

src/JsonSchema/Tests/Metadata/Property/Factory/SchemaPropertyMetadataFactoryTest.php

@@ -43,7 +43,7 @@ public function testEnumLegacy(): void
     public function testEnum(): void
     {
         $resourceClassResolver = $this->createMock(ResourceClassResolverInterface::class);
-        $apiProperty = new ApiProperty(nativeType: Type::nullable(Type::enum(IntEnumAsIdentifier::class))); // @phpstan-ignore-line
+        $apiProperty = new ApiProperty(nativeType: Type::nullable(Type::enum(IntEnumAsIdentifier::class)));
         $decorated = $this->createMock(PropertyMetadataFactoryInterface::class);
         $decorated->expects($this->once())->method('create')->with(DummyWithEnum::class, 'intEnumAsIdentifier')->willReturn($apiProperty);
         $schemaPropertyMetadataFactory = new SchemaPropertyMetadataFactory($resourceClassResolver, $decorated);
@@ -71,7 +71,7 @@ public function testWithCustomOpenApiContext(): void
     {
         $resourceClassResolver = $this->createMock(ResourceClassResolverInterface::class);
         $apiProperty = new ApiProperty(
-            nativeType: Type::nullable(Type::enum(IntEnumAsIdentifier::class)), // @phpstan-ignore-line
+            nativeType: Type::nullable(Type::enum(IntEnumAsIdentifier::class)),
             openapiContext: ['type' => 'object', 'properties' => ['alpha' => ['type' => 'integer']]],
         );
         $decorated = $this->createMock(PropertyMetadataFactoryInterface::class);