Merge 4.0

soyuka · soyuka · commit 361fd6c19360 · 2025-01-10T15:46:58.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,15 @@
 * [d0a442786](https://github.com/api-platform/core/commit/d0a44278630d201b91cbba0774a09f4eeaac88f7) feat(doctrine): enhance getLinksHandler with method validation and typo suggestions (#6874)
 * [f67f6f1ac](https://github.com/api-platform/core/commit/f67f6f1acb6476182c18a3503f2a8bc80ae89a0b)  feat(doctrine): doctrine filters like laravel eloquent filters  (#6775)
 
+## v4.0.14
+
+### Bug fixes
+
+* [97cdb6b3f](https://github.com/api-platform/core/commit/97cdb6b3f43471789e096c9dc3a0c3c7b6d4e43c) fix(state): remove ProcessorInterface laravel specific type
+* [b12a0d005](https://github.com/api-platform/core/commit/b12a0d005fda58a162b82a3574e6ee877838a55b) fix(graphql): register types for parameter args (#6895)
+
+### Features
+
 ## v4.0.13
 
 ### Bug fixes
@@ -265,6 +274,18 @@ Notes:
 
 * [0d5f35683](https://github.com/api-platform/core/commit/0d5f356839eb6aa9f536044abe4affa736553e76) feat(laravel): laravel component (#5882)
 
+## v3.4.14
+
+### Bug fixes
+
+* [0cf752bce](https://github.com/api-platform/core/commit/0cf752bcec692718b2503250e655d05aea670316) fix(metadata): make the schema attribute to fallback to null for parameters in YamlResourceExtractor (#6896)
+* [2b3c55db2](https://github.com/api-platform/core/commit/2b3c55db2a9ecc52f62c441fa8a5696233a30b87) fix(symfony): remove unsolvable deprecation (#6899) see also (#6655)
+* [9493b9b6e](https://github.com/api-platform/core/commit/9493b9b6ec0264ab5b700c861ad1b97455b4f88d) fix(symfony): revert json schema bc break (#6903)
+* [b82f9ac76](https://github.com/api-platform/core/commit/b82f9ac76ce89dd3910849c73da42317ee1339ed) fix(openapi): not forbidden response on openAPI doc (#6886)
+
+I mispublished a v3.4.13 on some repositories to fix them all I bumped 3.4.10 to 3.4.14
+More details at #6888.
+
 ## v3.4.10
 
 ### Bug fixes
diff --git a/src/GraphQl/Type/FieldsBuilder.php b/src/GraphQl/Type/FieldsBuilder.php
@@ -415,7 +415,15 @@ private function getResourceFieldConfiguration(?string $property, ?string $field
                     }
 
                     $args = $this->getFilterArgs($args, $resourceClass, $rootResource, $resourceOperation, $rootOperation, $property, $depth);
-                    $args = $this->getParameterArgs($rootOperation, $args);
+
+                    // Also register parameter args in the types container
+                    // Note: This is a workaround, for more information read the comment on the parameterToObjectType function.
+                    foreach ($this->getParameterArgs($rootOperation) as $key => $arg) {
+                        if ($arg instanceof InputObjectType || (\is_array($arg) && isset($arg['name']))) {
+                            $this->typesContainer->set(\is_array($arg) ? $arg['name'] : $arg->name(), $arg);
+                        }
+                        $args[$key] = $arg;
+                    }
                 }
             }
 
diff --git a/src/Laravel/ApiPlatformProvider.php b/src/Laravel/ApiPlatformProvider.php
@@ -429,7 +429,6 @@ public function register(): void
         $this->app->bind(OperationMetadataFactoryInterface::class, OperationMetadataFactory::class);
 
         $this->app->tag([
-            BooleanFilter::class,
             EqualsFilter::class,
             PartialSearchFilter::class,
             DateFilter::class,
diff --git a/src/Laravel/Eloquent/Filter/DateFilter.php b/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();
diff --git a/src/Laravel/Eloquent/Filter/OrFilter.php b/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);
     }
diff --git a/src/Laravel/Eloquent/Filter/OrderFilter.php b/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 = [];
diff --git a/src/Laravel/Eloquent/Filter/RangeFilter.php b/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();
diff --git a/src/Laravel/Eloquent/Paginator.php b/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
diff --git a/src/Laravel/Eloquent/PartialPaginator.php b/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
diff --git a/src/Laravel/Routing/IriConverter.php b/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);
diff --git a/src/Laravel/Routing/SkolemIriConverter.php b/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)) {
diff --git a/src/Laravel/Tests/Console/Maker/MakeStateProcessorCommandTest.php b/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;
 
diff --git a/src/Laravel/Tests/Console/Maker/MakeStateProviderCommandTest.php b/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;
 
diff --git a/src/Laravel/Tests/GraphQlTest.php b/src/Laravel/Tests/GraphQlTest.php
@@ -79,20 +79,37 @@ public function testGetBooksWithSimplePagination(): void
 
     public function testGetBooksWithPaginationAndOrder(): void
     {
-        BookFactory::new()->has(AuthorFactory::new())->count(10)->create();
-        $response = $this->postJson('/api/graphql', ['query' => '{
-  books(first: 3, order: {name: "desc"}) {
-    edges {
-      node {
-        id, name, publicationDate, author { id, name }
-      }
-    }
-  }
-}'], ['accept' => ['application/json']]);
+        // Create books in reverse alphabetical order to test the 'asc' order
+        BookFactory::new()
+            ->count(10)
+            ->sequence(fn ($sequence) => ['name' => \chr(122 - $sequence->index)]) // ASCII codes starting from 'z'
+            ->has(AuthorFactory::new())
+            ->create();
+
+        $response = $this->postJson('/api/graphql', [
+            'query' => '
+              query getBooks($first: Int!, $order: orderBookcollection_query!) {
+                books(first: $first, order: $order) {
+                  edges {
+                    node {
+                      id, name, publicationDate, author { id, name }
+                    }
+                  }
+                }
+              }
+            ',
+            'variables' => [
+                'first' => 3,
+                'order' => ['name' => 'asc'],
+            ],
+        ], ['accept' => ['application/json']]);
         $response->assertStatus(200);
         $data = $response->json();
         $this->assertArrayHasKey('data', $data);
         $this->assertCount(3, $data['data']['books']['edges']);
+        $this->assertEquals('q', $data['data']['books']['edges'][0]['node']['name']);
+        $this->assertEquals('r', $data['data']['books']['edges'][1]['node']['name']);
+        $this->assertEquals('s', $data['data']['books']['edges'][2]['node']['name']);
         $this->assertArrayNotHasKey('errors', $data);
     }
 
diff --git a/src/Laravel/composer.json b/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",
diff --git a/src/Metadata/Extractor/YamlResourceExtractor.php b/src/Metadata/Extractor/YamlResourceExtractor.php
@@ -472,7 +472,7 @@ private function buildParameters(array $resource): ?array
             $parameters[$key] = new $cl(
                 key: $key,
                 required: $this->phpize($parameter, 'required', 'bool'),
-                schema: $parameter['schema'],
+                schema: $parameter['schema'] ?? null,
                 openApi: ($parameter['openapi'] ?? null) ? new Parameter(
                     name: $parameter['openapi']['name'],
                     in: $parameter['in'] ?? 'query',
diff --git a/src/Metadata/Tests/Extractor/Adapter/XmlResourceAdapter.php b/src/Metadata/Tests/Extractor/Adapter/XmlResourceAdapter.php
@@ -535,8 +535,14 @@ private function buildParameters(\SimpleXMLElement $resource, ?array $values = n
             $childNode = $node->addChild('parameter');
             $childNode->addAttribute('in', 'query');
             $childNode->addAttribute('key', $key);
-            $childNode->addAttribute('required', $this->parse($value['required']));
-            $this->buildValues($childNode->addChild('schema'), $value['schema']);
+
+            if (\array_key_exists('required', $value)) {
+                $childNode->addAttribute('required', $this->parse($value['required']));
+            }
+
+            if (\array_key_exists('schema', $value)) {
+                $this->buildValues($childNode->addChild('schema'), $value['schema']);
+            }
         }
     }
 
diff --git a/src/Metadata/Tests/Extractor/Adapter/resources.xml b/src/Metadata/Tests/Extractor/Adapter/resources.xml
diff --git a/src/Metadata/Tests/Extractor/Adapter/resources.yaml b/src/Metadata/Tests/Extractor/Adapter/resources.yaml
diff --git a/src/Metadata/Tests/Extractor/ResourceMetadataCompatibilityTest.php b/src/Metadata/Tests/Extractor/ResourceMetadataCompatibilityTest.php
diff --git a/src/OpenApi/Factory/OpenApiFactory.php b/src/OpenApi/Factory/OpenApiFactory.php
diff --git a/src/OpenApi/Tests/Factory/OpenApiFactoryTest.php b/src/OpenApi/Tests/Factory/OpenApiFactoryTest.php
diff --git a/src/OpenApi/Tests/Fixtures/Issue6872/Diamond.php b/src/OpenApi/Tests/Fixtures/Issue6872/Diamond.php
diff --git a/src/ParameterValidator/.github/workflows/close_pr.yml b/src/ParameterValidator/.github/workflows/close_pr.yml
diff --git a/src/State/ProcessorInterface.php b/src/State/ProcessorInterface.php

Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,15 @@ private function getResourceFieldConfiguration(?string $property, ?string $field`
`415`	`415`	`}`
`416`	`416`
`417`	`417`	`$args = $this->getFilterArgs($args, $resourceClass, $rootResource, $resourceOperation, $rootOperation, $property, $depth);`
`418`		`- $args = $this->getParameterArgs($rootOperation, $args);`
	`418`	`+`
	`419`	`+ // Also register parameter args in the types container`
	`420`	`+ // Note: This is a workaround, for more information read the comment on the parameterToObjectType function.`
	`421`	`+ foreach ($this->getParameterArgs($rootOperation) as $key => $arg) {`
	`422`	`+ if ($arg instanceof InputObjectType \|\| (\is_array($arg) && isset($arg['name']))) {`
	`423`	`+ $this->typesContainer->set(\is_array($arg) ? $arg['name'] : $arg->name(), $arg);`
	`424`	`+ }`
	`425`	`+ $args[$key] = $arg;`
	`426`	`+ }`
`419`	`427`	`}`
`420`	`428`	`}`
`421`	`429`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,10 @@ public function getSchema(Parameter $parameter): array`
`84`	`84`	`return ['type' => 'date'];`
`85`	`85`	`}`
`86`	`86`
`87`		`- public function getOpenApiParameters(Parameter $parameter): OpenApiParameter\|array\|null`
	`87`	`+ /**`
	`88`	`+ * @return OpenApiParameter[]`
	`89`	`+ */`
	`90`	`+ public function getOpenApiParameters(Parameter $parameter): array`
`88`	`91`	`{`
`89`	`92`	`$in = $parameter instanceof QueryParameter ? 'query' : 'header';`
`90`	`93`	`$key = $parameter->getKey();`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function getSchema(Parameter $parameter): array`
`49`	`49`	`return ['type' => 'array', 'items' => $schema];`
`50`	`50`	`}`
`51`	`51`
`52`		`- public function getOpenApiParameters(Parameter $parameter): OpenApiParameter\|array\|null`
	`52`	`+ public function getOpenApiParameters(Parameter $parameter): OpenApiParameter`
`53`	`53`	`{`
`54`	`54`	`return new OpenApiParameter(name: $parameter->getKey().'[]', in: 'query', style: 'deepObject', explode: true);`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,10 @@ public function getSchema(Parameter $parameter): array`
`54`	`54`	`return ['type' => 'string', 'enum' => ['asc', 'desc']];`
`55`	`55`	`}`
`56`	`56`
`57`		`- public function getOpenApiParameters(Parameter $parameter): OpenApiParameter\|array\|null`
	`57`	`+ /**`
	`58`	`+ * @return OpenApiParameter[]\|null`
	`59`	`+ */`
	`60`	`+ public function getOpenApiParameters(Parameter $parameter): ?array`
`58`	`61`	`{`
`59`	`62`	`if (str_contains($parameter->getKey(), ':property')) {`
`60`	`63`	`$parameters = [];`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,10 @@ public function getSchema(Parameter $parameter): array`
`52`	`52`	`return ['type' => 'number'];`
`53`	`53`	`}`
`54`	`54`
`55`		`- public function getOpenApiParameters(Parameter $parameter): OpenApiParameter\|array\|null`
	`55`	`+ /**`
	`56`	`+ * @return OpenApiParameter[]`
	`57`	`+ */`
	`58`	`+ public function getOpenApiParameters(Parameter $parameter): array`
`56`	`59`	`{`
`57`	`60`	`$in = $parameter instanceof QueryParameter ? 'query' : 'header';`
`58`	`61`	`$key = $parameter->getKey();`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function __construct(`
`34`	`34`
`35`	`35`	`public function count(): int`
`36`	`36`	`{`
`37`		`- return $this->paginator->count();`
	`37`	`+ return $this->paginator->count(); // @phpstan-ignore-line`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public function getLastPage(): float`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function __construct(`
`33`	`33`
`34`	`34`	`public function count(): int`
`35`	`35`	`{`
`36`		`- return $this->paginator->count();`
	`36`	`+ return $this->paginator->count(); // @phpstan-ignore-line`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public function getCurrentPage(): float`