Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit a58d9dc9ab93 · 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/LazyProxy/ProxyHelper.php b/LazyProxy/ProxyHelper.php
@@ -29,7 +29,7 @@ public static function getTypeHint(\ReflectionFunctionAbstract $r, \ReflectionPa
             $type = $r->getReturnType();
         }
         if (!$type) {
-            return;
+            return null;
         }
         if (!\is_string($type)) {
             $name = $type->getName();
@@ -45,7 +45,7 @@ public static function getTypeHint(\ReflectionFunctionAbstract $r, \ReflectionPa
             return $prefix.$name;
         }
         if (!$r instanceof \ReflectionMethod) {
-            return;
+            return null;
         }
         if ('self' === $lcName) {
             return $prefix.$r->getDeclaringClass()->name;

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public static function getTypeHint(\ReflectionFunctionAbstract $r, \ReflectionPa`
`29`	`29`	`$type = $r->getReturnType();`
`30`	`30`	`}`
`31`	`31`	`if (!$type) {`
`32`		`- return;`
	`32`	`+ return null;`
`33`	`33`	`}`
`34`	`34`	`if (!\is_string($type)) {`
`35`	`35`	`$name = $type->getName();`
`@@ -45,7 +45,7 @@ public static function getTypeHint(\ReflectionFunctionAbstract $r, \ReflectionPa`
`45`	`45`	`return $prefix.$name;`
`46`	`46`	`}`
`47`	`47`	`if (!$r instanceof \ReflectionMethod) {`
`48`		`- return;`
	`48`	`+ return null;`
`49`	`49`	`}`
`50`	`50`	`if ('self' === $lcName) {`
`51`	`51`	`return $prefix.$r->getDeclaringClass()->name;`