Merge branch '3.4' into 4.3

* 3.4: Fix inconsistent return points. [Security/Core] UserInterface::getPassword() can return null [Router] Fix TraceableUrlMatcher behaviour with trailing slash
symfony · Aug 20, 2019 · 9abbb7e · 9abbb7e
2 parents 8af2a22 + 00e3a6d
commit 9abbb7e
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/Tests/FilesystemTestCase.php b/Tests/FilesystemTestCase.php
@@ -21,7 +21,7 @@ class FilesystemTestCase extends TestCase
     protected $longPathNamesWindows = [];
 
     /**
-     * @var \Symfony\Component\Filesystem\Filesystem
+     * @var Filesystem
      */
     protected $filesystem = null;
 
@@ -110,9 +110,8 @@ protected function getFileOwner($filepath)
         $this->markAsSkippedIfPosixIsMissing();
 
         $infos = stat($filepath);
-        if ($datas = posix_getpwuid($infos['uid'])) {
-            return $datas['name'];
-        }
+
+        return ($datas = posix_getpwuid($infos['uid'])) ? $datas['name'] : null;
     }
 
     protected function getFileGroup($filepath)