Merge branch '7.0' into 7.1

* 7.0:
  skip tests that do not work with ICU 71.1
  [DependencyInjection] Fix dumping containers with null-referenced services
  [Routing] Fix removing aliases pointing to removed route in RouteCollection::remove()
  [VarExporter] Fix lazy ghost trait when using nullsafe operator
  [Routing] Fix conflicting FQCN aliases with route name
  Fix legacy class palceholder definitions for static analysis

Author: xabbuh

src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php

@@ -15,6 +15,7 @@
 use Symfony\Component\Form\Exception\LogicException;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Intl\Intl;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
 
@@ -92,6 +93,10 @@ public function testSubmitFromSingleTextDateTime()
         // we test against "de_DE", so we need the full implementation
         IntlTestHelper::requireFullIntl($this, false);
 
+        if ('71.1' === Intl::getIcuVersion()) {
+            $this->markTestSkipped('Skipping test due to a bug in ICU 71.1.');
+        }
+
         \Locale::setDefault('de_DE');
 
         $form = $this->factory->create(static::TESTED_TYPE, null, [
@@ -114,6 +119,10 @@ public function testSubmitFromSingleTextDateTimeImmutable()
         // we test against "de_DE", so we need the full implementation
         IntlTestHelper::requireFullIntl($this, false);
 
+        if ('71.1' === Intl::getIcuVersion()) {
+            $this->markTestSkipped('Skipping test due to a bug in ICU 71.1.');
+        }
+
         \Locale::setDefault('de_DE');
 
         $form = $this->factory->create(static::TESTED_TYPE, null, [
@@ -137,6 +146,10 @@ public function testSubmitFromSingleTextString()
         // we test against "de_DE", so we need the full implementation
         IntlTestHelper::requireFullIntl($this, false);
 
+        if ('71.1' === Intl::getIcuVersion()) {
+            $this->markTestSkipped('Skipping test due to a bug in ICU 71.1.');
+        }
+
         \Locale::setDefault('de_DE');
 
         $form = $this->factory->create(static::TESTED_TYPE, null, [
@@ -159,6 +172,10 @@ public function testSubmitFromSingleTextTimestamp()
         // we test against "de_DE", so we need the full implementation
         IntlTestHelper::requireFullIntl($this, false);
 
+        if ('71.1' === Intl::getIcuVersion()) {
+            $this->markTestSkipped('Skipping test due to a bug in ICU 71.1.');
+        }
+
         \Locale::setDefault('de_DE');
 
         $form = $this->factory->create(static::TESTED_TYPE, null, [
@@ -183,6 +200,10 @@ public function testSubmitFromSingleTextRaw()
         // we test against "de_DE", so we need the full implementation
         IntlTestHelper::requireFullIntl($this, false);
 
+        if ('71.1' === Intl::getIcuVersion()) {
+            $this->markTestSkipped('Skipping test due to a bug in ICU 71.1.');
+        }
+
         \Locale::setDefault('de_DE');
 
         $form = $this->factory->create(static::TESTED_TYPE, null, [

src/Symfony/Component/Routing/Loader/AttributeClassLoader.php

@@ -101,7 +101,9 @@ public function load(mixed $class, string $type = null): RouteCollection
 
             if (1 === $collection->count() - \count($routeNamesBefore)) {
                 $newRouteName = current(array_diff(array_keys($collection->all()), $routeNamesBefore));
-                $collection->addAlias(sprintf('%s::%s', $class->name, $method->name), $newRouteName);
+                if ($newRouteName !== $aliasName = sprintf('%s::%s', $class->name, $method->name)) {
+                    $collection->addAlias($aliasName, $newRouteName);
+                }
             }
         }
         if (0 === $collection->count() && $class->hasMethod('__invoke')) {
@@ -112,8 +114,14 @@ public function load(mixed $class, string $type = null): RouteCollection
             }
         }
         if ($fqcnAlias && 1 === $collection->count()) {
-            $collection->addAlias($class->name, $invokeRouteName = key($collection->all()));
-            $collection->addAlias(sprintf('%s::__invoke', $class->name), $invokeRouteName);
+            $invokeRouteName = key($collection->all());
+            if ($invokeRouteName !== $class->name) {
+                $collection->addAlias($class->name, $invokeRouteName);
+            }
+
+            if ($invokeRouteName !== $aliasName = sprintf('%s::__invoke', $class->name)) {
+                $collection->addAlias($aliasName, $invokeRouteName);
+            }
         }
 
         return $collection;

src/Symfony/Component/Routing/RouteCollection.php

@@ -142,8 +142,15 @@ public function get(string $name): ?Route
      */
     public function remove(string|array $name): void
     {
-        foreach ((array) $name as $n) {
-            unset($this->routes[$n], $this->priorities[$n], $this->aliases[$n]);
+        $names = (array) $name;
+        foreach ($names as $n) {
+            unset($this->routes[$n], $this->priorities[$n]);
+        }
+
+        foreach ($this->aliases as $k => $alias) {
+            if (\in_array($alias->getId(), $names, true)) {
+                unset($this->aliases[$k]);
+            }
         }
     }
 

src/Symfony/Component/Routing/Tests/Fixtures/AnnotationFixtures/InvokableFQCNAliasConflictController.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures;
+
+use Symfony\Component\Routing\Attribute\Route;
+
+/**
+ * @Route("/foobarccc", name="Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\InvokableFQCNAliasConflictController")
+ */
+class InvokableFQCNAliasConflictController
+{
+    public function __invoke()
+    {
+    }
+}

src/Symfony/Component/Routing/Tests/Fixtures/AttributeFixtures/InvokableFQCNAliasConflictController.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AttributeFixtures;
+
+use Symfony\Component\Routing\Attribute\Route;
+
+#[Route(path: '/foobarccc', name: self::class)]
+class InvokableFQCNAliasConflictController
+{
+    public function __invoke()
+    {
+    }
+}

src/Symfony/Component/Routing/Tests/Loader/AttributeClassLoaderTestCase.php

@@ -99,6 +99,15 @@ public function testInvokableControllerLoader()
         $this->assertEquals(new Alias('lol'), $routes->getAlias('Symfony\Component\Routing\Tests\Fixtures\AttributeFixtures\InvokableController::__invoke'));
     }
 
+    public function testInvokableFQCNAliasConflictController()
+    {
+        $routes = $this->loader->load($this->getNamespace().'\InvokableFQCNAliasConflictController');
+        $this->assertCount(1, $routes);
+        $this->assertEquals('/foobarccc', $routes->get($this->getNamespace().'\InvokableFQCNAliasConflictController')->getPath());
+        $this->assertNull($routes->getAlias($this->getNamespace().'\InvokableFQCNAliasConflictController'));
+        $this->assertEquals(new Alias($this->getNamespace().'\InvokableFQCNAliasConflictController'), $routes->getAlias($this->getNamespace().'\InvokableFQCNAliasConflictController::__invoke'));
+    }
+
     public function testInvokableMethodControllerLoader()
     {
         $routes = $this->loader->load(InvokableMethodController::class);

src/Symfony/Component/Routing/Tests/RouteCollectionTest.php

@@ -225,11 +225,13 @@ public function testRemove()
         $collection1->add('bar', $bar = new Route('/bar'));
         $collection->addCollection($collection1);
         $collection->add('last', $last = new Route('/last'));
+        $collection->addAlias('ccc_my_custom_alias', 'foo');
 
         $collection->remove('foo');
         $this->assertSame(['bar' => $bar, 'last' => $last], $collection->all(), '->remove() can remove a single route');
         $collection->remove(['bar', 'last']);
         $this->assertSame([], $collection->all(), '->remove() accepts an array and can remove multiple routes at once');
+        $this->assertNull($collection->getAlias('ccc_my_custom_alias'));
     }
 
     public function testSetHost()

src/Symfony/Component/VarExporter/LazyGhostTrait.php

@@ -108,8 +108,9 @@ public function &__get($name): mixed
             if ($state && (null === $scope || isset($propertyScopes["\0$scope\0$name"]))) {
                 if (LazyObjectState::STATUS_INITIALIZED_FULL === $state->status) {
                     // Work around php/php-src#12695
-                    $property = $propertyScopes[null === $scope ? $name : "\0$scope\0$name"][3]
-                        ?? (Hydrator::$propertyScopes[$this::class] = Hydrator::getPropertyScopes($this::class))[3];
+                    $property = null === $scope ? $name : "\0$scope\0$name";
+                    $property = $propertyScopes[$property][3]
+                        ?? Hydrator::$propertyScopes[$this::class][$property][3] = new \ReflectionProperty($scope ?? $class, $name);
                 } else {
                     $property = null;
                 }

src/Symfony/Component/VarExporter/Tests/Fixtures/LazyGhost/ChildMagicClass.php

@@ -18,5 +18,14 @@ class ChildMagicClass extends MagicClass implements LazyObjectInterface
 {
     use LazyGhostTrait;
 
+    private const LAZY_OBJECT_PROPERTY_SCOPES = [
+        "\0".self::class."\0".'data' => [self::class, 'data', null],
+        "\0".self::class."\0".'lazyObjectState' => [self::class, 'lazyObjectState', null],
+        "\0".parent::class."\0".'data' => [parent::class, 'data', null],
+        'cloneCounter' => [self::class, 'cloneCounter', null],
+        'data' => [self::class, 'data', null],
+        'lazyObjectState' => [self::class, 'lazyObjectState', null],
+    ];
+
     private int $data = 123;
 }