8000 Rename · symfony/symfony@a9e109a · GitHub
[go: up one dir, main page]
Skip to content

Commit a9e109a

Browse files
NyholmNyholm
committed
Rename
1 parent 745a81e commit a9e109a

File tree

7 files changed

+29
-20
lines changed

7 files changed

+29
-20
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838
use Symfony\Component\Serializer\Normalizer\DateIntervalNormalizer;
3939
use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
4040
use Symfony\Component\Serializer\Normalizer\DateTimeZoneNormalizer;
41-
use Symfony\Component\Serializer\Normalizer\DenormalizerAggregator;
42-
use Symfony\Component\Serializer\Normalizer\DenormalizerAggregatorInterface;
41+
use Symfony\Component\Serializer\Normalizer\ChainDenormalizer;
42+
use Symfony\Component\Serializer\Normalizer\ChainDenormalizerInterface;
4343
use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
4444
use Symfony\Component\Serializer\Normalizer\FormErrorNormalizer;
4545
use Symfony\Component\Serializer\Normalizer\JsonSerializableNormalizer;
4646
use Symfony\Component\Serializer\Normalizer\MimeMessageNormalizer;
47-
use Symfony\Component\Serializer\Normalizer\NormalizerAggregator;
48-
use Symfony\Component\Serializer\Normalizer\NormalizerAggregatorInterface;
47+
use Symfony\Component\Serializer\Normalizer\ChainNormalizer;
48+
use Symfony\Component\Serializer\Normalizer\ChainNormalizerInterface;
4949
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
5050
use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
5151
use Symfony\Component\Serializer\Normalizer\ProblemNormalizer;
@@ -62,18 +62,18 @@
6262
;
6363

6464
$container->services()
65-
->set('serializer.normalizer', NormalizerAggregator::class)
65+
->set('serializer.normalizer', ChainNormalizer::class)
6666
->args([[]])
67-
->set('serializer.denormalizer', DenormalizerAggregator::class)
67+
->set('serializer.denormalizer', ChainDenormalizer::class)
6868
->args([[]])
6969
->set('serializer', Serializer::class)
7070
->args([[], [], service('serializer.normalizer'), serialize('serializer.denormalizer')])
7171

7272
->alias(SerializerInterface::class, 'serializer')
7373
->alias(NormalizerInterface::class, 'serializer.normalizer')
74-
->alias(NormalizerAggregatorInterface::class, 'serializer.normalizer')
74+
->alias(ChainNormalizerInterface::class, 'serializer.normalizer')
7575
->alias(DenormalizerInterface::class, 'serializer.denormalizer')
76-
->alias(DenormalizerAggregatorInterface::class, 'serializer.denormalizer')
76+
->alias(ChainDenormalizerInterface::class, 'serializer.denormalizer')
7777
->alias(EncoderInterface::class, 'serializer')
7878
->alias(DecoderInterface::class, 'serializer')
7979

‎src/Symfony/Component/Serializer/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
CHANGELOG
22
=========
33

4+
7.1
5+
---
6+
7+
* Add `ChainNormalizerInterface` and `ChainDenormalizerInterface` with their respective implementations
8+
49
7.0
510
---
611

‎src/Symfony/Component/Serializer/Normalizer/DenormalizerAggregator.php renamed to ‎src/Symfony/Component/Serializer/Normalizer/ChainDenormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*
2323
* @author Tobias Nyholm <tobias.nyholm@gmail.com>
2424
*/
25-
class DenormalizerAggregator implements DenormalizerAggregatorInterface
25+
class ChainDenormalizer implements ChainDenormalizerInterface
2626
{
2727
private const SCALAR_TYPES = [
2828
'int' => true,

‎src/Symfony/Component/Serializer/Normalizer/DenormalizerAggregatorInterface.php renamed to ‎src/Symfony/Component/Serializer/Normalizer/ChainDenormalizerInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* @author Tobias Nyholm <tobias.nyholm@gmail.com>
99
*/
10-
interface DenormalizerAggregatorInterface extends DenormalizerInterface
10+
interface ChainDenormalizerInterface extends DenormalizerInterface
1111
{
1212
/**
1313
* Add a Denormalizer last in the line.

‎src/Symfony/Component/Serializer/Normalizer/NormalizerAggregator.php renamed to ‎src/Symfony/Component/Serializer/Normalizer/ChainNormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*
2323
* @author Tobias Nyholm <tobias.nyholm@gmail.com>
2424
*/
25-
class NormalizerAggregator implements NormalizerAggregatorInterface
25+
class ChainNormalizer implements ChainNormalizerInterface
2626
{
2727
/**
2828
* @var NormalizerInterface[]

‎src/Symfony/Component/Serializer/Normalizer/NormalizerAggregatorInterface.php renamed to ‎src/Symfony/Component/Serializer/Normalizer/ChainNormalizerInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* @author Tobias Nyholm <tobias.nyholm@gmail.com>
99
*/
10-
interface NormalizerAggregatorInterface extends NormalizerInterface
10+
interface ChainNormalizerInterface extends NormalizerInterface
1111
{
1212
/**
1313
* Add a Normalizer last in the line.

‎src/Symfony/Component/Serializer/Serializer.php

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
use Symfony\Component\Serializer\Exception\InvalidArgumentException;
2121
use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
2222
use Symfony\Component\Serializer\Exception\UnsupportedFormatException;
23-
use Symfony\Component\Serializer\Normalizer\DenormalizerAggregator;
23+
use Symfony\Component\Serializer\Normalizer\ChainDenormalizer;
2424
use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
25-
use Symfony\Component\Serializer\Normalizer\NormalizerAggregator;
25+
use Symfony\Component\Serializer\Normalizer\ChainNormalizer;
2626
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
2727

2828
/**
@@ -61,13 +61,17 @@ class Serializer implements SerializerInterface, NormalizerInterface, Denormaliz
6161
* @param array<EncoderInterface|DecoderInterface> $encoders
6262
*/
6363
public function __construct(
64-
array $normalizers = [],
65-
array $encoders = [],
66-
NormalizerAggregator $normalizerAggregator = null,
67-
DenormalizerAggregator $denormalizerAggregator = null,
64+
array $normalizers = [],
65+
array $encoders = [],
66+
ChainNormalizer $normalizerAggregator = null,
67+
ChainDenormalizer $denormalizerAggregator = null,
6868
) {
69-
$this->normalizer = $normalizerAggregator ?? new NormalizerAggregator();
70-
$this->denormalizer = $denormalizerAggregator ?? new DenormalizerAggregator();
69+
$this->normalizer = $normalizerAggregator ?? new ChainNormalizer();
70+
$this->denormalizer = $denormalizerAggregator ?? new ChainDenormalizer();
71+
72+
if ([] !== $normalizers) {
73+
trigger_deprecation('symfony/serializer', '7.1', 'Passing normalizers as first argument to "%s" is deprecated, use a chain normalizer/denormalizer instead.', __METHOD__);
74+
}
7175

7276
foreach ($normalizers as $normalizer) {
7377
if ($normalizer instanceof SerializerAwareInterface) {

0 commit comments

Comments
 (0)
0