Skip to content

Commit 1447560

Browse files
committed
Merge 3.4
2 parents 2e92aea + fc94db0 commit 1447560

File tree

80 files changed

+762
-109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+762
-109
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"symfony/config": "^6.4 || ^7.1",
8585
"symfony/console": "^6.4 || ^7.1",
8686
"symfony/css-selector": "^6.4 || ^7.1",
87-
"symfony/dependency-injection": "^6.4 || ^7.1.12",
87+
"symfony/dependency-injection": "^6.4 || ^7.1",
8888
"symfony/doctrine-bridge": "^6.4 || ^7.1",
8989
"symfony/dom-crawler": "^6.4 || ^7.1",
9090
"symfony/error-handler": "^6.4 || ^7.1",

features/openapi/docs.feature

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Feature: Documentation support
153153
And the JSON node "paths./related_dummies/{id}/related_to_dummy_friends.get.parameters" should have 6 elements
154154

155155
# Subcollection - check schema
156-
And the JSON node "paths./related_dummies/{id}/related_to_dummy_friends.get.responses.200.content.application/ld+json.schema.properties.hydra:member.items.$ref" should be equal to "#/components/schemas/RelatedToDummyFriend.jsonld-fakemanytomany"
156+
And the JSON node "paths./related_dummies/{id}/related_to_dummy_friends.get.responses.200.content.application/ld+json.schema.properties.hydra:member.items.$ref" should be equal to "#/components/schemas/RelatedToDummyFriend.jsonld-fakemanytomany.output"
157157

158158
# Deprecations
159159
And the JSON node "paths./dummies.get.deprecated" should be false
@@ -165,8 +165,8 @@ Feature: Documentation support
165165
And the JSON node "paths./deprecated_resources/{id}.patch.deprecated" should be true
166166

167167
# Formats
168-
And the OpenAPI class "Dummy.jsonld" exists
169-
And the "@id" property exists for the OpenAPI class "Dummy.jsonld"
168+
And the OpenAPI class "Dummy.jsonld.output" exists
169+
And the "@id" property exists for the OpenAPI class "Dummy.jsonld.output"
170170
And the JSON node "paths./dummies.get.responses.200.content.application/ld+json" should be equal to:
171171
"""
172172
{
@@ -176,7 +176,7 @@ Feature: Documentation support
176176
"hydra:member": {
177177
"type": "array",
178178
"items": {
179-
"$ref": "#/components/schemas/Dummy.jsonld"
179+
"$ref": "#/components/schemas/Dummy.jsonld.output"
180180
}
181181
},
182182
"hydra:totalItems": {

src/Action/NotExposedAction.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
/**
2020
* An action which always returns HTTP 404 Not Found with an explanation for why the operation is not exposed.
21+
*
22+
* @deprecated use ApiPlatform\Symfony\Action\NotExposedAction
2123
*/
2224
final class NotExposedAction
2325
{

src/Action/NotFoundAction.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
/**
1919
* An action which always returns HTTP 404 Not Found. Useful for disabling an operation.
20+
*
21+
* @deprecated use ApiPlatform\Symfony\Action\NotFoundAction
2022
*/
2123
final class NotFoundAction
2224
{

src/Action/PlaceholderAction.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
* Placeholder returning the data passed in parameter.
1818
*
1919
* @author Kévin Dunglas <[email protected]>
20+
*
21+
* @deprecated use ApiPlatform\Symfony\Action\PlaceholderAction
2022
*/
2123
final class PlaceholderAction
2224
{

src/Elasticsearch/Metadata/Resource/Factory/ElasticsearchProviderResourceMetadataCollectionFactory.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,17 @@
2121
use ApiPlatform\Metadata\Operation;
2222
use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
2323
use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
24-
use ApiPlatform\Metadata\Util\Inflector;
2524
use Elasticsearch\Client;
2625
use Elasticsearch\Common\Exceptions\Missing404Exception;
2726
use Elasticsearch\Common\Exceptions\NoNodesAvailableException;
2827

2928
final class ElasticsearchProviderResourceMetadataCollectionFactory implements ResourceMetadataCollectionFactoryInterface
3029
{
31-
public function __construct(private readonly ?Client $client, private readonly ResourceMetadataCollectionFactoryInterface $decorated, private readonly bool $triggerDeprecation = true, private readonly ?InflectorInterface $inflector = new Inflector()) // @phpstan-ignore-line
30+
public function __construct(private readonly ?Client $client, private readonly ResourceMetadataCollectionFactoryInterface $decorated, private readonly bool $triggerDeprecation = true, private readonly ?InflectorInterface $inflector = null) // @phpstan-ignore-line
3231
{
32+
if ($client) {
33+
trigger_deprecation('api-platform/core', '4.0', sprintf('Using $client at "%s" is deprecated and the argument will be removed.', self::class));
34+
}
3335
}
3436

3537
/**

src/Exception/DeserializationException.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
*
2121
* @author Samuel ROZE <[email protected]>
2222
* @author Kévin Dunglas <[email protected]>
23+
*
24+
* @deprecated
2325
*/
2426
class DeserializationException extends \Exception implements ExceptionInterface, SerializerExceptionInterface
2527
{

src/Exception/ExceptionInterface.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
* Base exception interface.
1818
*
1919
* @author Kévin Dunglas <[email protected]>
20+
*
21+
* @deprecated use ApiPlatform\Metadata\Exception\ExceptionInterface
2022
*/
2123
interface ExceptionInterface extends \Throwable
2224
{

src/Exception/InvalidArgumentException.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
* Invalid argument exception.
1818
*
1919
* @author Kévin Dunglas <[email protected]>
20+
*
21+
* @deprecated use ApiPlatform\Metadata\Exception\InvalidArgumentException
2022
*/
2123
class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
2224
{

src/Exception/InvalidIdentifierException.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
* Identifier is not valid exception.
1818
*
1919
* @author Antoine Bluchet <[email protected]>
20+
*
21+
* @deprecated use ApiPlatform\Metadata\Exception\InvalidIdentifierException
2022
*/
2123
class InvalidIdentifierException extends \Exception implements ExceptionInterface
2224
{

0 commit comments

Comments
 (0)