bug #28404 [Controller][ServiceValueResolver] Making method access case insensitive (nicoweb)

nicolas-grekas · nicolas-grekas · commit be05bbf4b721 · 2018-09-09T11:18:43.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [Controller][ServiceValueResolver] Making method access case insensitive | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #28254 | License | MIT | Doc PR | - Fix #28254 by making the method access insensitive in `ServiceValueResolver`. Commits ------- cc6f827 [Controller][ServiceValueResolver] Making method access case insensitive
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/ServiceValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/ServiceValueResolver.php
@@ -47,6 +47,10 @@ public function supports(Request $request, ArgumentMetadata $argument)
             $controller = ltrim($controller, '\\');
         }
 
+        if (!$this->container->has($controller) && false !== $i = strrpos($controller, ':')) {
+            $controller = substr($controller, 0, $i).strtolower(substr($controller, $i));
+        }
+
         return $this->container->has($controller) && $this->container->get($controller)->has($argument->getName());
     }
 
@@ -63,6 +67,11 @@ public function resolve(Request $request, ArgumentMetadata $argument)
             $controller = ltrim($controller, '\\');
         }
 
+        if (!$this->container->has($controller)) {
+            $i = strrpos($controller, ':');
+            $controller = substr($controller, 0, $i).strtolower(substr($controller, $i));
+        }
+
         yield $this->container->get($controller)->get($argument->getName());
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php
@@ -66,6 +66,24 @@ public function testExistingControllerWithATrailingBackSlash()
         $this->assertYieldEquals(array(new DummyService()), $resolver->resolve($request, $argument));
     }
 
+    public function testExistingControllerWithMethodNameStartUppercase()
+    {
+        $resolver = new ServiceValueResolver(new ServiceLocator(array(
+            'App\\Controller\\Mine::method' => function () {
+                return new ServiceLocator(array(
+                    'dummy' => function () {
+                        return new DummyService();
+                    },
+                ));
+            },
+        )));
+        $request = $this->requestWithAttributes(array('_controller' => 'App\\Controller\\Mine::Method'));
+        $argument = new ArgumentMetadata('dummy', DummyService::class, false, false, null);
+
+        $this->assertTrue($resolver->supports($request, $argument));
+        $this->assertYieldEquals(array(new DummyService()), $resolver->resolve($request, $argument));
+    }
+
     public function testControllerNameIsAnArray()
     {
         $resolver = new ServiceValueResolver(new ServiceLocator(array(

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,10 @@ public function supports(Request $request, ArgumentMetadata $argument)`
`47`	`47`	`$controller = ltrim($controller, '\\');`
`48`	`48`	`}`
`49`	`49`
	`50`	`+ if (!$this->container->has($controller) && false !== $i = strrpos($controller, ':')) {`
	`51`	`+ $controller = substr($controller, 0, $i).strtolower(substr($controller, $i));`
	`52`	`+ }`
	`53`	`+`
`50`	`54`	`return $this->container->has($controller) && $this->container->get($controller)->has($argument->getName());`
`51`	`55`	`}`
`52`	`56`
`@@ -63,6 +67,11 @@ public function resolve(Request $request, ArgumentMetadata $argument)`
`63`	`67`	`$controller = ltrim($controller, '\\');`
`64`	`68`	`}`
`65`	`69`
	`70`	`+ if (!$this->container->has($controller)) {`
	`71`	`+ $i = strrpos($controller, ':');`
	`72`	`+ $controller = substr($controller, 0, $i).strtolower(substr($controller, $i));`
	`73`	`+ }`
	`74`	`+`
`66`	`75`	`yield $this->container->get($controller)->get($argument->getName());`
`67`	`76`	`}`
`68`	`77`	`}`