Merge branch '5.4' into 6.0

* 5.4:
  Add missing files from 5.3
  Remove unneeded files
  Tweak bug report template
  Prevent infinite nesting of lazy `ObjectManager` instances when `ObjectManager` is reset
  [DependencyInjection] Skip parameter attribute configurators in AttributeAutoconfigurationPass if we can't get the constructor reflector
  [HttpKernel] fix sending Vary: Accept-Language when appropriate

Author: fabpot

.github/ISSUE_TEMPLATE/1_Bug_report.md

@@ -14,23 +14,29 @@ body:
       id: description
       attributes:
           label: Description
-          description: A clear and consise description of the problem
+          description: A clear and concise description of the problem
       validations:
           required: true
     - type: textarea
       id: how-to-reproduce
       attributes:
           label: How to reproduce
           description: |
-              Code and/or config needed to reproduce the problem.
-              If it's a complex bug, create a "bug reproducer" as explained in https://symfony.com/doc/current/contributing/code/reproducer.html
+            ⚠️  This is the most important part of the report ⚠️
+            Without a way to easily reproduce your issue, there is little chance we will be able to help you and work on a fix.
+            Please, take the time to show us some code and/or config that is needed for others to reproduce the problem easily.
+            Most of the time, creating a "bug reproducer" as explained in the URL below is the best way to help us
+            and increases the chances someone will have a look at it:
+            https://symfony.com/doc/current/contributing/code/reproducer.html
       validations:
           required: true
     - type: textarea
       id: possible-solution
       attributes:
           label: Possible Solution
-          description: "Optional: only if you have suggestions on a fix/reason for the bug"
+          description: |
+            Optional: only if you have suggestions on a fix/reason for the bug
+            Don't hesitate to create a pull request with your solution, it helps get faster feedback.
     - type: textarea
       id: additional-context
       attributes:

.github/ISSUE_TEMPLATE/1_Bug_report.yaml

@@ -55,7 +55,7 @@ function (&$wrappedInstance, LazyLoadingInterface $manager) use ($name) {
                     $name = $this->aliases[$name];
                 }
                 if (isset($this->fileMap[$name])) {
-                    $wrappedInstance = $this->load($this->fileMap[$name]);
+                    $wrappedInstance = $this->load($this->fileMap[$name], false);
                 } else {
                     $wrappedInstance = $this->{$this->methodMap[$name]}(false);
                 }

.github/ISSUE_TEMPLATE/2_Feature_request.md

@@ -12,8 +12,15 @@
 namespace Symfony\Bridge\Doctrine\Tests;
 
 use PHPUnit\Framework\TestCase;
+use ProxyManager\Proxy\LazyLoadingInterface;
+use ProxyManager\Proxy\ValueHolderInterface;
 use Symfony\Bridge\Doctrine\ManagerRegistry;
+use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
 use Symfony\Bridge\ProxyManager\Tests\LazyProxy\Dumper\PhpDumperTest;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
+use Symfony\Component\Filesystem\Filesystem;
 
 class ManagerRegistryTest extends TestCase
 {
@@ -39,6 +46,92 @@ public function testResetService()
         $this->assertSame($foo, $container->get('foo'));
         $this->assertObjectNotHasAttribute('bar', $foo);
     }
+
+    /**
+     * When performing an entity manager lazy service reset, the reset operations may re-use the container
+     * to create a "fresh" service: when doing so, it can happen that the "fresh" service is itself a proxy.
+     *
+     * Because of that, the proxy will be populated with a wrapped value that is itself a proxy: repeating
+     * the reset operation keeps increasing this nesting until the application eventually runs into stack
+     * overflow or memory overflow operations, which can happen for long-running processes that rely on
+     * services that are reset very often.
+     */
+    public function testResetServiceWillNotNestFurtherLazyServicesWithinEachOther()
+    {
+        // This test scenario only applies to containers composed as a set of generated sources
+        $this->dumpLazyServiceProjectAsFilesServiceContainer();
+
+        /** @var ContainerInterface $container */
+        $container = new \LazyServiceProjectAsFilesServiceContainer();
+
+        $registry = new TestManagerRegistry(
+            'irrelevant',
+            [],
+            ['defaultManager' => 'foo'],
+            'irrelevant',
+            'defaultManager',
+            'irrelevant'
+        );
+        $registry->setTestContainer($container);
+
+        $service = $container->get('foo');
+
+        self::assertInstanceOf(\stdClass::class, $service);
+        self::assertInstanceOf(LazyLoadingInterface::class, $service);
+        self::assertInstanceOf(ValueHolderInterface::class, $service);
+        self::assertFalse($service->isProxyInitialized());
+
+        $service->initializeProxy();
+
+        self::assertTrue($container->initialized('foo'));
+        self::assertTrue($service->isProxyInitialized());
+
+        $registry->resetManager();
+        $service->initializeProxy();
+
+        $wrappedValue = $service->getWrappedValueHolderValue();
+        self::assertInstanceOf(\stdClass::class, $wrappedValue);
+        self::assertNotInstanceOf(LazyLoadingInterface::class, $wrappedValue);
+        self::assertNotInstanceOf(ValueHolderInterface::class, $wrappedValue);
+    }
+
+    /** @return void */
+    private function dumpLazyServiceProjectAsFilesServiceContainer()
+    {
+        if (class_exists(\LazyServiceProjectAsFilesServiceContainer::class, false)) {
+            return;
+        }
+
+        $container = new ContainerBuilder();
+
+        $container->register('foo', \stdClass::class)
+            ->setPublic(true)
+            ->setLazy(true);
+        $container->compile();
+
+        $fileSystem = new Filesystem();
+
+        $temporaryPath = $fileSystem->tempnam(sys_get_temp_dir(), 'symfonyManagerRegistryTest');
+        $fileSystem->remove($temporaryPath);
+        $fileSystem->mkdir($temporaryPath);
+
+        $dumper = new PhpDumper($container);
+
+        $dumper->setProxyDumper(new ProxyDumper());
+        $containerFiles = $dumper->dump([
+            'class' => 'LazyServiceProjectAsFilesServiceContainer',
+            'as_files' => true,
+        ]);
+
+        array_walk(
+            $containerFiles,
+            static function (string $containerSources, string $fileName) use ($temporaryPath): void {
+                (new Filesystem())->dumpFile($temporaryPath.'/'.$fileName, $containerSources);
+            }
+        );
+
+        require $temporaryPath.'/LazyServiceProjectAsFilesServiceContainer.php';
+    }
 }
 
 class TestManagerRegistry extends ManagerRegistry

