fix(metadata): make the schema attribute to fallback to null for para…

…meters in YamlResourceExtractor
api-platform · Jan 8, 2025 · a9bb865 · a9bb865
1 parent f8dae8e
commit a9bb865
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/src/Metadata/Extractor/YamlResourceExtractor.php b/src/Metadata/Extractor/YamlResourceExtractor.php
@@ -471,7 +471,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
@@ -533,8 +533,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
@@ -139,6 +139,9 @@ resources:
                         -
                             rel: 'http://www.w3.org/ns/json-ld#error'
                             href: 'http://www.w3.org/ns/hydra/error'
+                    parameters:
+                        date:
+                            key: date
             formats:
                 json: null
                 jsonld: null

diff --git a/src/Metadata/Tests/Extractor/ResourceMetadataCompatibilityTest.php b/src/Metadata/Tests/Extractor/ResourceMetadataCompatibilityTest.php
@@ -442,6 +442,9 @@ final class ResourceMetadataCompatibilityTest extends TestCase
                     'links' => [
                         ['rel' => 'http://www.w3.org/ns/json-ld#error', 'href' => 'http://www.w3.org/ns/hydra/error'],
                     ],
+                    'parameters' => [
+                        'date' => ['key' => 'date'],
+                    ],
                 ],
             ],
         ],
@@ -761,7 +764,7 @@ private function withParameters(array $values): ?array
 
         $parameters = [];
         foreach ($values as $k => $value) {
-            $parameters[$k] = new QueryParameter(key: $value['key'], required: $value['required'], schema: $value['schema']);
+            $parameters[$k] = new QueryParameter(key: $value['key'] ?? null, required: $value['required'] ?? null, schema: $value['schema'] ?? null);
         }
 
         return $parameters;