Allow phpstan/phpdoc-parser 2 (which in turns allow PHPstan 2, Larastan 3) for api-platform/laravel

src/Laravel/Eloquent/Filter/DateFilter.php

@@ -84,7 +84,10 @@ public function getSchema(Parameter $parameter): array
         return ['type' => 'date'];
     }
 
-    public function getOpenApiParameters(Parameter $parameter): OpenApiParameter|array|null
+    /**
+     * @return OpenApiParameter[]
+     */
+    public function getOpenApiParameters(Parameter $parameter): array
     {
         $in = $parameter instanceof QueryParameter ? 'query' : 'header';
         $key = $parameter->getKey();

src/Laravel/Eloquent/Filter/OrFilter.php

@@ -49,7 +49,7 @@ public function getSchema(Parameter $parameter): array
         return ['type' => 'array', 'items' => $schema];
     }
 
-    public function getOpenApiParameters(Parameter $parameter): OpenApiParameter|array|null
+    public function getOpenApiParameters(Parameter $parameter): OpenApiParameter
     {
         return new OpenApiParameter(name: $parameter->getKey().'[]', in: 'query', style: 'deepObject', explode: true);
     }

src/Laravel/Eloquent/Filter/OrderFilter.php

@@ -54,7 +54,10 @@ public function getSchema(Parameter $parameter): array
         return ['type' => 'string', 'enum' => ['asc', 'desc']];
     }
 
-    public function getOpenApiParameters(Parameter $parameter): OpenApiParameter|array|null
+    /**
+     * @return OpenApiParameter[]|null
+     */
+    public function getOpenApiParameters(Parameter $parameter): ?array
     {
         if (str_contains($parameter->getKey(), ':property')) {
             $parameters = [];

src/Laravel/Eloquent/Filter/RangeFilter.php

@@ -52,7 +52,10 @@ public function getSchema(Parameter $parameter): array
         return ['type' => 'number'];
     }
 
-    public function getOpenApiParameters(Parameter $parameter): OpenApiParameter|array|null
+    /**
+     * @return OpenApiParameter[]
+     */
+    public function getOpenApiParameters(Parameter $parameter): array
     {
         $in = $parameter instanceof QueryParameter ? 'query' : 'header';
         $key = $parameter->getKey();

src/Laravel/Eloquent/Paginator.php

@@ -34,7 +34,7 @@ public function __construct(
 
     public function count(): int
     {
-        return $this->paginator->count();
+        return $this->paginator->count(); // @phpstan-ignore-line
     }
 
     public function getLastPage(): float

src/Laravel/Eloquent/PartialPaginator.php

@@ -33,7 +33,7 @@ public function __construct(
 
     public function count(): int
     {
-        return $this->paginator->count();
+        return $this->paginator->count(); // @phpstan-ignore-line
     }
 
     public function getCurrentPage(): float

src/Laravel/Routing/IriConverter.php

@@ -159,7 +159,7 @@ private function generateRoute(object|string $resource, int $referenceType = Url
         if (\is_object($resource)) {
             try {
                 $identifiers = $this->identifiersExtractor->getIdentifiersFromItem($resource, $identifiersExtractorOperation, $context);
-            } catch (InvalidArgumentException|RuntimeException $e) {
+            } catch (RuntimeException $e) {
                 // We can try using context uri variables if any
                 if (!$identifiers) {
                     throw new InvalidArgumentException(\sprintf('Unable to generate an IRI for the item of type "%s"', $operation->getClass()), $e->getCode(), $e);

src/Laravel/Routing/SkolemIriConverter.php

@@ -53,7 +53,7 @@ public function getResourceFromIri(string $iri, array $context = [], ?Operation
     /**
      * {@inheritdoc}
      */
-    public function getIriFromResource(object|string $resource, int $referenceType = UrlGeneratorInterface::ABS_PATH, ?Operation $operation = null, array $context = []): ?string
+    public function getIriFromResource(object|string $resource, int $referenceType = UrlGeneratorInterface::ABS_PATH, ?Operation $operation = null, array $context = []): string
     {
         $referenceType = $operation ? ($operation->getUrlGenerationStrategy() ?? $referenceType) : $referenceType;
         if (($isObject = \is_object($resource)) && $this->objectHashMap->contains($resource)) {

src/Laravel/Tests/Console/Maker/MakeStateProcessorCommandTest.php

@@ -30,7 +30,7 @@ class MakeStateProcessorCommandTest extends TestCase
     /** @var string */
     private const CHOSEN_CLASS_NAME = 'Choose a class name for your state processor (e.g. <fg=yellow>AwesomeStateProcessor</>)';
 
-    private ?Filesystem $filesystem;
+    private Filesystem $filesystem;
     private PathResolver $pathResolver;
     private AppServiceFileGenerator $appServiceFileGenerator;
 

src/Laravel/Tests/Console/Maker/MakeStateProviderCommandTest.php

@@ -30,7 +30,7 @@ class MakeStateProviderCommandTest extends TestCase
     /** @var string */
     private const STATE_PROVIDER_CLASS_NAME = 'Choose a class name for your state provider (e.g. <fg=yellow>AwesomeStateProvider</>)';
 
-    private ?Filesystem $filesystem;
+    private Filesystem $filesystem;
     private PathResolver $pathResolver;
     private AppServiceFileGenerator $appServiceFileGenerator;
 

src/Laravel/composer.json

@@ -49,12 +49,12 @@
         "illuminate/container": "^11.0",
         "symfony/web-link": "^6.4 || ^7.1",
         "willdurand/negotiation": "^3.1",
-        "phpstan/phpdoc-parser": "^1.29",
+        "phpstan/phpdoc-parser": "^1.29 || ^2.0",
         "phpdocumentor/reflection-docblock": "^5.1"
     },
     "require-dev": {
         "doctrine/dbal": "^4.0",
-        "larastan/larastan": "^2.0",
+        "larastan/larastan": "^2.0 || ^3.0",
         "orchestra/testbench": "^9.1",
         "phpunit/phpunit": "^11.2",
         "api-platform/graphql": "^4.0",