8000 Removing the Controller::getUser() deprecation · symfony/symfony@87bd06e · GitHub
[go: up one dir, main page]
Skip to content

Commit 87bd06e

Browse files
weaverryanweaverryan
committed
Removing the Controller::getUser() deprecation
1 parent 870c302 commit 87bd06e

File tree

5 files changed

+0
-21
lines changed

5 files changed

+0
-21
lines changed

‎UPGRADE-3.2.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ FrameworkBundle
2727
* The `Resources/public/images/*` files have been removed.
2828
* The `Resources/public/css/*.css` files have been removed (they are now inlined
2929
in TwigBundle).
30-
* The `Controller::getUser()` method has been deprecated and will be removed in
31-
Symfony 4.0; typehint the security user object in the action instead.
3230

3331
Console
3432
-------

‎UPGRADE-4.0.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,6 @@ FrameworkBundle
124124
`serializer.mapping.cache.apc` and `serializer.mapping.cache.doctrine.apc`
125125
have been removed. APCu should now be automatically used when available.
126126

127-
* The `Controller::getUser()` method has been removed in favor of the ability
128-
to typehint the security user object in the action.
129-
130127
HttpFoundation
131128
---------------
132129

‎src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ CHANGELOG
1111
* Removed `symfony/asset` from the list of required dependencies in `composer.json`
1212
* The `Resources/public/images/*` files have been removed.
1313
* The `Resources/public/css/*.css` files have been removed (they are now inlined in TwigBundle).
14-
* The `Controller::getUser()` method has been deprecated and will be removed in
15-
Symfony 4.0; typehint the security user object in the action instead.
1614
* Added possibility to prioritize form type extensions with `'priority'` attribute on tags `form.type_extension`
1715

1816
3.1.0

‎src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -367,16 +367,12 @@ protected function getDoctrine()
367367
*
368368
* @return mixed
369369
*
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-
*
372370
* @throws \LogicException If SecurityBundle is not available
373371
*
374372
* @see TokenInterface::getUser()
375373
*/
376374
protected function getUser()
377375
{
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-
380376
if (!$this->container->has('security.token_storage')) {
381377
throw new \LogicException('The SecurityBundle is not registered in your application.');
382378
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@ public function testForward()
5656
$this->assertEquals('xml--fr', $response->getContent());
5757
}
5858

59-
/**
60-
* @group legacy
61-
*/
6259
public function testGetUser()
6360
{
6461
$user = new User('user', 'pass');
@@ -70,9 +67,6 @@ public function testGetUser()
7067
$this->assertSame($controller->getUser(), $user);
7168
}
7269

73-
/**
74-
* @group legacy
75-
*/
7670
public function testGetUserAnonymousUserConvertedToNull()
7771
{
7872
$token = new AnonymousToken('default', 'anon.');
@@ -83,9 +77,6 @@ public function testGetUserAnonymousUserConvertedToNull()
8377
$this->assertNull($controller->getUser());
8478
}
8579

86-
/**
87-
* @group legacy
88-
*/
8980
public function testGetUserWithEmptyTokenStorage()
9081
{
9182
$controller = new TestController();
@@ -95,7 +86,6 @@ public function testGetUserWithEmptyTokenStorage()
9586
}
9687

9788
/**
98-
* @group legacy
9989
* @expectedException \LogicException
10090
* @expectedExceptionMessage The SecurityBundle is not registered in your application.
10191
*/

0 commit comments

Comments
 (0)
0