Skip to content

Commit f505edc

Browse files
committed
Merge 3.4
2 parents b12a0d0 + 42f0ace commit f505edc

File tree

6 files changed

+26
-5
lines changed

6 files changed

+26
-5
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,15 @@ Notes:
248248

249249
* [0d5f35683](https://github.com/api-platform/core/commit/0d5f356839eb6aa9f536044abe4affa736553e76) feat(laravel): laravel component (#5882)
250250

251+
## v3.4.11
252+
253+
### Bug fixes
254+
255+
* [0cf752bce](https://github.com/api-platform/core/commit/0cf752bcec692718b2503250e655d05aea670316) fix(metadata): make the schema attribute to fallback to null for parameters in YamlResourceExtractor (#6896)
256+
* [2b3c55db2](https://github.com/api-platform/core/commit/2b3c55db2a9ecc52f62c441fa8a5696233a30b87) fix(symfony): remove unsolvable deprecation (#6899) see also (#6655)
257+
* [9493b9b6e](https://github.com/api-platform/core/commit/9493b9b6ec0264ab5b700c861ad1b97455b4f88d) fix(symfony): revert json schema bc break (#6903)
258+
* [b82f9ac76](https://github.com/api-platform/core/commit/b82f9ac76ce89dd3910849c73da42317ee1339ed) fix(openapi): not forbidden response on openAPI doc (#6886)
259+
251260
## v3.4.10
252261

253262
### Bug fixes

src/Metadata/Extractor/YamlResourceExtractor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ private function buildParameters(array $resource): ?array
470470
$parameters[$key] = new $cl(
471471
key: $key,
472472
required: $this->phpize($parameter, 'required', 'bool'),
473-
schema: $parameter['schema'],
473+
schema: $parameter['schema'] ?? null,
474474
openApi: ($parameter['openapi'] ?? null) ? new Parameter(
475475
name: $parameter['openapi']['name'],
476476
in: $parameter['in'] ?? 'query',

src/Metadata/Tests/Extractor/Adapter/XmlResourceAdapter.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -533,8 +533,14 @@ private function buildParameters(\SimpleXMLElement $resource, ?array $values = n
533533
$childNode = $node->addChild('parameter');
534534
$childNode->addAttribute('in', 'query');
535535
$childNode->addAttribute('key', $key);
536-
$childNode->addAttribute('required', $this->parse($value['required']));
537-
$this->buildValues($childNode->addChild('schema'), $value['schema']);
536+
537+
if (\array_key_exists('required', $value)) {
538+
$childNode->addAttribute('required', $this->parse($value['required']));
539+
}
540+
541+
if (\array_key_exists('schema', $value)) {
542+
$this->buildValues($childNode->addChild('schema'), $value['schema']);
543+
}
538544
}
539545
}
540546

src/Metadata/Tests/Extractor/Adapter/resources.xml

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/Metadata/Tests/Extractor/Adapter/resources.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,9 @@ resources:
137137
-
138138
rel: 'http://www.w3.org/ns/json-ld#error'
139139
href: 'http://www.w3.org/ns/hydra/error'
140+
parameters:
141+
date:
142+
key: date
140143
formats:
141144
json: null
142145
jsonld: null

src/Metadata/Tests/Extractor/ResourceMetadataCompatibilityTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,9 @@ final class ResourceMetadataCompatibilityTest extends TestCase
433433
'links' => [
434434
['rel' => 'http://www.w3.org/ns/json-ld#error', 'href' => 'http://www.w3.org/ns/hydra/error'],
435435
],
436+
'parameters' => [
437+
'date' => ['key' => 'date'],
438+
],
436439
],
437440
],
438441
],
@@ -749,7 +752,7 @@ private function withParameters(array $values): ?array
749752

750753
$parameters = [];
751754
foreach ($values as $k => $value) {
752-
$parameters[$k] = new QueryParameter(key: $value['key'], required: $value['required'], schema: $value['schema']);
755+
$parameters[$k] = new QueryParameter(key: $value['key'] ?? $k, required: $value['required'] ?? null, schema: $value['schema'] ?? null);
753756
}
754757

755758
return $parameters;

0 commit comments

Comments
 (0)