Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: don't implement deprecated CacheableSupportsMethodInterface #5696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dunglas merged 7 commits into from
Jul 24, 2023
Merged

fix: don't implement deprecated CacheableSupportsMethodInterface #5696

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
80e74fc
fix: don't implement deprecated CacheableSupportsMethodInterface
dunglas Jul 24, 2023
5ae5f04
fix: a check, and add tests
dunglas Jul 24, 2023
e895055
fix ApiGatewayNormalizerTest
dunglas Jul 24, 2023
7ec4f6d
more fixes
dunglas Jul 24, 2023
b355445
fix more tests
dunglas Jul 24, 2023
b567813
fix lowest
dunglas Jul 24, 2023
296c7a0
only trigger the deprecation for Symfony 6.3
dunglas Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix more tests
  • Loading branch information
@dunglas
dunglas committed Jul 24, 2023
commit b35544578619c038428d8e8945fa77a8310dec0d
5 changes: 4 additions & 1 deletion src/OpenApi/Tests/Serializer/ApiGatewayNormalizerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ public function testSupportsNormalization(): void
$normalizer = new ApiGatewayNormalizer($normalizerProphecy->reveal());

$this->assertTrue($normalizer->supportsNormalization(OpenApiNormalizer::FORMAT, OpenApi::class));
$this->assertTrue($normalizer->hasCacheableSupportsMethod());

if (!method_exists(Serializer::class, 'getSupportedTypes')) {
$this->assertTrue($normalizer->hasCacheableSupportsMethod());
}
}

public function testNormalize(): void
Expand Down
4 changes: 4 additions & 0 deletions tests/Elasticsearch/Serializer/ItemNormalizerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@ public function testSetSerializerWithDecoratedNormalizerNotAnInstanceOfSerialize

public function testGetSupportedTypes(): void
{
if (!method_exists(Serializer::class, 'getSupportedTypes')) {
$this->markTestSkipped('Symfony Serializer < 6.3');
}

$this->normalizerProphecy->getSupportedTypes(Argument::any())->willReturn(['*' => true]);

$this->assertEmpty($this->itemNormalizer->getSupportedTypes('json'));
Expand Down
13 changes: 7 additions & 6 deletions tests/Hydra/Serializer/CollectionFiltersNormalizerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ public function testSupportsNormalization(): void
{
$decoratedProphecy = $this->prophesize(NormalizerInterface::class);
$decoratedProphecy->supportsNormalization('foo', 'abc', Argument::type('array'))->willReturn(true)->shouldBeCalled();
$decoratedProphecy->getSupportedTypes(Argument::any())->willReturn(['*' => true]);
if (!method_exists(Serializer::class, 'getSupportedTypes')) {
if (method_exists(Serializer::class, 'getSupportedTypes')) {
$decoratedProphecy->getSupportedTypes(Argument::any())->willReturn(['*' => true]);
} else {
$decoratedProphecy->willImplement(CacheableSupportsMethodInterface::class);
$decoratedProphecy->hasCacheableSupportsMethod()->willReturn(true)->shouldBeCalled();
}
Expand All @@ -61,10 +62,10 @@ public function testSupportsNormalization(): void
$this->prophesize(ContainerInterface::class)->reveal()
);

$this->assertTrue($normalizer->supportsNormalization('foo', 'abc'));
$this->assertSame(['*' => true], $normalizer->getSupportedTypes('jsonld'));

if (!method_exists(Serializer::class, 'getSupportedTypes')) {
if (method_exists(Serializer::class, 'getSupportedTypes')) {
$this->assertTrue($normalizer->supportsNormalization('foo', 'abc'));
$this->assertSame(['*' => true], $normalizer->getSupportedTypes('jsonld'));
} else {
$this->assertTrue($normalizer->hasCacheableSupportsMethod());
}
}
Expand Down
14 changes: 8 additions & 6 deletions tests/Hydra/Serializer/PartialCollectionViewNormalizerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,11 @@ public function testSupportsNormalization(): void
{
$decoratedNormalizerProphecy = $this->prophesize(NormalizerInterface::class);
$decoratedNormalizerProphecy->supportsNormalization(Argument::any(), null, Argument::type('array'))->willReturn(true)->shouldBeCalled();
$decoratedNormalizerProphecy->getSupportedTypes('jsonld')->willReturn(['*' => true]);
$decoratedNormalizerProphecy->getSupportedTypes(Argument::any())->willReturn([]);

if (!method_exists(Serializer::class, 'getSupportedTypes')) {
if (method_exists(Serializer::class, 'getSupportedTypes')) {
$decoratedNormalizerProphecy->getSupportedTypes('jsonld')->willReturn(['*' => true]);
$decoratedNormalizerProphecy->getSupportedTypes(Argument::any())->willReturn([]);
} else {
$decoratedNormalizerProphecy->willImplement(CacheableSupportsMethodInterface::class);
$decoratedNormalizerProphecy->hasCacheableSupportsMethod()->willReturn(true)->shouldBeCalled();
}
Expand All @@ -178,10 +179,11 @@ public function testSupportsNormalization(): void

$normalizer = new PartialCollectionViewNormalizer($decoratedNormalizerProphecy->reveal(), 'page', 'pagination', $resourceMetadataFactory->reveal());
$this->assertTrue($normalizer->supportsNormalization(new \stdClass()));
$this->assertEmpty($normalizer->getSupportedTypes('json'));
$this->assertSame(['*' => true], $normalizer->getSupportedTypes('jsonld'));

if (!method_exists(Serializer::class, 'getSupportedTypes')) {
if (method_exists(Serializer::class, 'getSupportedTypes')) {
$this->assertEmpty($normalizer->getSupportedTypes('json'));
$this->assertSame(['*' => true], $normalizer->getSupportedTypes('jsonld'));
} else {
$this->assertTrue($normalizer->hasCacheableSupportsMethod());
}
}
Expand Down