update tests with deprecated bundle:controller:action fixtures

symfony · Tobion · Feb 8, 2018 · Feb 8, 2018 · Feb 8, 2018 · Feb 8, 2018
commit 5221135c90f66a01bbcd28ed5f5efd7f422fbcf8
diff --git a/...le/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestController.php b/...le/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SubRequestController.php
@@ -33,7 +33,7 @@ public function indexAction($handler)
         // ...to check that the FragmentListener still references the right Request
         // when rendering another fragment after the error occurred
         // should render en/html instead of fr/json
-        $content .= $handler->render(new ControllerReference('TestBundle:SubRequest:fragment'));
+        $content .= $handler->render(new ControllerReference(self::class.'::fragmentAction'));
 
         // forces the LocaleListener to set fr for the locale...
         // should render fr/json

diff --git a/...e/Tests/Functional/Bundle/TestBundle/Controller/SubRequestServiceResolutionController.php b/...e/Tests/Functional/Bundle/TestBundle/Controller/SubRequestServiceResolutionController.php
@@ -24,7 +24,7 @@ class SubRequestServiceResolutionController implements ContainerAwareInterface
     public function indexAction()
     {
         $request = $this->container->get('request_stack')->getCurrentRequest();
-        $path['_controller'] = 'TestBundle:SubRequestServiceResolution:fragment';
+        $path['_controller'] = self::class.'::fragmentAction';
         $subRequest = $request->duplicate(array(), null, $path);
 
         return $this->container->get('http_kernel')->handle($subRequest, HttpKernelInterface::SUB_REQUEST);

diff --git a/...ny/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml b/...ny/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml
@@ -1,49 +1,49 @@
 session_welcome:
     path:     /session
-    defaults: { _controller: TestBundle:Session:welcome }
+    defaults: { _controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\SessionController::welcomeAction }
 
 session_welcome_name:
     path:     /session/{name}
-    defaults: { _controller: TestBundle:Session:welcome }
+    defaults: { _controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\SessionController::welcomeAction }
 
 session_logout:
     path:     /session_logout
-    defaults: { _controller: TestBundle:Session:logout}
+    defaults: { _controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\SessionController::logoutAction }
 
 session_setflash:
     path:     /session_setflash/{message}
-    defaults: { _controller: TestBundle:Session:setFlash}
+    defaults: { _controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\SessionController::setFlashAction }
 
 session_showflash:
     path:     /session_showflash
-    defaults: { _controller: TestBundle:Session:showFlash}
+    defaults: { _controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\SessionController::showFlashAction }
 
 profiler:
     path:     /profiler
-    defaults: { _controller: TestBundle:Profiler:index }
+    defaults: { _controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\ProfilerController::indexAction }
 
 subrequest_index:
     path:     /subrequest/{_locale}.{_format}
-    defaults: { _controller: TestBundle:SubRequest:index, _format: "html" }
+    defaults: { _controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\SubRequestController::indexAction, _format: html }
     schemes:  [https]
 
 subrequest_fragment_error:
     path:     /subrequest/fragment/error/{_locale}.{_format}
-    defaults: { _controller: TestBundle:SubRequest:fragmentError, _format: "html" }
+    defaults: { _controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\SubRequestController::fragmentErrorAction, _format: html }
     schemes:  [http]
 
 subrequest_fragment:
     path:     /subrequest/fragment/{_locale}.{_format}
-    defaults: { _controller: TestBundle:SubRequest:fragment, _format: "html" }
+    defaults: { _controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\SubRequestController::fragmentAction, _format: html }
     schemes:  [http]
 
 fragment_home:
     path:     /fragment_home
-    defaults: { _controller: TestBundle:Fragment:index, _format: txt }
+    defaults: { _controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\FragmentController::indexAction, _format: txt }
 
 fragment_inlined:
     path:     /fragment_inlined
-    defaults: { _controller: TestBundle:Fragment:inlined }
+    defaults: { _controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\FragmentController::inlinedAction }
 
 array_controller:
     path:     /array_controller

diff --git a/...mfony/Bundle/FrameworkBundle/Tests/Functional/app/ControllerServiceResolution/routing.yml b/...mfony/Bundle/FrameworkBundle/Tests/Functional/app/ControllerServiceResolution/routing.yml
@@ -1,4 +1,4 @@
 sub_request_page:
     path:   /subrequest
     defaults:
-        _controller: 'TestBundle:SubRequestServiceResolution:index'
+        _controller: 'Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\SubRequestServiceResolutionController::indexAction'
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Resources/views/fragment.html.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Resources/views/fragment.html.php
@@ -1,14 +1,14 @@
-<?php echo $this->get('actions')->render($this->get('actions')->controller('TestBundle:Fragment:inlined', array(
+<?php echo $this->get('actions')->render($this->get('actions')->controller('Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\FragmentController::inlinedAction', array(
             'options' => array(
                 'bar' => $bar,
                 'eleven' => 11,
             ),
         )));
 ?>--<?php
-        echo $this->get('actions')->render($this->get('actions')->controller('TestBundle:Fragment:customformat', array('_format' => 'html')));
+        echo $this->get('actions')->render($this->get('actions')->controller('Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\FragmentController::customformatAction', array('_format' => 'html')));
 ?>--<?php
-        echo $this->get('actions')->render($this->get('actions')->controller('TestBundle:Fragment:customlocale', array('_locale' => 'es')));
+        echo $this->get('actions')->render($this->get('actions')->controller('Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\FragmentController::customlocaleAction', array('_locale' => 'es')));
 ?>--<?php
         $app->getRequest()->setLocale('fr');
-        echo $this->get('actions')->render($this->get('actions')->controller('TestBundle:Fragment:forwardlocale'));
+        echo $this->get('actions')->render($this->get('actions')->controller('Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\FragmentController::forwardlocaleAction'));
 ?>
diff --git a/...e/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Resources/config/routing.yml b/...e/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Resources/config/routing.yml
@@ -1,30 +1,30 @@
 form_login:
     path:     /login
-    defaults: { _controller: CsrfFormLoginBundle:Login:login }
+    defaults: { _controller: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\CsrfFormLoginBundle\Controller\LoginController::loginAction }
 
 form_login_check:
     path:     /login_check
-    defaults: { _controller: CsrfFormLoginBundle:Login:loginCheck }
+    defaults: { _controller: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\CsrfFormLoginBundle\Controller\LoginController::loginCheckAction }
 
 form_login_homepage:
     path:     /
-    defaults: { _controller: CsrfFormLoginBundle:Login:afterLogin }
+    defaults: { _controller: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\CsrfFormLoginBundle\Controller\LoginController::afterLoginAction }
 
 form_login_custom_target_path:
     path:     /foo
-    defaults: { _controller: CsrfFormLoginBundle:Login:afterLogin }
+    defaults: { _controller: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\CsrfFormLoginBundle\Controller\LoginController::afterLoginAction }
 
 form_login_default_target_path:
     path:     /profile
-    defaults: { _controller: CsrfFormLoginBundle:Login:afterLogin }
+    defaults: { _controller: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\CsrfFormLoginBundle\Controller\LoginController::afterLoginAction }
 
 form_login_redirect_to_protected_resource_after_login:
     path:     /protected-resource
-    defaults: { _controller: CsrfFormLoginBundle:Login:afterLogin }
+    defaults: { _controller: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\CsrfFormLoginBundle\Controller\LoginController::afterLoginAction }
 
 form_logout:
     path:     /logout_path
 
 form_secure_action:
     path:     /secure-but-not-covered-by-access-control
-    defaults: { _controller: CsrfFormLoginBundle:Login:secure }
+    defaults: { _controller: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\CsrfFormLoginBundle\Controller\LoginController::secureAction }
diff --git a/...rityBundle/Tests/Functional/Bundle/FormLoginBundle/Resources/config/localized_routing.yml b/...rityBundle/Tests/Functional/Bundle/FormLoginBundle/Resources/config/localized_routing.yml
@@ -1,29 +1,29 @@
 localized_login_path:
     path:     /{_locale}/login
-    defaults: { _controller: FormLoginBundle:Localized:login }
+    defaults: { _controller: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\Controller\LocalizedController::loginAction }
     requirements: { _locale: "^[a-z]{2}$" }
 
 localized_check_path:
     path:     /{_locale}/login_check
-    defaults: { _controller: FormLoginBundle:Localized:loginCheck }
+    defaults: { _controller: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\Controller\LocalizedController::loginCheckAction }
     requirements: { _locale: "^[a-z]{2}$" }
 
 localized_default_target_path:
     path:     /{_locale}/profile
-    defaults: { _controller: FormLoginBundle:Localized:profile }
+    defaults: { _controller: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\Controller\LocalizedController::profileAction }
     requirements: { _locale: "^[a-z]{2}$" }
 
 localized_logout_path:
     path:     /{_locale}/logout
-    defaults: { _controller: FormLoginBundle:Localized:logout }
+    defaults: { _controller: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\Controller\LocalizedController::logoutAction }
     requirements: { _locale: "^[a-z]{2}$" }
 
 localized_logout_target_path:
     path:     /{_locale}/
-    defaults: { _controller: FormLoginBundle:Localized:homepage }
+    defaults: { _controller: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\Controller\LocalizedController::homepageAction }
     requirements: { _locale: "^[a-z]{2}$" }
 
 localized_secure_path:
     path:     /{_locale}/secure/
-    defaults: { _controller: FormLoginBundle:Localized:secure }
+    defaults: { _controller: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\Controller\LocalizedController::secureAction }
     requirements: { _locale: "^[a-z]{2}$" }
diff --git a/...undle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Resources/config/routing.yml b/...undle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Resources/config/routing.yml
@@ -1,26 +1,26 @@
 form_login:
     path:     /login
-    defaults: { _controller: FormLoginBundle:Login:login }
+    defaults: { _controller: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\Controller\LoginController::loginAction }
 
 form_login_check:
     path:     /login_check
-    defaults: { _controller: FormLoginBundle:Login:loginCheck }
+    defaults: { _controller: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\Controller\LoginController::loginCheckAction }
 
 form_login_homepage:
     path:     /
-    defaults: { _controller: FormLoginBundle:Login:afterLogin }
+    defaults: { _controller: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\Controller\LoginController::afterLoginAction }
 
 form_login_custom_target_path:
     path:     /foo
-    defaults: { _controller: FormLoginBundle:Login:afterLogin }
+    defaults: { _controller: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\Controller\LoginController::afterLoginAction }
 
 form_login_default_target_path:
     path:     /profile
-    defaults: { _controller: FormLoginBundle:Login:afterLogin }
+    defaults: { _controller: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\Controller\LoginController::afterLoginAction }
 
 form_login_redirect_to_protected_resource_after_login:
     path:     /protected_resource
-    defaults: { _controller: FormLoginBundle:Login:afterLogin }
+    defaults: { _controller: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\Controller\LoginController::afterLoginAction }
 
 highly_protected_resource:
     path:     /highly_protected_resource
@@ -36,7 +36,7 @@ form_logout:
 
 form_secure_action:
     path:     /secure-but-not-covered-by-access-control
-    defaults: { _controller: FormLoginBundle:Login:secure }
+    defaults: { _controller: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\Controller\LoginController::secureAction }
 
 protected-via-expression:
     path:     /protected-via-expression
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/JsonLogin/routing.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/JsonLogin/routing.yml
@@ -1,3 +1,3 @@
 login_check:
     path: /chk
-    defaults: { _controller: JsonLoginBundle:Test:loginCheck }
+    defaults: { _controller: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\JsonLoginBundle\Controller\TestController::loginCheckAction }
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -20,7 +20,7 @@
         "ext-xml": "*",
         "symfony/security": "~3.4|~4.0",
         "symfony/dependency-injection": "^3.4.3|^4.0.3",
-        "symfony/http-kernel": "~3.4|~4.0"
+        "symfony/http-kernel": "^4.1"
     },
     "require-dev": {
         "symfony/asset": "~3.4|~4.0",