Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit 3ad3f3d88af7 · 2019-08-13T08:48:26.000+02:00
* 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
diff --git a/Filesystem.php b/Filesystem.php
@@ -408,12 +408,12 @@ private function linkException(string $origin, string $target, string $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
`@@ -408,12 +408,12 @@ private function linkException(string $origin, string $target, string $linkType)`
`408`	`408`	`public function readlink($path, $canonicalize = false)`
`409`	`409`	`{`
`410`	`410`	`if (!$canonicalize && !is_link($path)) {`
`411`		`- return;`
	`411`	`+ return null;`
`412`	`412`	`}`
`413`	`413`
`414`	`414`	`if ($canonicalize) {`
`415`	`415`	`if (!$this->exists($path)) {`
`416`		`- return;`
	`416`	`+ return null;`
`417`	`417`	`}`
`418`	`418`
`419`	`419`	`if ('\\' === \DIRECTORY_SEPARATOR) {`