Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 6eb1d2069fbd · 2019-08-13T08:39:03.000+02:00
* 3.4:
  Fix return statements
  [TwigBridge] add missing dep
  Add false type to ChoiceListFactoryInterface::createView $label argument
diff --git a/Parser/TokenStream.php b/Parser/TokenStream.php
@@ -155,7 +155,7 @@ public function getNextIdentifierOrStar()
         }
 
         if ($next->isDelimiter(['*'])) {
-            return;
+            return null;
         }
 
         throw SyntaxErrorException::unexpectedToken('identifier or "*"', $next);

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ public function getNextIdentifierOrStar()`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`if ($next->isDelimiter(['*'])) {`
`158`		`- return;`
	`158`	`+ return null;`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`throw SyntaxErrorException::unexpectedToken('identifier or "*"', $next);`