Skip to content

Commit ed95be7

Browse files
Merge branch '4.1' into 4.2
* 4.1: Fix typos in doc blocks [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 Optimize perf by replacing call_user_func with dynamic vars [Routing] fix dumping same-path routes with placeholders [Security] defer log message in guard authenticator [Validator] Added IBAN format for Vatican City State merge conflicts filter out invalid Intl values filter out invalid language values [Validator] Fixed grouped composite constraints [Form] Filter arrays out of scalar form types Fix HeaderBag::get phpdoc
2 parents 2c3b60a + 7b9f55d commit ed95be7

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)