Skip to content

Commit 33df802

Browse files
committed
chore(serializer): remove api-platform/symfony dependency
1 parent b68e33f commit 33df802

File tree

5 files changed

+15
-18
lines changed

5 files changed

+15
-18
lines changed

src/Serializer/AbstractItemNormalizer.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@
2323
use ApiPlatform\Metadata\Property\Factory\PropertyMetadataFactoryInterface;
2424
use ApiPlatform\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface;
2525
use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
26+
use ApiPlatform\Metadata\ResourceAccessCheckerInterface;
2627
use ApiPlatform\Metadata\ResourceClassResolverInterface;
2728
use ApiPlatform\Metadata\UrlGeneratorInterface;
2829
use ApiPlatform\Metadata\Util\ClassInfoTrait;
2930
use ApiPlatform\Metadata\Util\CloneTrait;
30-
use ApiPlatform\Symfony\Security\ResourceAccessCheckerInterface;
31+
use ApiPlatform\Symfony\Security\ResourceAccessCheckerInterface as LegacyResourceAccessCheckerInterface;
3132
use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException;
3233
use Symfony\Component\PropertyAccess\PropertyAccess;
3334
use Symfony\Component\PropertyAccess\PropertyAccessorInterface;

src/Serializer/SerializerContextBuilder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use ApiPlatform\Metadata\Error as ErrorOperation;
1919
use ApiPlatform\Metadata\Exception\RuntimeException;
2020
use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
21-
use ApiPlatform\Symfony\Util\RequestAttributesExtractor;
21+
use ApiPlatform\Metadata\Util\AttributesExtractor;
2222
use Symfony\Component\HttpFoundation\Request;
2323
use Symfony\Component\Serializer\Encoder\CsvEncoder;
2424
use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
@@ -40,7 +40,7 @@ public function __construct(private readonly ?ResourceMetadataCollectionFactoryI
4040
*/
4141
public function createFromRequest(Request $request, bool $normalization, array $attributes = null): array
4242
{
43-
if (null === $attributes && !$attributes = RequestAttributesExtractor::extractAttributes($request)) {
43+
if (null === $attributes && !$attributes = AttributesExtractor::extractAttributes($request->attributes->all())) {
4444
throw new RuntimeException('Request attributes are not valid.');
4545
}
4646

src/Serializer/SerializerFilterContextBuilder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
use ApiPlatform\Metadata\Exception\RuntimeException;
1717
use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
18+
use ApiPlatform\Metadata\Util\AttributesExtractor;
1819
use ApiPlatform\Serializer\Filter\FilterInterface;
19-
use ApiPlatform\Symfony\Util\RequestAttributesExtractor;
2020
use Psr\Container\ContainerInterface;
2121
use Symfony\Component\HttpFoundation\Request;
2222

@@ -36,7 +36,7 @@ public function __construct(private readonly ResourceMetadataCollectionFactoryIn
3636
*/
3737
public function createFromRequest(Request $request, bool $normalization, array $attributes = null): array
3838
{
39-
if (null === $attributes && !$attributes = RequestAttributesExtractor::extractAttributes($request)) {
39+
if (null === $attributes && !$attributes = AttributesExtractor::extractAttributes($request->attributes->all())) {
4040
throw new RuntimeException('Request attributes are not valid.');
4141
}
4242

src/Serializer/Tests/AbstractItemNormalizerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
use ApiPlatform\Metadata\Property\PropertyNameCollection;
2525
use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
2626
use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
27+
use ApiPlatform\Metadata\ResourceAccessCheckerInterface;
2728
use ApiPlatform\Metadata\ResourceClassResolverInterface;
2829
use ApiPlatform\Metadata\UrlGeneratorInterface;
2930
use ApiPlatform\Serializer\AbstractItemNormalizer;
@@ -37,7 +38,6 @@
3738
use ApiPlatform\Serializer\Tests\Fixtures\ApiResource\PropertyCollectionIriOnlyRelation;
3839
use ApiPlatform\Serializer\Tests\Fixtures\ApiResource\RelatedDummy;
3940
use ApiPlatform\Serializer\Tests\Fixtures\ApiResource\SecuredDummy;
40-
use ApiPlatform\Symfony\Security\ResourceAccessCheckerInterface;
4141
use Doctrine\Common\Collections\ArrayCollection;
4242
use PHPUnit\Framework\TestCase;
4343
use Prophecy\Argument;

src/Serializer/composer.json

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@
2424
"api-platform/metadata": "*@dev || ^3.1",
2525
"api-platform/state": "*@dev || ^3.1",
2626
"doctrine/collections": "^2.1",
27-
"symfony/property-access": "^6.3",
28-
"symfony/property-info": "^6.1",
29-
"symfony/serializer": "^6.1",
30-
"symfony/validator": "^6.3"
27+
"symfony/property-access": "^6.3 || ^7.0",
28+
"symfony/property-info": "^6.1 || ^7.0",
29+
"symfony/serializer": "^6.1 || ^7.0",
30+
"symfony/validator": "^6.3 || ^7.0"
3131
},
3232
"require-dev": {
33-
"api-platform/symfony": "*@dev || ^3.1",
3433
"phpspec/prophecy-phpunit": "^2.0",
34+
"sebastian/comparator": "<5.0",
3535
"symfony/mercure-bundle": "*",
36-
"symfony/phpunit-bridge": "^6.1",
37-
"symfony/yaml": "^6.3",
38-
"sebastian/comparator": "<5.0"
36+
"symfony/phpunit-bridge": "^6.1 || ^7.0",
37+
"symfony/var-dumper": "^6.1 || ^7.0",
38+
"symfony/yaml": "^6.3 || ^7.0"
3939
},
4040
"autoload": {
4141
"psr-4": {
@@ -71,10 +71,6 @@
7171
{
7272
"type": "path",
7373
"url": "../State"
74-
},
75-
{
76-
"type": "path",
77-
"url": "../Symfony"
7874
}
7975
]
8076
}

0 commit comments

Comments
 (0)