Skip to content

Commit 7b9f55d

Browse files
Merge branch '3.4' into 4.1
* 3.4: [Debug] ignore underscore vs backslash namespaces in DebugClassLoader [TwigBridge][Form] Prevent multiple rendering of form collection prototypes [FrameworkBundle] fix describing routes with no controllers [DI] move RegisterServiceSubscribersPass before DecoratorServicePass Update ValidationListener.php [Yaml] ensures that the mb_internal_encoding is reset to its initial value [WebLink] Fixed documentation link [Security] getTargetPath of TargetPathTrait must return string or null [Hackday][Serializer] Deserialization ignores argument type hint from phpdoc for array in constructor argument [Security] defer log message in guard authenticator merge conflicts Fix HeaderBag::get phpdoc
2 parents f56f12f + b8ab923 commit 7b9f55d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Util/TargetPathTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ private function saveTargetPath(SessionInterface $session, $providerKey, $uri)
3838
* @param SessionInterface $session
3939
* @param string $providerKey The name of your firewall
4040
*
41-
* @return string
41+
* @return string|null
4242
*/
4343
private function getTargetPath(SessionInterface $session, $providerKey)
4444
{

0 commit comments

Comments
 (0)