Merge branch '4.4'

nicolas-grekas · nicolas-grekas · commit 705cc5357af7 · 2019-08-13T08:58:13.000+02:00
* 4.4:
  cs fix
  Fix return statements
  [TwigBridge] add missing dep
  Add type declarations to private DefaultChoiceListFactory methods
  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
@@ -387,12 +387,12 @@ private function linkException(string $origin, string $target, string $linkType)
     public function readlink(string $path, bool $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
`@@ -387,12 +387,12 @@ private function linkException(string $origin, string $target, string $linkType)`
`387`	`387`	`public function readlink(string $path, bool $canonicalize = false)`
`388`	`388`	`{`
`389`	`389`	`if (!$canonicalize && !is_link($path)) {`
`390`		`- return;`
	`390`	`+ return null;`
`391`	`391`	`}`
`392`	`392`
`393`	`393`	`if ($canonicalize) {`
`394`	`394`	`if (!$this->exists($path)) {`
`395`		`- return;`
	`395`	`+ return null;`
`396`	`396`	`}`
`397`	`397`
`398`	`398`	`if ('\\' === \DIRECTORY_SEPARATOR) {`