Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit cd43346

Browse filesBrowse files
minor #34723 [FrameworkBundle] Use UserInterface to @return in getUser method (Arman-Hosseini)
This PR was squashed before being merged into the 3.4 branch. Discussion ---------- [FrameworkBundle] Use UserInterface to @return in getUser method | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | License | MIT <!-- Replace this notice by a short README for your feature/bugfix. This will help people understand your PR and can be used as a start for the documentation. Additionally (see https://symfony.com/roadmap): - Always add tests and ensure they pass. - Never break backward compatibility (see https://symfony.com/bc). - Bug fixes must be submitted against the lowest maintained branch where they apply (lowest branches are regularly merged to upper ones so they get the fixes too.) - Features and deprecations must be submitted against branch master. --> Commits ------- 9f1ebd7 [FrameworkBundle] Use UserInterface to @return in getUser method
2 parents 2eacbc5 + 9f1ebd7 commit cd43346
Copy full SHA for cd43346

File tree

1 file changed

+2
-1
lines changed
Filter options

1 file changed

+2
-1
lines changed

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
use Symfony\Component\HttpKernel\HttpKernelInterface;
2727
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
2828
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
29+
use Symfony\Component\Security\Core\User\UserInterface;
2930
use Symfony\Component\Security\Csrf\CsrfToken;
3031

3132
/**
@@ -431,7 +432,7 @@ protected function getDoctrine()
431432
/**
432433
* Get a user from the Security Token Storage.
433434
*
434-
* @return object|null
435+
* @return UserInterface|object|null
435436
*
436437
* @throws \LogicException If SecurityBundle is not available
437438
*

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.