Merge branch '5.4' into 6.0

* 5.4:
  Revert "minor symfony#47721 [Notifier] Use local copy of stella-maris/clock when testing (nicolas-grekas)"
  [Yaml] Minor: Update Inline parse phpdoc
  [FrameworkBundle] Fix deprecation when accessing a "container.private" service from the test container
  [DependencyInjection] Fix dumping inlined withers
  [HttpClient] Move Http clients data collecting at a late level
  [DependencyInjection] Fix support for named arguments on non-autowired services
  [FrameworkBundle] restore call to addGlobalIgnoredName
  Allow EmailValidator 4
  Fix detecting mapping with one line annotations

Author: nicolas-grekas

.github/workflows/package-tests.yml

@@ -21,7 +21,7 @@ jobs:
 
       - name: Find packages
         id: find-packages
-        run: echo "packages=$(php .github/get-modified-packages.php $(find src/Symfony -mindepth 2 -maxdepth 6 -type f -name composer.json -printf '%h\n' | jq -R -s -c 'split("\n")[:-1]') $(git diff --name-only origin/${{ github.base_ref }} HEAD | grep src/ | jq -R -s -c 'split("\n")[:-1]'))" >> $GITHUB_OUTPUT
+        run: echo "packages=$(php .github/get-modified-packages.php $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | jq -R -s -c 'split("\n")[:-1]') $(git diff --name-only origin/${{ github.base_ref }} HEAD | grep src/ | jq -R -s -c 'split("\n")[:-1]'))" >> $GITHUB_OUTPUT
 
       - name: Verify meta files are correct
         run: |

.github/workflows/unit-tests.yml

@@ -93,7 +93,7 @@ jobs:
             echo SYMFONY_DEPRECATIONS_HELPER=weak >> $GITHUB_ENV
             cp composer.json composer.json.orig
             echo -e '{\n"require":{'"$(grep phpunit-bridge composer.json)"'"php":"*"},"minimum-stability":"dev"}' > composer.json
-            php .github/build-packages.php HEAD^ $SYMFONY_VERSION $(find src/Symfony -mindepth 2 -maxdepth 6 -type f -name composer.json -printf '%h\n')
+            php .github/build-packages.php HEAD^ $SYMFONY_VERSION $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n')
             mv composer.json composer.json.phpunit
             mv composer.json.orig composer.json
           fi

composer.json

@@ -197,15 +197,6 @@
         {
             "type": "path",
             "url": "src/Symfony/Component/Runtime"
-        },
-        {
-            "type": "path",
-            "url": "src/Symfony/Component/Notifier/Bridge/Mercure/Tests/stella-maris-clock",
-            "options": {
-                "versions": {
-                    "stella-maris/clock": "0.1.x-dev"
-                }
-            }
         }
     ],
     "minimum-stability": "dev"

src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php

@@ -301,8 +301,8 @@ private function detectMappingType(string $directory, ContainerBuilder $containe
                 break;
             }
             if (
-                preg_match('/^ \* @.*'.$quotedMappingObjectName.'\b/m', $content) ||
-                preg_match('/^ \* @.*Embeddable\b/m', $content)
+                preg_match('/^(?: \*|\/\*\*) @.*'.$quotedMappingObjectName.'\b/m', $content) ||
+                preg_match('/^(?: \*|\/\*\*) @.*Embeddable\b/m', $content)
             ) {
                 $type = 'annotation';
                 break;

src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php

@@ -279,6 +279,7 @@ public function testUnrecognizedCacheDriverException()
     public function providerBundles()
     {
         yield ['AnnotationsBundle', 'annotation', '/Entity'];
+        yield ['AnnotationsOneLineBundle', 'annotation', '/Entity'];
         yield ['FullEmbeddableAnnotationsBundle', 'annotation', '/Entity'];
         yield ['AttributesBundle', 'attribute', '/Entity'];
         yield ['FullEmbeddableAttributesBundle', 'attribute', '/Entity'];

src/Symfony/Bridge/Doctrine/Tests/Fixtures/Bundles/AnnotationsOneLineBundle/AnnotationsOneLineBundle.php

@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Fixtures\Bundles\AnnotationsOneLineBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class AnnotationsOneLineBundle extends Bundle
+{
+}

src/Symfony/Bridge/Doctrine/Tests/Fixtures/Bundles/AnnotationsOneLineBundle/Entity/Person.php

@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Fixtures\Bundles\AnnotationsOneLineBundle\Entity;
+
+use Doctrine\ORM\Mapping\Column;
+use Doctrine\ORM\Mapping\Entity;
+use Doctrine\ORM\Mapping\Id;
+
+/** @Entity */
+class Person
+{
+    /** @Id @Column(type="integer") */
+    protected $id;
+
+    /** @Column(type="string") */
+    public $name;
+
+    public function __construct($id, $name)
+    {
+        $this->id = $id;
+        $this->name = $name;
+    }
+
+    public function __toString(): string
+    {
+        return (string) $this->name;
+    }
+}

src/Symfony/Bridge/Twig/composer.json

@@ -22,7 +22,7 @@
     },
     "require-dev": {
         "doctrine/annotations": "^1.12|^2",
-        "egulias/email-validator": "^2.1.10|^3",
+        "egulias/email-validator": "^2.1.10|^3|^4",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
         "symfony/asset": "^5.4|^6.0",
         "symfony/dependency-injection": "^5.4|^6.0",

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerRealRefPass.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
 
+use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -38,6 +39,16 @@ public function process(ContainerBuilder $container)
             }
         }
 
+        foreach ($container->getAliases() as $id => $target) {
+            while ($container->hasAlias($target = (string) $target)) {
+                $target = $container->getAlias($target);
+            }
+
+            if ($definitions[$target]->hasTag('container.private')) {
+                $privateServices[$id] = new ServiceClosureArgument(new Reference($target));
+            }
+        }
+
         $privateContainer->replaceArgument(0, $privateServices);
     }
 }

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -1569,11 +1569,14 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
 
         $loader->load('annotations.php');
 
+        // registerUniqueLoader exists since doctrine/annotations v1.6
         if (!method_exists(AnnotationRegistry::class, 'registerUniqueLoader')) {
+            // registerLoader exists only in doctrine/annotations v1
             if (method_exists(AnnotationRegistry::class, 'registerLoader')) {
                 $container->getDefinition('annotations.dummy_registry')
                     ->setMethodCalls([['registerLoader', ['class_exists']]]);
             } else {
+                // remove the dummy registry when doctrine/annotations v2 is used
                 $container->removeDefinition('annotations.dummy_registry');
             }
         }