Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit 27760c5aaaba · 2024-02-26T11:35:24.000+01:00
* 6.4:
  [HttpKernel] Fix deps=low
  [HttpKernel] Allow tagged controllers in ControllerResolver
  bugfix php jit issue with ternary operator
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
@@ -42,6 +42,7 @@ public function process(ContainerBuilder $container): void
 
         $parameterBag = $container->getParameterBag();
         $controllers = [];
+        $controllerClasses = [];
 
         $publicAliases = [];
         foreach ($container->getAliases() as $id => $alias) {
@@ -71,6 +72,8 @@ public function process(ContainerBuilder $container): void
                 throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
             }
 
+            $controllerClasses[] = $class;
+
             // get regular public methods
             $methods = [];
             $arguments = [];
@@ -224,5 +227,10 @@ public function process(ContainerBuilder $container): void
         }
 
         $container->setAlias('argument_resolver.controller_locator', (string) $controllerLocatorRef);
+
+        if ($container->hasDefinition('controller_resolver')) {
+            $container->getDefinition('controller_resolver')
+                ->addMethodCall('allowControllers', [array_unique($controllerClasses)]);
+        }
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
@@ -557,6 +557,30 @@ public function testTaggedIteratorAndTaggedLocatorAttributes()
         $this->assertTrue($argLocator->has('foo'));
         $this->assertSame('bar', $argLocator->get('foo'));
     }
+
+    public function testTaggedControllersAreRegisteredInControllerResolver()
+    {
+        $container = new ContainerBuilder();
+        $container->register('argument_resolver.service')->addArgument([]);
+        $controllerResolver = $container->register('controller_resolver');
+
+        $container->register('foo', RegisterTestController::class)
+            ->addTag('controller.service_arguments')
+        ;
+
+        // duplicates should be removed
+        $container->register('bar', RegisterTestController::class)
+            ->addTag('controller.service_arguments')
+        ;
+
+        // services with no tag should be ignored
+        $container->register('baz', ControllerDummy::class);
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+
+        $this->assertSame([['allowControllers', [[RegisterTestController::class]]]], $controllerResolver->getMethodCalls());
+    }
 }
 
 class RegisterTestController
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
@@ -37,7 +37,7 @@
         "symfony/process": "^6.4|^7.0",
         "symfony/property-access": "^6.4|^7.0",
         "symfony/routing": "^6.4|^7.0",
-        "symfony/serializer": "^6.4|^7.0",
+        "symfony/serializer": "^6.4.4|^7.0.4",
         "symfony/stopwatch": "^6.4|^7.0",
         "symfony/translation": "^6.4|^7.0",
         "symfony/translation-contracts": "^2.5|^3",
diff --git a/src/Symfony/Component/VarExporter/Internal/Hydrator.php b/src/Symfony/Component/VarExporter/Internal/Hydrator.php
@@ -262,10 +262,19 @@ public static function getPropertyScopes($class): array
             $name = $property->name;
 
             if (\ReflectionProperty::IS_PRIVATE & $flags) {
-                $propertyScopes["\0$class\0$name"] = $propertyScopes[$name] = [$class, $name, $flags & \ReflectionProperty::IS_READONLY ? $class : null, $property];
+                $readonlyScope = null;
+                if ($flags & \ReflectionProperty::IS_READONLY) {
+                    $readonlyScope = $class;
+                }
+                $propertyScopes["\0$class\0$name"] = $propertyScopes[$name] = [$class, $name, $readonlyScope, $property];
+
                 continue;
             }
-            $propertyScopes[$name] = [$class, $name, $flags & \ReflectionProperty::IS_READONLY ? $property->class : null, $property];
+            $readonlyScope = null;
+            if ($flags & \ReflectionProperty::IS_READONLY) {
+                $readonlyScope = $property->class;
+            }
+            $propertyScopes[$name] = [$class, $name, $readonlyScope, $property];
 
             if (\ReflectionProperty::IS_PROTECTED & $flags) {
                 $propertyScopes["\0*\0$name"] = $propertyScopes[$name];

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ public function process(ContainerBuilder $container): void`
`42`	`42`
`43`	`43`	`$parameterBag = $container->getParameterBag();`
`44`	`44`	`$controllers = [];`
	`45`	`+ $controllerClasses = [];`
`45`	`46`
`46`	`47`	`$publicAliases = [];`
`47`	`48`	`foreach ($container->getAliases() as $id => $alias) {`
`@@ -71,6 +72,8 @@ public function process(ContainerBuilder $container): void`
`71`	`72`	`throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));`
`72`	`73`	`}`
`73`	`74`
	`75`	`+ $controllerClasses[] = $class;`
	`76`	`+`
`74`	`77`	`// get regular public methods`
`75`	`78`	`$methods = [];`
`76`	`79`	`$arguments = [];`
`@@ -224,5 +227,10 @@ public function process(ContainerBuilder $container): void`
`224`	`227`	`}`
`225`	`228`
`226`	`229`	`$container->setAlias('argument_resolver.controller_locator', (string) $controllerLocatorRef);`
	`230`	`+`
	`231`	`+ if ($container->hasDefinition('controller_resolver')) {`
	`232`	`+ $container->getDefinition('controller_resolver')`
	`233`	`+ ->addMethodCall('allowControllers', [array_unique($controllerClasses)]);`
	`234`	`+ }`
`227`	`235`	`}`
`228`	`236`	`}`