Skip to content

Commit 57d6788

Browse files
authored
Merge pull request #2817 from teohhanhui/fix/abstract-item-normalizer-bc-break
Fix BC break in AbstractItemNormalizer introduced in v2.4
2 parents 717b909 + ef48ac6 commit 57d6788

File tree

5 files changed

+18
-20
lines changed

5 files changed

+18
-20
lines changed

src/GraphQl/Serializer/ItemNormalizer.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ final class ItemNormalizer extends BaseItemNormalizer
3333
/**
3434
* {@inheritdoc}
3535
*/
36-
public function supportsNormalization($data, $format = null, array $context = []): bool
36+
public function supportsNormalization($data, $format = null): bool
3737
{
38-
return self::FORMAT === $format && parent::supportsNormalization($data, $format, $context);
38+
return self::FORMAT === $format && parent::supportsNormalization($data, $format);
3939
}
4040

4141
/**
@@ -71,9 +71,9 @@ protected function normalizeCollectionOfRelations(PropertyMetadata $propertyMeta
7171
/**
7272
* {@inheritdoc}
7373
*/
74-
public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
74+
public function supportsDenormalization($data, $type, $format = null): bool
7575
{
76-
return self::FORMAT === $format && parent::supportsDenormalization($data, $type, $format, $context);
76+
return self::FORMAT === $format && parent::supportsDenormalization($data, $type, $format);
7777
}
7878

7979
/**

src/Hal/Serializer/ItemNormalizer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ final class ItemNormalizer extends AbstractItemNormalizer
3838
/**
3939
* {@inheritdoc}
4040
*/
41-
public function supportsNormalization($data, $format = null, array $context = []): bool
41+
public function supportsNormalization($data, $format = null): bool
4242
{
43-
return self::FORMAT === $format && parent::supportsNormalization($data, $format, $context);
43+
return self::FORMAT === $format && parent::supportsNormalization($data, $format);
4444
}
4545

4646
/**
@@ -84,7 +84,7 @@ public function normalize($object, $format = null, array $context = [])
8484
/**
8585
* {@inheritdoc}
8686
*/
87-
public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
87+
public function supportsDenormalization($data, $type, $format = null): bool
8888
{
8989
// prevent the use of lower priority normalizers (e.g. serializer.normalizer.object) for this format
9090
return self::FORMAT === $format;

src/JsonApi/Serializer/ItemNormalizer.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ public function __construct(PropertyNameCollectionFactoryInterface $propertyName
5656
/**
5757
* {@inheritdoc}
5858
*/
59-
public function supportsNormalization($data, $format = null, array $context = []): bool
59+
public function supportsNormalization($data, $format = null): bool
6060
{
61-
return self::FORMAT === $format && parent::supportsNormalization($data, $format, $context);
61+
return self::FORMAT === $format && parent::supportsNormalization($data, $format);
6262
}
6363

6464
/**
@@ -118,9 +118,9 @@ public function normalize($object, $format = null, array $context = [])
118118
/**
119119
* {@inheritdoc}
120120
*/
121-
public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
121+
public function supportsDenormalization($data, $type, $format = null): bool
122122
{
123-
return self::FORMAT === $format && parent::supportsDenormalization($data, $type, $format, $context);
123+
return self::FORMAT === $format && parent::supportsDenormalization($data, $type, $format);
124124
}
125125

126126
/**

src/JsonLd/Serializer/ItemNormalizer.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ public function __construct(ResourceMetadataFactoryInterface $resourceMetadataFa
5353
/**
5454
* {@inheritdoc}
5555
*/
56-
public function supportsNormalization($data, $format = null, array $context = []): bool
56+
public function supportsNormalization($data, $format = null): bool
5757
{
58-
return self::FORMAT === $format && parent::supportsNormalization($data, $format, $context);
58+
return self::FORMAT === $format && parent::supportsNormalization($data, $format);
5959
}
6060

6161
/**
@@ -93,9 +93,9 @@ public function normalize($object, $format = null, array $context = [])
9393
/**
9494
* {@inheritdoc}
9595
*/
96-
public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
96+
public function supportsDenormalization($data, $type, $format = null): bool
9797
{
98-
return self::FORMAT === $format && parent::supportsDenormalization($data, $type, $format, $context);
98+
return self::FORMAT === $format && parent::supportsDenormalization($data, $type, $format);
9999
}
100100

101101
/**

src/Serializer/AbstractItemNormalizer.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
use Symfony\Component\Serializer\NameConverter\AdvancedNameConverterInterface;
3838
use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
3939
use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
40-
use Symfony\Component\Serializer\Normalizer\ContextAwareDenormalizerInterface;
41-
use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
4240
use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
4341
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
4442

@@ -47,7 +45,7 @@
4745
*
4846
* @author Kévin Dunglas <[email protected]>
4947
*/
50-
abstract class AbstractItemNormalizer extends AbstractObjectNormalizer implements ContextAwareNormalizerInterface, ContextAwareDenormalizerInterface
48+
abstract class AbstractItemNormalizer extends AbstractObjectNormalizer
5149
{
5250
use ClassInfoTrait;
5351
use ContextTrait;
@@ -90,7 +88,7 @@ public function __construct(PropertyNameCollectionFactoryInterface $propertyName
9088
/**
9189
* {@inheritdoc}
9290
*/
93-
public function supportsNormalization($data, $format = null, array $context = [])
91+
public function supportsNormalization($data, $format = null)
9492
{
9593
if (!\is_object($data) || $data instanceof \Traversable) {
9694
return false;
@@ -161,7 +159,7 @@ public function normalize($object, $format = null, array $context = [])
161159
/**
162160
* {@inheritdoc}
163161
*/
164-
public function supportsDenormalization($data, $type, $format = null, array $context = [])
162+
public function supportsDenormalization($data, $type, $format = null)
165163
{
166164
return $this->localCache[$type] ?? $this->localCache[$type] = $this->resourceClassResolver->isResourceClass($type);
167165
}

0 commit comments

Comments
 (0)