symfony
diff --git a/‎.php-cs-fixer.dist.php
Lines changed: 8 additions & 12 deletions b/‎.php-cs-fixer.dist.php
Lines changed: 8 additions & 12 deletions
diff --git a/‎src/Symfony/Bridge/Doctrine/Tests/Fixtures/DummyManager.php
Lines changed: 69 additions & 0 deletions b/‎src/Symfony/Bridge/Doctrine/Tests/Fixtures/DummyManager.php
Lines changed: 69 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php
Lines changed: 14 additions & 8 deletions b/‎src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php
Lines changed: 14 additions & 8 deletions
diff --git a/‎src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityTest.php
Lines changed: 7 additions & 0 deletions b/‎src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityTest.php
Lines changed: 7 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Bridge/Twig/Extension/CodeExtension.php
Lines changed: 4 additions & 4 deletions b/‎src/Symfony/Bridge/Twig/Extension/CodeExtension.php
Lines changed: 4 additions & 4 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
Lines changed: 5 additions & 3 deletions b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
Lines changed: 5 additions & 3 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php
Lines changed: 0 additions & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AbstractWebTestCase.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AbstractWebTestCase.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SerializerTest.php
Lines changed: 43 additions & 25 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SerializerTest.php
Lines changed: 43 additions & 25 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php
Lines changed: 5 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php
Lines changed: 5 additions & 0 deletions
@@ -29,16 +29,17 @@
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'protected_to_private' => false,
-        'native_constant_invocation' => ['strict' => false],
         'no_superfluous_phpdoc_tags' => [
             'remove_inheritdoc' => true,
             'allow_unused_params' => true, // for future-ready params, to be replaced with https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7377
         ],
-        'nullable_type_declaration_for_default_null_value' => true,
         'header_comment' => ['header' => $fileHeaderComment],
+        // TODO: Remove once the "compiler_optimized" set includes "sprintf"
+        'native_function_invocation' => ['include' => ['@compiler_optimized', 'sprintf'], 'scope' => 'namespaced', 'strict' => true],
+        'nullable_type_declaration' => true,
+        'nullable_type_declaration_for_default_null_value' => true,
         'modernize_strpos' => true,
         'get_class_to_class_keyword' => true,
