Skip to content

Commit d36e2a3

Browse files
Merge branch '4.3' into 4.4
* 4.3: cs fix Fix return statements [TwigBridge] add missing dep Add false type to ChoiceListFactoryInterface::createView $label argument Update UPGRADE guide of 4.3 for EventDispatcher [SecurityBundle] display the correct class name on the deprecated notice
2 parents 62b2b2b + 6eb1d20 commit d36e2a3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Parser/TokenStream.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public function getNextIdentifierOrStar()
155155
}
156156

157157
if ($next->isDelimiter(['*'])) {
158-
return;
158+
return null;
159159
}
160160

161161
throw SyntaxErrorException::unexpectedToken('identifier or "*"', $next);

0 commit comments

Comments
 (0)