Skip to content

Commit 126dd2c

Browse files
committed
[FrameworkBundle][Serializer] Move SerializerPass to the Serializer
1 parent 9b84732 commit 126dd2c

File tree

5 files changed

+16
-32
lines changed

5 files changed

+16
-32
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ CHANGELOG
1313
* Added `GlobalVariables::getToken()`
1414
* Deprecated `Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddConsoleCommandPass`. Use `Symfony\Component\Console\DependencyInjection\AddConsoleCommandPass` instead.
1515
* Added configurable paths for validation files
16+
* Deprecated `SerializerPass`, use `Symfony\Component\Serializer\DependencyInjection\SerializerPass` instead.
1617

1718
3.2.0
1819
-----

DependencyInjection/Compiler/SerializerPass.php

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,40 +11,18 @@
1111

1212
namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
1313

14-
use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;
15-
use Symfony\Component\DependencyInjection\ContainerBuilder;
16-
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
17-
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
14+
@trigger_error(sprintf('The %s class is deprecated since version 3.3 and will be removed in 4.0. Use Symfony\Component\Serializer\DependencyInjection\SerializerPass instead.', SerializerPass::class), E_USER_DEPRECATED);
15+
16+
use Symfony\Component\Serializer\DependencyInjection\SerializerPass as BaseSerializerPass;
1817

1918
/**
2019
* Adds all services with the tags "serializer.encoder" and "serializer.normalizer" as
2120
* encoders and normalizers to the Serializer service.
2221
*
22+
* @deprecated since version 3.3, to be removed in 4.0. Use {@link BaseSerializerPass} instead.
23+
*
2324
* @author Javier Lopez <f12loalf@gmail.com>
2425
*/
25-
class SerializerPass implements CompilerPassInterface
26+
class SerializerPass extends BaseSerializerPass
2627
{
27-
use PriorityTaggedServiceTrait;
28-
29-
public function process(ContainerBuilder $container)
30-
{
31-
if (!$container->hasDefinition('serializer')) {
32-
return;
33-
}
34-
35-
// Looks for all the services tagged "serializer.normalizer" and adds them to the Serializer service
36-
$normalizers = $this->findAndSortTaggedServices('serializer.normalizer', $container);
37-
38-
if (empty($normalizers)) {
39-
throw new RuntimeException('You must tag at least one service as "serializer.normalizer" to use the Serializer service');
40-
}
41-
$container->getDefinition('serializer')->replaceArgument(0, $normalizers);
42-
43-
// Looks for all the services tagged "serializer.encoders" and adds them to the Serializer service
44-
$encoders = $this->findAndSortTaggedServices('serializer.encoder', $container);
45-
if (empty($encoders)) {
46-
throw new RuntimeException('You must tag at least one service as "serializer.encoder" to use the Serializer service');
47-
}
48-
$container->getDefinition('serializer')->replaceArgument(1, $encoders);
49-
}
5028
}

FrameworkBundle.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\CompilerDebugDumpPass;
3333
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TranslationExtractorPass;
3434
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TranslationDumperPass;
35-
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\SerializerPass;
3635
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\UnusedTagsPass;
3736
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ConfigCachePass;
3837
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ValidateWorkflowsPass;
3938
use Symfony\Component\Console\DependencyInjection\AddConsoleCommandPass;
39+
use Symfony\Component\Serializer\DependencyInjection\SerializerPass;
4040
use Symfony\Component\Debug\ErrorHandler;
4141
use Symfony\Component\DependencyInjection\ContainerBuilder;
4242
use Symfony\Component\DependencyInjection\Compiler\PassConfig;
@@ -93,7 +93,9 @@ public function build(ContainerBuilder $container)
9393
$container->addCompilerPass(new TranslationExtractorPass());
9494
$container->addCompilerPass(new TranslationDumperPass());
9595
$container->addCompilerPass(new FragmentRendererPass(), PassConfig::TYPE_AFTER_REMOVING);
96-
$container->addCompilerPass(new SerializerPass());
96+
if (class_exists(SerializerPass::class)) {
97+
$container->addCompilerPass(new SerializerPass());
98+
}
9799
$container->addCompilerPass(new PropertyInfoPass());
98100
$container->addCompilerPass(new ControllerArgumentValueResolverPass());
99101
$container->addCompilerPass(new CachePoolPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 32);

Tests/DependencyInjection/Compiler/SerializerPassTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
/**
1818
* Tests for the SerializerPass class.
1919
*
20+
* @group legacy
21+
*
2022
* @author Javier Lopez <f12loalf@gmail.com>
2123
*/
2224
class SerializerPassTest extends \PHPUnit_Framework_TestCase

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"symfony/process": "~2.8|~3.0",
4545
"symfony/security-core": "~3.2",
4646
"symfony/security-csrf": "~2.8|~3.0",
47-
"symfony/serializer": "~2.8|~3.0",
47+
"symfony/serializer": "~3.3",
4848
"symfony/translation": "~2.8|~3.0",
4949
"symfony/templating": "~2.8|~3.0",
5050
"symfony/validator": "~3.2",
@@ -57,7 +57,8 @@
5757
"conflict": {
5858
"phpdocumentor/reflection-docblock": "<3.0",
5959
"phpdocumentor/type-resolver": "<0.2.0",
60-
"symfony/console": "<3.3"
60+
"symfony/console": "<3.3",
61+
"symfony/serializer": "<3.3"
6162
},
6263
"suggest": {
6364
"ext-apcu": "For best performance of the system caches",

0 commit comments

Comments
 (0)