-        'nullable_type_declaration' => true,
     ])
     ->setRiskyAllowed(true)
     ->setFinder(
@@ -47,11 +48,6 @@
             ->append([__FILE__])
             ->notPath('#/Fixtures/#')
             ->exclude([
-                // directories containing files with content that is autogenerated by `var_export`, which breaks CS in output code
-                // fixture templates
-                'Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom',
-                // resource templates
-                'Symfony/Bundle/FrameworkBundle/Resources/views/Form',
                 // explicit trigger_error tests
                 'Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/',
                 'Symfony/Component/Intl/Resources/data/',
@@ -65,10 +61,6 @@
             ->notPath('#Symfony/Bridge/PhpUnit/.*Legacy#')
             // file content autogenerated by `var_export`
             ->notPath('Symfony/Component/Translation/Tests/Fixtures/resources.php')
-            // file content autogenerated by `VarExporter::export`
-            ->notPath('Symfony/Component/Serializer/Tests/Fixtures/serializer.class.metadata.php')
-            // test template
-            ->notPath('Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php')
             // explicit trigger_error tests
             ->notPath('Symfony/Component/ErrorHandler/Tests/DebugClassLoaderTest.php')
             // stop removing spaces on the end of the line in strings
@@ -79,6 +71,10 @@
             ->notPath('Symfony/Component/Cache/Traits/Redis6Proxy.php')
             ->notPath('Symfony/Component/Cache/Traits/RedisCluster5Proxy.php')
             ->notPath('Symfony/Component/Cache/Traits/RedisCluster6Proxy.php')
+            // svg
+            ->notPath('Symfony/Component/ErrorHandler/Resources/assets/images/symfony-ghost.svg.php')
+            // HTML templates
+            ->notPath('#Symfony/.*\.html\.php#')
     )
     ->setCacheFile('.php-cs-fixer.cache')
 ;
@@ -0,0 +1,69 @@
+<?php
+
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures;
+
+use Doctrine\Persistence\Mapping\ClassMetadata;
+use Doctrine\Persistence\Mapping\ClassMetadataFactory;
+use Doctrine\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectRepository;
+
+class DummyManager implements ObjectManager
+{
+    public $bar;
+
+    public function find($className, $id): ?object
+    {
+    }
+
+    public function persist($object): void
+    {
+    }
+
+    public function remove($object): void
+    {
+    }
+
+    public function merge($object)
+    {
+    }
+
+    public function clear($objectName = null): void
+    {
+    }
+
+    public function detach($object): void
+    {
+    }
+
+    public function refresh($object): void
+    {
+    }
+
+    public function flush(): void
+    {
+    }
+
+    public function getRepository($className): ObjectRepository
+    {
+    }
+
+    public function getClassMetadata($className): ClassMetadata
+    {
+    }
+
+    public function getMetadataFactory(): ClassMetadataFactory
+    {
+    }
+
+    public function initializeObject($obj): void
+    {
+    }
+
+    public function contains($object): bool
+    {
+    }
+
+    public function isUninitializedObject($value): bool
+    {
+    }
+}
@@ -11,7 +11,13 @@
 
 namespace Symfony\Bridge\Doctrine\Tests;
 
+use Doctrine\Persistence\ObjectManager;
 use PHPUnit\Framework\TestCase;
+use ProxyManager\Proxy\LazyLoadingInterface;
+use ProxyManager\Proxy\ValueHolderInterface;
+use Symfony\Bridge\Doctrine\ManagerRegistry;
+use Symfony\Bridge\Doctrine\Tests\Fixtures\DummyManager;
+use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
@@ -24,8 +30,8 @@ public static function setUpBeforeClass(): void
     {
         $container = new ContainerBuilder();
 
-        $container->register('foo', \stdClass::class)->setPublic(true);
-        $container->getDefinition('foo')->setLazy(true)->addTag('proxy', ['interface' => \stdClass::class]);
+        $container->register('foo', DummyManager::class)->setPublic(true);
+        $container->getDefinition('foo')->setLazy(true)->addTag('proxy', ['interface' => ObjectManager::class]);
         $container->compile();
 
         $dumper = new PhpDumper($container);
@@ -46,8 +52,8 @@ public function testResetService()
         $registry->resetManager();
 
         $this->assertSame($foo, $container->get('foo'));
-        $this->assertInstanceOf(\stdClass::class, $foo);
-        $this->assertFalse(property_exists($foo, 'bar'));
+        $this->assertInstanceOf(ObjectManager::class, $foo);
+        $this->assertFalse(isset($foo->bar));
     }
 
     /**
@@ -79,7 +85,7 @@ public function testResetServiceWillNotNestFurtherLazyServicesWithinEachOther()
 
         $service = $container->get('foo');
 
-        self::assertInstanceOf(\stdClass::class, $service);
+        self::assertInstanceOf(ObjectManager::class, $service);
         self::assertInstanceOf(LazyObjectInterface::class, $service);
         self::assertFalse($service->isLazyObjectInitialized());
 
@@ -92,7 +98,7 @@ public function testResetServiceWillNotNestFurtherLazyServicesWithinEachOther()
         $service->initializeLazyObject();
 
         $wrappedValue = $service->initializeLazyObject();
-        self::assertInstanceOf(\stdClass::class, $wrappedValue);
+        self::assertInstanceOf(DummyManager::class, $wrappedValue);
         self::assertNotInstanceOf(LazyObjectInterface::class, $wrappedValue);
     }
 
@@ -104,10 +110,10 @@ private function dumpLazyServiceDoctrineBridgeContainerAsFiles()
 
         $container = new ContainerBuilder();
 
-        $container->register('foo', \stdClass::class)
+        $container->register('foo', DummyManager::class)
             ->setPublic(true)
             ->setLazy(true)
-            ->addTag('proxy', ['interface' => \stdClass::class]);
+            ->addTag('proxy', ['interface' => ObjectManager::class]);
         $container->compile();
 
         $fileSystem = new Filesystem();
 
@@ -60,6 +60,13 @@ public function testAttributeWithGroupsAndPaylod()
         self::assertSame('some attached data', $constraint->payload);
         self::assertSame(['some_group'], $constraint->groups);
     }
+
+    public function testValueOptionConfiguresFields()
+    {
+        $constraint = new UniqueEntity(['value' => 'email']);
+
+        $this->assertSame('email', $constraint->fields);
+    }
 }
 
 #[UniqueEntity(['email'], message: 'myMessage')]
 
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bridge\PhpUnit;
 
+use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\TestResult;
 use PHPUnit\Runner\ErrorHandler;
 use PHPUnit\Util\Error\Handler;
 
@@ -128,10 +128,10 @@ public function fileExcerpt(string $file, int $line, int $srcContext = 3): ?stri
             if (\PHP_VERSION_ID >= 80300) {
                 // remove main pre/code tags
                 $code = preg_replace('#^<pre.*?>\s*<code.*?>(.*)</code>\s*</pre>#s', '\\1', $code);
-                // split multiline code tags
-                $code = preg_replace_callback('#<code ([^>]++)>((?:[^<]*+\\n)++[^<]*+)</code>#', fn ($m) => "<code $m[1]>".str_replace("\n", "</code>\n<code $m[1]>", $m[2]).'</code>', $code);
-                // Convert spaces to html entities to preserve indentation when rendered
-                $code = str_replace(' ', '&nbsp;', $code);
+                // split multiline span tags
+                $code = preg_replace_callback('#<span ([^>]++)>((?:[^<\\n]*+\\n)++[^<]*+)</span>#', function ($m) {
+                    return "<span $m[1]>".str_replace("\n", "</span>\n<span $m[1]>", $m[2]).'</span>';
+                }, $code);
                 $content = explode("\n", $code);
             } else {
                 // remove main code/span tags
 
@@ -2001,18 +2001,20 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
         }
 
         $arguments = $container->getDefinition('serializer.normalizer.object')->getArguments();
-        $context = [];
+        $context = $arguments[6] ?? $defaultContext;
 
         if (isset($config['circular_reference_handler']) && $config['circular_reference_handler']) {
-            $context += ($arguments[6] ?? $defaultContext) + ['circular_reference_handler' => new Reference($config['circular_reference_handler'])];
+            $context += ['circular_reference_handler' => new Reference($config['circular_reference_handler'])];
             $container->getDefinition('serializer.normalizer.object')->setArgument(5, null);
         }
 
         if ($config['max_depth_handler'] ?? false) {
-            $context += ($arguments[6] ?? $defaultContext) + ['max_depth_handler' => new Reference($config['max_depth_handler'])];
+            $context += ['max_depth_handler' => new Reference($config['max_depth_handler'])];
         }
 
         $container->getDefinition('serializer.normalizer.object')->setArgument(6, $context);
+
+        $container->getDefinition('serializer.normalizer.property')->setArgument(5, $defaultContext);
     }
 
     private function registerPropertyInfoConfiguration(ContainerBuilder $container, PhpFileLoader $loader): void
 
@@ -144,7 +144,6 @@
                 service('property_info')->ignoreOnInvalid(),
                 service('serializer.mapping.class_discriminator_resolver')->ignoreOnInvalid(),
                 null,
-                [],
             ])
 
         ->alias(PropertyNormalizer::class, 'serializer.normalizer.property')
 
@@ -53,7 +53,7 @@ protected static function getKernelClass(): string
 
     protected static function createKernel(array $options = []): KernelInterface
     {
-        $class = self::getKernelClass();
+        $class = static::getKernelClass();
 
         if (!isset($options['test_case'])) {
             throw new \InvalidArgumentException('The option "test_case" must be set.');
 
@@ -12,6 +12,9 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
 use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\TranslatableBackedEnum;
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\app\AppKernel;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
@@ -35,39 +38,54 @@ public function testDeserializeArrayOfObject()
         $this->assertEquals($expected, $result);
     }
 
-    /**
-     * @dataProvider provideNormalizersAndEncodersWithDefaultContextOption
-     */
-    public function testNormalizersAndEncodersUseDefaultContextConfigOption(string $normalizerId)
+    public function testNormalizersAndEncodersUseDefaultContextConfigOption()
     {
-        static::bootKernel(['test_case' => 'Serializer']);
+        /** @var SerializerKernel $kernel */
+        $kernel = static::bootKernel(['test_case' => 'Serializer', 'root_config' => 'default_context.yaml']);
 
-        $normalizer = static::getContainer()->get($normalizerId);
+        foreach ($kernel->normalizersAndEncoders as $normalizerOrEncoderId) {
+            $normalizerOrEncoder = static::getContainer()->get($normalizerOrEncoderId);
 
-        $reflectionObject = new \ReflectionObject($normalizer);
-        $property = $reflectionObject->getProperty('defaultContext');
+            $reflectionObject = new \ReflectionObject($normalizerOrEncoder);
+            $property = $reflectionObject->getProperty('defaultContext');
 
-        $defaultContext = $property->getValue($normalizer);
+            $defaultContext = $property->getValue($normalizerOrEncoder);
 
-        self::assertArrayHasKey('fake_context_option', $defaultContext);
-        self::assertEquals('foo', $defaultContext['fake_context_option']);
+            self::assertArrayHasKey('fake_context_option', $defaultContext);
+            self::assertEquals('foo', $defaultContext['fake_context_option']);
+        }
     }
 
-    public static function provideNormalizersAndEncodersWithDefaultContextOption(): array
+    protected static function getKernelClass(): string
+    {
+        return SerializerKernel::class;
+    }
+}
+
+class SerializerKernel extends AppKernel implements CompilerPassInterface
+{
+    public $normalizersAndEncoders = [
+        'serializer.normalizer.property.alias', // Special case as this normalizer isn't tagged
+    ];
+
+    public function process(ContainerBuilder $container)
     {
-        return [
-            ['serializer.normalizer.constraint_violation_list.alias'],
-            ['serializer.normalizer.dateinterval.alias'],
-            ['serializer.normalizer.datetime.alias'],
-            ['serializer.normalizer.json_serializable.alias'],
-            ['serializer.normalizer.problem.alias'],
-            ['serializer.normalizer.uid.alias'],
-            ['serializer.normalizer.translatable.alias'],
-            ['serializer.normalizer.object.alias'],
-            ['serializer.encoder.xml.alias'],
-            ['serializer.encoder.yaml.alias'],
-            ['serializer.encoder.csv.alias'],
-        ];
+        $services = array_merge(
+            $container->findTaggedServiceIds('serializer.normalizer'),
+            $container->findTaggedServiceIds('serializer.encoder')
+        );
+        foreach ($services as $serviceId => $attributes) {
+            $class = $container->getDefinition($serviceId)->getClass();
+            if (null === $reflectionConstructor = (new \ReflectionClass($class))->getConstructor()) {
+                continue;
+            }
+            foreach ($reflectionConstructor->getParameters() as $reflectionParam) {
+                if ('array $defaultContext' === $reflectionParam->getType()->getName().' $'.$reflectionParam->getName()) {
+                    $this->normalizersAndEncoders[] = $serviceId.'.alias';
+                    break;
+                }
+            }
+        }
     }
 
     public function testSerializeTranslatableBackedEnum()
 
@@ -49,6 +49,11 @@ public function __construct($varDir, $testCase, $rootConfig, $environment, $debu
         parent::__construct($environment, $debug);
     }
 
+    protected function getContainerClass(): string
+    {
+        return parent::getContainerClass().substr(md5($this->rootConfig), -16);
+    }
+
     public function registerBundles(): iterable
     {
         if (!file_exists($filename = $this->getProjectDir().'/'.$this->testCase.'/bundles.php')) {