Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 16988b0a3367 · 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/Filesystem.php b/Filesystem.php
@@ -414,12 +414,12 @@ private function linkException($origin, $target, $linkType)
     public function readlink($path, $canonicalize = false)
     {
         if (!$canonicalize && !is_link($path)) {
-            return;
+            return null;
         }
 
         if ($canonicalize) {
             if (!$this->exists($path)) {
-                return;
+                return null;
             }
 
             if ('\\' === \DIRECTORY_SEPARATOR) {

Original file line number	Diff line number	Diff line change
`@@ -414,12 +414,12 @@ private function linkException($origin, $target, $linkType)`
`414`	`414`	`public function readlink($path, $canonicalize = false)`
`415`	`415`	`{`
`416`	`416`	`if (!$canonicalize && !is_link($path)) {`
`417`		`- return;`
	`417`	`+ return null;`
`418`	`418`	`}`
`419`	`419`
`420`	`420`	`if ($canonicalize) {`
`421`	`421`	`if (!$this->exists($path)) {`
`422`		`- return;`
	`422`	`+ return null;`
`423`	`423`	`}`
`424`	`424`
`425`	`425`	`if ('\\' === \DIRECTORY_SEPARATOR) {`