src/Symfony/Bridge/Doctrine/ManagerRegistry.php

@@ -15,6 +15,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 
 /**
  * @author Alexander M. Turek <[email protected]>
@@ -99,11 +100,19 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
             }
         }
 
-        if ($this->parameterAttributeConfigurators && $constructorReflector = $this->getConstructor($value, false)) {
-            foreach ($constructorReflector->getParameters() as $parameterReflector) {
-                foreach ($parameterReflector->getAttributes() as $attribute) {
-                    if ($configurator = $this->parameterAttributeConfigurators[$attribute->getName()] ?? null) {
-                        $configurator($conditionals, $attribute->newInstance(), $parameterReflector);
+        if ($this->parameterAttributeConfigurators) {
+            try {
+                $constructorReflector = $this->getConstructor($value, false);
+            } catch (RuntimeException $e) {
+                $constructorReflector = null;
+            }
+
+            if ($constructorReflector) {
+                foreach ($constructorReflector->getParameters() as $parameterReflector) {
+                    foreach ($parameterReflector->getAttributes() as $attribute) {
+                        if ($configurator = $this->parameterAttributeConfigurators[$attribute->getName()] ?? null) {
+                            $configurator($conditionals, $attribute->newInstance(), $parameterReflector);
+                        }
                     }
                 }
             }

src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php

@@ -932,6 +932,11 @@ static function (ChildDefinition $definition, CustomAnyAttribute $attribute, \Re
             ->setPublic(true)
             ->setAutoconfigured(true);
 
+        $container->register('failing_factory', \stdClass::class);
+        $container->register('ccc', TaggedService4::class)
+            ->setFactory([new Reference('failing_factory'), 'create'])
+            ->setAutoconfigured(true);
+
         $collector = new TagCollector();
         $container->addCompilerPass($collector);
 
@@ -952,6 +957,17 @@ static function (ChildDefinition $definition, CustomAnyAttribute $attribute, \Re
                 ['property' => 'name'],
                 ['someAttribute' => 'on name', 'priority' => 0, 'property' => 'name'],
             ],
+            'ccc' => [
+                ['class' => TaggedService4::class],
+                ['method' => 'fooAction'],
+                ['someAttribute' => 'on fooAction', 'priority' => 0, 'method' => 'fooAction'],
+                ['parameter' => 'param1'],
+                ['someAttribute' => 'on param1 in fooAction', 'priority' => 0, 'parameter' => 'param1'],
+                ['method' => 'barAction'],
+                ['someAttribute' => 'on barAction', 'priority' => 0, 'method' => 'barAction'],
+                ['property' => 'name'],
+                ['someAttribute' => 'on name', 'priority' => 0, 'property' => 'name'],
+            ],
         ], $collector->collectedTags);
     }
 

src/Symfony/Component/DependencyInjection/Compiler/AttributeAutoconfigurationPass.php

@@ -70,6 +70,7 @@ private function setLocale(Request $request)
             $request->setLocale($locale);
         } elseif ($this->useAcceptLanguageHeader && $this->enabledLocales && ($preferredLanguage = $request->getPreferredLanguage($this->enabledLocales))) {
             $request->setLocale($preferredLanguage);
+            $request->attributes->set('_vary_by_language', true);
         }
     }
 

src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php

@@ -50,6 +50,9 @@ public function onKernelResponse(ResponseEvent $event)
 
         if ($this->addContentLanguageHeader && !$response->isInformational() && !$response->isEmpty() && !$response->headers->has('Content-Language')) {
             $response->headers->set('Content-Language', $event->getRequest()->getLocale());
+        }
+
+        if ($event->getRequest()->attributes->get('_vary_by_language')) {
             $response->setVary('Accept-Language', false);
         }