Feb 26, 2024 · Feb 17, 2024 · Feb 26, 2024
diff --git a/...mfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/...mfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php

        $parameterBag = $container->getParameterBag();
        $controllers = [];
        $controllerClasses = [];

        $publicAliases = [];
        foreach ($container->getAliases() as $id => $alias) {
                throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
            }

            $controllerClasses[] = $class;

            // get regular public methods
            $methods = [];
            $arguments = [];
        }

        $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/...onent/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/...onent/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
        $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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -45,6 +45,7 @@ public function process(ContainerBuilder $container)

		$parameterBag = $container->getParameterBag();
		$controllers = [];
		$controllerClasses = [];

		$publicAliases = [];
		foreach ($container->getAliases() as $id => $alias) {
Expand DownExpand Up		@@ -74,6 +75,8 @@ public function process(ContainerBuilder $container)
		throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
		}

		$controllerClasses[] = $class;

		// get regular public methods
		$methods = [];
		$arguments = [];
Expand DownExpand Up		@@ -227,5 +230,10 @@ public function process(ContainerBuilder $container)
		}

		$container->setAlias('argument_resolver.controller_locator', (string) $controllerLocatorRef);

		if ($container->hasDefinition('controller_resolver')) {
		$container->getDefinition('controller_resolver')
		->addMethodCall('allowControllers', [array_unique($controllerClasses)]);
		}
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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
Expand Down