Skip to content

Commit 325a04c

Browse files
committed
Merge 4.2
2 parents cbd025b + ef556db commit 325a04c

37 files changed

+1179
-141
lines changed

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,19 @@
77
* [21aa2572d](https://github.com/api-platform/core/commit/21aa2572d8fef2b3f05f7307c51348a6c9767e45) feat(elasticsearch): add SSL options for Elasticsearch configuration (#4059)
88
* [ba0c76c](https://github.com/api-platform/core/commit/ba0c76c6f5c8afa8622e87a155b8b99f453d6453) feat(doctrine): remove put & path for readonly entity (#7019)
99

10+
## v4.2.6
11+
12+
### Bug fixes
13+
14+
* [53d3f8481](https://github.com/api-platform/core/commit/53d3f84817212baccb1a27aa8acf537d7ca6ff10) fix(state): object mapper flag (#7541)
15+
* [f4a1697ca](https://github.com/api-platform/core/commit/f4a1697ca8028395c611648bd0032a8761069e67) Revert "fix: 🐛 make default value of `pagination_maximum_items_per_page` same…" (#7533)
16+
17+
## v4.2.5
18+
19+
### Bug fixes
20+
21+
* [57fe3d1](https://github.com/api-platform/core/commit/57fe3d127d477911c4f678ff392bcfd91ef79533) fix(state): class existence check for ObjectMapperAwareInterface
22+
1023
## v4.2.4
1124

1225
### Bug fixes

phpstan.neon.dist

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,3 +178,11 @@ parameters:
178178
- src/Symfony/Bundle/Test
179179
- tests
180180
- src # TODO
181+
182+
-
183+
identifier: method.notFound
184+
paths:
185+
- tests/Functional/JsonStreamerTest.php
186+
-
187+
paths:
188+
- tests/Fixtures/app/config/reference.php

src/Metadata/ApiResource.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -969,8 +969,9 @@ public function __construct(
969969
array|Parameters|null $parameters = null,
970970
protected ?bool $strictQueryParameterValidation = null,
971971
protected ?bool $hideHydraOperation = null,
972-
?bool $jsonStream = null,
972+
protected ?bool $jsonStream = null,
973973
protected array $extraProperties = [],
974+
?bool $map = null,
974975
) {
975976
parent::__construct(
976977
shortName: $shortName,
@@ -1016,7 +1017,8 @@ class: $class,
10161017
strictQueryParameterValidation: $strictQueryParameterValidation,
10171018
hideHydraOperation: $hideHydraOperation,
10181019
jsonStream: $jsonStream,
1019-
extraProperties: $extraProperties
1020+
extraProperties: $extraProperties,
1021+
map: $map
10201022
);
10211023

10221024
/* @var Operations<HttpOperation> $operations> */

src/Metadata/Delete.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ public function __construct(
101101
protected ?bool $hideHydraOperation = null,
102102
?bool $jsonStream = null,
103103
array $extraProperties = [],
104+
?bool $map = null,
104105
) {
105106
parent::__construct(
106107
method: 'DELETE',
@@ -183,6 +184,7 @@ class: $class,
183184
strictQueryParameterValidation: $strictQueryParameterValidation,
184185
hideHydraOperation: $hideHydraOperation,
185186
stateOptions: $stateOptions,
187+
map: $map
186188
);
187189
}
188190
}

src/Metadata/Error.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ public function __construct(
9595
?OptionsInterface $stateOptions = null,
9696
?bool $hideHydraOperation = null,
9797
?bool $jsonStream = null,
98+
?bool $map = null,
9899
array $extraProperties = [],
99100
) {
100101
parent::__construct(
@@ -171,6 +172,7 @@ class: $class,
171172
stateOptions: $stateOptions,
172173
hideHydraOperation: $hideHydraOperation,
173174
jsonStream: $jsonStream,
175+
map: $map,
174176
extraProperties: $extraProperties,
175177
);
176178
}

src/Metadata/Extractor/XmlResourceExtractor.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ private function buildBase(\SimpleXMLElement $resource): array
147147
'read' => $this->phpize($resource, 'read', 'bool'),
148148
'write' => $this->phpize($resource, 'write', 'bool'),
149149
'jsonStream' => $this->phpize($resource, 'jsonStream', 'bool'),
150+
'map' => $this->phpize($resource, 'map', 'bool'),
150151
];
151152
}
152153

src/Metadata/Extractor/YamlResourceExtractor.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ private function buildBase(array $resource): array
173173
'read' => $this->phpize($resource, 'read', 'bool'),
174174
'write' => $this->phpize($resource, 'write', 'bool'),
175175
'jsonStream' => $this->phpize($resource, 'jsonStream', 'bool'),
176+
'map' => $this->phpize($resource, 'map', 'bool'),
176177
];
177178
}
178179

src/Metadata/Extractor/schema/resources.xsd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,6 +524,7 @@
524524
<xsd:attribute type="xsd:string" name="securityPostValidationMessage"/>
525525
<xsd:attribute type="xsd:boolean" name="collectDenormalizationErrors"/>
526526
<xsd:attribute type="xsd:boolean" name="jsonStream"/>
527+
<xsd:attribute type="xsd:boolean" name="map"/>
527528
</xsd:attributeGroup>
528529

529530
<xsd:attributeGroup name="extendedBase">

src/Metadata/Get.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ public function __construct(
101101
protected ?bool $hideHydraOperation = null,
102102
?bool $jsonStream = null,
103103
array $extraProperties = [],
104+
?bool $map = null,
104105
) {
105106
parent::__construct(
106107
uriTemplate: $uriTemplate,
@@ -182,6 +183,7 @@ class: $class,
182183
hideHydraOperation: $hideHydraOperation,
183184
jsonStream: $jsonStream,
184185
extraProperties: $extraProperties,
186+
map: $map
185187
);
186188
}
187189
}

src/Metadata/GetCollection.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ public function __construct(
102102
?bool $jsonStream = null,
103103
array $extraProperties = [],
104104
private ?string $itemUriTemplate = null,
105+
?bool $map = null,
105106
) {
106107
parent::__construct(
107108
uriTemplate: $uriTemplate,
@@ -183,6 +184,7 @@ class: $class,
183184
strictQueryParameterValidation: $strictQueryParameterValidation,
184185
hideHydraOperation: $hideHydraOperation,
185186
stateOptions: $stateOptions,
187+
map: $map
186188
);
187189
}
188190

0 commit comments

Comments
 (0)