[Serializer] Fix Serializer deprecations merge

alexandre-daubois · alexandre-daubois · commit 4639f4f3f408 · 2023-10-17T16:36:12.000+02:00
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -1858,9 +1858,9 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
 
         $serializerLoaders = [];
         if (isset($config['enable_attributes']) && $config['enable_attributes']) {
-            $annotationLoader = new Definition(AttributeLoader::class);
+            $attributeLoader = new Definition(AttributeLoader::class);
 
-            $serializerLoaders[] = $annotationLoader;
+            $serializerLoaders[] = $attributeLoader;
         }
 
         $fileRecorder = function ($extension, $path) use (&$serializerLoaders) {

Original file line number	Diff line number	Diff line change
`@@ -1858,9 +1858,9 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder`
`1858`	`1858`
`1859`	`1859`	`$serializerLoaders = [];`
`1860`	`1860`	`if (isset($config['enable_attributes']) && $config['enable_attributes']) {`
`1861`		`- $annotationLoader = new Definition(AttributeLoader::class);`
	`1861`	`+ $attributeLoader = new Definition(AttributeLoader::class);`
`1862`	`1862`
`1863`		`- $serializerLoaders[] = $annotationLoader;`
	`1863`	`+ $serializerLoaders[] = $attributeLoader;`
`1864`	`1864`	`}`
`1865`	`1865`
`1866`	`1866`	`$fileRecorder = function ($extension, $path) use (&$serializerLoaders) {`