minor #31713 [FrameworkBundle] fix test fixture using deprecated controller (Tobion)

fabpot · fabpot · commit d0cef8271ce7 · 2019-05-30T08:06:50.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- [FrameworkBundle] fix test fixture using deprecated controller | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | no | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | | License | MIT | Doc PR | https://github.com/symfony/symfony/pull/21035/files#diff-636946f5b52668178ede98d59135a181 reintroduced some deprecated controller notations (#26085) which wasn't spotted because ResolveControllerNameSubscriber missed a deprecation trigger. This also adds this trigger. Commits ------- 7f00a74 [FrameworkBundle] fix test fixture using deprecated controller and add missing deprecation
diff --git a/src/Symfony/Bundle/FrameworkBundle/EventListener/ResolveControllerNameSubscriber.php b/src/Symfony/Bundle/FrameworkBundle/EventListener/ResolveControllerNameSubscriber.php
@@ -37,7 +37,9 @@ public function onKernelRequest(GetResponseEvent $event)
         $controller = $event->getRequest()->attributes->get('_controller');
         if (\is_string($controller) && false === strpos($controller, '::') && 2 === substr_count($controller, ':')) {
             // controller in the a:b:c notation then
-            $event->getRequest()->attributes->set('_controller', $this->parser->parse($controller, false));
+            $event->getRequest()->attributes->set('_controller', $parsedNotation = $this->parser->parse($controller, false));
+
+            @trigger_error(sprintf('Referencing controllers with %s is deprecated since Symfony 4.1, use "%s" instead.', $controller, $parsedNotation), E_USER_DEPRECATED);
         }
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/EventListener/ResolveControllerNameSubscriberTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/EventListener/ResolveControllerNameSubscriberTest.php
@@ -20,6 +20,9 @@
 
 class ResolveControllerNameSubscriberTest extends TestCase
 {
+    /**
+     * @group legacy
+     */
     public function testReplacesControllerAttribute()
     {
         $parser = $this->getMockBuilder(ControllerNameParser::class)->disableOriginalConstructor()->getMock();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/templates/fragment.html.twig b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/templates/fragment.html.twig
@@ -1,7 +1,7 @@
-{{ render(controller('TestBundle:Fragment:inlined', {'options': {'bar': bar, 'eleven': 11}})) }}
+{{ render(controller('Symfony\\Bundle\\FrameworkBundle\\Tests\\Functional\\Bundle\\TestBundle\\Controller\\FragmentController::inlinedAction', {'options': {'bar': bar, 'eleven': 11}})) }}
 --
-{{ render(controller('TestBundle:Fragment:customformat', {'_format': 'html'})) }}
+{{ render(controller('Symfony\\Bundle\\FrameworkBundle\\Tests\\Functional\\Bundle\\TestBundle\\Controller\\FragmentController::customformatAction', {'_format': 'html'})) }}
 --
-{{ render(controller('TestBundle:Fragment:customlocale', {'_locale': 'es'})) }}
+{{ render(controller('Symfony\\Bundle\\FrameworkBundle\\Tests\\Functional\\Bundle\\TestBundle\\Controller\\FragmentController::customlocaleAction', {'_locale': 'es'})) }}
 --
-{{ app.request.setLocale('fr') }}{{ render(controller('TestBundle:Fragment:forwardlocale')) -}}
+{{ app.request.setLocale('fr') }}{{ render(controller('Symfony\\Bundle\\FrameworkBundle\\Tests\\Functional\\Bundle\\TestBundle\\Controller\\FragmentController::forwardlocaleAction')) -}}

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,9 @@ public function onKernelRequest(GetResponseEvent $event)`
`37`	`37`	`$controller = $event->getRequest()->attributes->get('_controller');`
`38`	`38`	`if (\is_string($controller) && false === strpos($controller, '::') && 2 === substr_count($controller, ':')) {`
`39`	`39`	`// controller in the a:b:c notation then`
`40`		`- $event->getRequest()->attributes->set('_controller', $this->parser->parse($controller, false));`
	`40`	`+ $event->getRequest()->attributes->set('_controller', $parsedNotation = $this->parser->parse($controller, false));`
	`41`	`+`
	`42`	`+ @trigger_error(sprintf('Referencing controllers with %s is deprecated since Symfony 4.1, use "%s" instead.', $controller, $parsedNotation), E_USER_DEPRECATED);`
`41`	`43`	`}`
`42`	`44`	`}`
`43`	`45`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,9 @@`
`20`	`20`
`21`	`21`	`class ResolveControllerNameSubscriberTest extends TestCase`
`22`	`22`	`{`
	`23`	`+ /**`
	`24`	`+ * @group legacy`
	`25`	`+ */`
`23`	`26`	`public function testReplacesControllerAttribute()`
`24`	`27`	`{`
`25`	`28`	`$parser = $this->getMockBuilder(ControllerNameParser::class)->disableOriginalConstructor()->getMock();`