Skip to content

Commit 82d40ec

Browse files
committed
Merge branch '6.1' into 6.2
* 6.1: [Console] Fix `Helper::removeDecoration` hyperlink bug Guard scripts from being run in non-CLI contexts Guard scripts from being run in non-CLI contexts [Serializer] fixed traceable decoration priorities a readonly property must not be reported as being writable
2 parents 3477931 + 0c5d510 commit 82d40ec

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

DependencyInjection/SerializerPass.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function process(ContainerBuilder $container)
4444
if ($container->getParameter('kernel.debug') && $container->hasDefinition('serializer.data_collector')) {
4545
foreach (array_keys($normalizers) as $normalizer) {
4646
$container->register('debug.'.$normalizer, TraceableNormalizer::class)
47-
->setDecoratedService($normalizer, null, 255)
47+
->setDecoratedService($normalizer)
4848
->setArguments([new Reference('debug.'.$normalizer.'.inner'), new Reference('serializer.data_collector')]);
4949
}
5050
}
@@ -59,7 +59,7 @@ public function process(ContainerBuilder $container)
5959
if ($container->getParameter('kernel.debug') && $container->hasDefinition('serializer.data_collector')) {
6060
foreach (array_keys($encoders) as $encoder) {
6161
$container->register('debug.'.$encoder, TraceableEncoder::class)
62-
->setDecoratedService($encoder, null, 255)
62+
->setDecoratedService($encoder)
6363
->setArguments([new Reference('debug.'.$encoder.'.inner'), new Reference('serializer.data_collector')]);
6464
}
6565
}

Tests/DependencyInjection/SerializerPassTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,12 @@ public function testNormalizersAndEncodersAreDecoredAndOrderedWhenCollectingData
108108
$traceableEncoderDefinition = $container->getDefinition('debug.e');
109109

110110
$this->assertEquals(TraceableNormalizer::class, $traceableNormalizerDefinition->getClass());
111-
$this->assertEquals(['n', null, 255], $traceableNormalizerDefinition->getDecoratedService());
111+
$this->assertEquals(['n', null, 0], $traceableNormalizerDefinition->getDecoratedService());
112112
$this->assertEquals(new Reference('debug.n.inner'), $traceableNormalizerDefinition->getArgument(0));
113113
$this->assertEquals(new Reference('serializer.data_collector'), $traceableNormalizerDefinition->getArgument(1));
114114

115115
$this->assertEquals(TraceableEncoder::class, $traceableEncoderDefinition->getClass());
116-
$this->assertEquals(['e', null, 255], $traceableEncoderDefinition->getDecoratedService());
116+
$this->assertEquals(['e', null, 0], $traceableEncoderDefinition->getDecoratedService());
117117
$this->assertEquals(new Reference('debug.e.inner'), $traceableEncoderDefinition->getArgument(0));
118118
$this->assertEquals(new Reference('serializer.data_collector'), $traceableEncoderDefinition->getArgument(1));
119119
}

0 commit comments

Comments
 (0)