Skip to content

Commit 9abbb7e

Browse files
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
2 parents 8af2a22 + 00e3a6d commit 9abbb7e

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

Tests/FilesystemTestCase.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class FilesystemTestCase extends TestCase
2121
protected $longPathNamesWindows = [];
2222

2323
/**
24-
* @var \Symfony\Component\Filesystem\Filesystem
24+
* @var Filesystem
2525
*/
2626
protected $filesystem = null;
2727

@@ -110,9 +110,8 @@ protected function getFileOwner($filepath)
110110
$this->markAsSkippedIfPosixIsMissing();
111111

112112
$infos = stat($filepath);
113-
if ($datas = posix_getpwuid($infos['uid'])) {
114-
return $datas['name'];
115-
}
113+
114+
return ($datas = posix_getpwuid($infos['uid'])) ? $datas['name'] : null;
116115
}
117116

118117
protected function getFileGroup($filepath)

0 commit comments

Comments
 (0)