Skip to content

Commit f68b274

Browse files
Merge branch '4.4'
* 4.4: cs fix Fix inconsistent return points. [Config] Add handling for ignored keys in ArrayNode::mergeValues. Fix inconsistent return points. [Security/Core] UserInterface::getPassword() can return null cs fix cs fix Fix missing exporter in PHPUnit constraint poylfill added `Process::getLastOutputTime()` method [Router] Fix TraceableUrlMatcher behaviour with trailing slash [HttpKernel] Remove outdated docblock comment Fix handling for session parameters Revert "bug #33092 [DependencyInjection] Improve an exception message (fabpot)"
2 parents 0b4ed57 + 9cec0b6 commit f68b274

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)