Removing the Controller::getUser() deprecation

weaverryan · weaverryan · commit da7daee407d9 · 2016-10-14T19:46:34.000-04:00
diff --git a/UPGRADE-3.2.md b/UPGRADE-3.2.md
@@ -27,8 +27,6 @@ FrameworkBundle
  * The `Resources/public/images/*` files have been removed.
  * The `Resources/public/css/*.css` files have been removed (they are now inlined
    in TwigBundle).
- * The `Controller::getUser()` method has been deprecated and will be removed in
-   Symfony 4.0; typehint the security user object in the action instead.
 
 Console
 -------
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
@@ -124,9 +124,6 @@ FrameworkBundle
    `serializer.mapping.cache.apc` and `serializer.mapping.cache.doctrine.apc`
    have been removed. APCu should now be automatically used when available.
 
- * The `Controller::getUser()` method has been removed in favor of the ability
-   to typehint the security user object in the action.
-
 HttpFoundation
 ---------------
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -11,8 +11,6 @@ CHANGELOG
  * Removed `symfony/asset` from the list of required dependencies in `composer.json`
  * The `Resources/public/images/*` files have been removed.
  * The `Resources/public/css/*.css` files have been removed (they are now inlined in TwigBundle).
- * The `Controller::getUser()` method has been deprecated and will be removed in
-   Symfony 4.0; typehint the security user object in the action instead.
  * Added possibility to prioritize form type extensions with `'priority'` attribute on tags `form.type_extension` 
 
 3.1.0
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
@@ -22,7 +22,6 @@
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Csrf\CsrfToken;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\Form;
@@ -367,16 +366,12 @@ protected function getDoctrine()
      *
      * @return mixed
      *
-     * @deprecated as of 3.2 and will be removed in 4.0. You can typehint your method argument with Symfony\Component\Security\Core\User\UserInterface instead.
-     *
      * @throws \LogicException If SecurityBundle is not available
      *
      * @see TokenInterface::getUser()
      */
     protected function getUser()
     {
-        @trigger_error(sprintf('%s() is deprecated as of 3.2 and will be removed in 4.0. You can typehint your method argument with %s instead.', __METHOD__, UserInterface::class), E_USER_DEPRECATED);
-
         if (!$this->container->has('security.token_storage')) {
             throw new \LogicException('The SecurityBundle is not registered in your application.');
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php
@@ -56,9 +56,6 @@ public function testForward()
         $this->assertEquals('xml--fr', $response->getContent());
     }
 
-    /**
-     * @group legacy
-     */
     public function testGetUser()
     {
         $user = new User('user', 'pass');
@@ -70,9 +67,6 @@ public function testGetUser()
         $this->assertSame($controller->getUser(), $user);
     }
 
-    /**
-     * @group legacy
-     */
     public function testGetUserAnonymousUserConvertedToNull()
     {
         $token = new AnonymousToken('default', 'anon.');
@@ -83,9 +77,6 @@ public function testGetUserAnonymousUserConvertedToNull()
         $this->assertNull($controller->getUser());
     }
 
-    /**
-     * @group legacy
-     */
     public function testGetUserWithEmptyTokenStorage()
     {
         $controller = new TestController();
@@ -95,7 +86,6 @@ public function testGetUserWithEmptyTokenStorage()
     }
 
     /**
-     * @group legacy
      * @expectedException \LogicException
      * @expectedExceptionMessage The SecurityBundle is not registered in your application.
      */

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@`
`22`	`22`	`use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;`
`23`	`23`	`use Symfony\Component\HttpKernel\HttpKernelInterface;`
`24`	`24`	`use Symfony\Component\Security\Core\Exception\AccessDeniedException;`
`25`		`-use Symfony\Component\Security\Core\User\UserInterface;`
`26`	`25`	`use Symfony\Component\Security\Csrf\CsrfToken;`
`27`	`26`	`use Symfony\Component\Form\Extension\Core\Type\FormType;`
`28`	`27`	`use Symfony\Component\Form\Form;`
`@@ -367,16 +366,12 @@ protected function getDoctrine()`
`367`	`366`	`*`
`368`	`367`	`* @return mixed`
`369`	`368`	`*`
`370`		`- * @deprecated as of 3.2 and will be removed in 4.0. You can typehint your method argument with Symfony\Component\Security\Core\User\UserInterface instead.`
`371`		`- *`
`372`	`369`	`* @throws \LogicException If SecurityBundle is not available`
`373`	`370`	`*`
`374`	`371`	`* @see TokenInterface::getUser()`
`375`	`372`	`*/`
`376`	`373`	`protected function getUser()`
`377`	`374`	`{`
`378`		`- @trigger_error(sprintf('%s() is deprecated as of 3.2 and will be removed in 4.0. You can typehint your method argument with %s instead.', __METHOD__, UserInterface::class), E_USER_DEPRECATED);`
`379`		`-`
`380`	`375`	`if (!$this->container->has('security.token_storage')) {`
`381`	`376`	`throw new \LogicException('The SecurityBundle is not registered in your application.');`
`382`	`377`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,6 @@ public function testForward()`
`56`	`56`	`$this->assertEquals('xml--fr', $response->getContent());`
`57`	`57`	`}`
`58`	`58`
`59`		`- /**`
`60`		`- * @group legacy`
`61`		`- */`
`62`	`59`	`public function testGetUser()`
`63`	`60`	`{`
`64`	`61`	`$user = new User('user', 'pass');`
`@@ -70,9 +67,6 @@ public function testGetUser()`
`70`	`67`	`$this->assertSame($controller->getUser(), $user);`
`71`	`68`	`}`
`72`	`69`
`73`		`- /**`
`74`		`- * @group legacy`
`75`		`- */`
`76`	`70`	`public function testGetUserAnonymousUserConvertedToNull()`
`77`	`71`	`{`
`78`	`72`	`$token = new AnonymousToken('default', 'anon.');`
`@@ -83,9 +77,6 @@ public function testGetUserAnonymousUserConvertedToNull()`
`83`	`77`	`$this->assertNull($controller->getUser());`
`84`	`78`	`}`
`85`	`79`
`86`		`- /**`
`87`		`- * @group legacy`
`88`		`- */`
`89`	`80`	`public function testGetUserWithEmptyTokenStorage()`
`90`	`81`	`{`
`91`	`82`	`$controller = new TestController();`
`@@ -95,7 +86,6 @@ public function testGetUserWithEmptyTokenStorage()`
`95`	`86`	`}`
`96`	`87`
`97`	`88`	`/**`
`98`		`- * @group legacy`
`99`	`89`	`* @expectedException \LogicException`
`100`	`90`	`* @expectedExceptionMessage The SecurityBundle is not registered in your application.`
`101`	`91`	`*/`