Merge branch '6.3' into 6.4

derrabus · derrabus · commit d820d504ffc7 · 2023-11-30T11:32:10.000+01:00
* 6.3:
  [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
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -258,6 +258,7 @@ public function dump(array $options = []): string|array
 <?php
 
 use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 
 /*{$this->docStar}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt
@@ -13,6 +13,7 @@ return [
 namespace Container%s;
 
 use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 
 /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
@@ -23,6 +23,7 @@ return [
 namespace Container%s;
 
 use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 
 /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters_as_files.txt
@@ -5,6 +5,7 @@ Array
 namespace Container%s;
 
 use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 
 /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt
@@ -5,6 +5,7 @@ Array
 namespace Container%s;
 
 use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 
 /**
diff --git a/src/Symfony/Component/Routing/RouteCollection.php b/src/Symfony/Component/Routing/RouteCollection.php
@@ -147,8 +147,15 @@ public function get(string $name): ?Route
      */
     public function remove(string|array $name)
     {
-        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]);
+            }
         }
     }
 
diff --git a/src/Symfony/Component/Routing/Tests/RouteCollectionTest.php b/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()
diff --git a/src/Symfony/Component/VarExporter/LazyGhostTrait.php b/src/Symfony/Component/VarExporter/LazyGhostTrait.php
@@ -166,8 +166,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;
                 }
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/LazyGhost/ChildMagicClass.php b/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;
 }

Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,15 @@ public function get(string $name): ?Route`
`147`	`147`	`*/`
`148`	`148`	`public function remove(string\|array $name)`
`149`	`149`	`{`
`150`		`- foreach ((array) $name as $n) {`
`151`		`- unset($this->routes[$n], $this->priorities[$n], $this->aliases[$n]);`
	`150`	`+ $names = (array) $name;`
	`151`	`+ foreach ($names as $n) {`
	`152`	`+ unset($this->routes[$n], $this->priorities[$n]);`
	`153`	`+ }`
	`154`	`+`
	`155`	`+ foreach ($this->aliases as $k => $alias) {`
	`156`	`+ if (\in_array($alias->getId(), $names, true)) {`
	`157`	`+ unset($this->aliases[$k]);`
	`158`	`+ }`
`152`	`159`	`}`
`153`	`160`	`}`
`154`	`161`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,14 @@ class ChildMagicClass extends MagicClass implements LazyObjectInterface`
`18`	`18`	`{`
`19`	`19`	`use LazyGhostTrait;`
`20`	`20`
	`21`	`+ private const LAZY_OBJECT_PROPERTY_SCOPES = [`
	`22`	`+ "\0".self::class."\0".'data' => [self::class, 'data', null],`
	`23`	`+ "\0".self::class."\0".'lazyObjectState' => [self::class, 'lazyObjectState', null],`
	`24`	`+ "\0".parent::class."\0".'data' => [parent::class, 'data', null],`
	`25`	`+ 'cloneCounter' => [self::class, 'cloneCounter', null],`
	`26`	`+ 'data' => [self::class, 'data', null],`
	`27`	`+ 'lazyObjectState' => [self::class, 'lazyObjectState', null],`
	`28`	`+ ];`
	`29`	`+`
`21`	`30`	`private int $data = 123;`
`22`	`31`	`}`