danog/file
1
0
Fork 0
mirror of https://github.com/danog/file.git synced 2024-11-30 04:19:39 +01:00
Code Issues Projects Releases Wiki Activity

Fixes invalid stat result in UvDriver

Browse Source
This commit is contained in:
Andrew Mackrodt 2018-07-18 06:00:53 +01:00 committed by Aaron Piotrowski
parent 836e0ebb03
commit 3e5da2b245
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/UvDriver.php
View File

@ -123,6 +123,14 @@ class UvDriver implements Driver {
if (empty($fh)) {
$stat = null;
} else {
// link is not a valid stat type but returned by the uv extension
// change link to nlink
if (isset($stat['link'])) {
$stat['nlink'] = $stat['link'];
unset($stat['link']);
}
StatCache::set($path, $stat);
}

20
test/DriverTest.php
View File

@ -74,6 +74,7 @@ abstract class DriverTest extends TestCase {
$fixtureDir = Fixture::path();
$stat = (yield File\stat("{$fixtureDir}/small.txt"));
$this->assertInternalType("array", $stat);
$this->assertStatSame(\stat("{$fixtureDir}/small.txt"), $stat);
});
}
@ -82,6 +83,7 @@ abstract class DriverTest extends TestCase {
$fixtureDir = Fixture::path();
$stat = (yield File\stat("{$fixtureDir}/dir"));
$this->assertInternalType("array", $stat);
$this->assertStatSame(\stat("{$fixtureDir}/dir"), $stat);
});
}
@ -328,6 +330,24 @@ abstract class DriverTest extends TestCase {
});
}
private function assertStatSame(array $expected, array $actual) {
$filter = function (array $stat) {
$filtered = \array_filter(
$stat,
function (string $key): bool {
return !\is_numeric($key);
},
ARRAY_FILTER_USE_KEY
);
ksort($filtered);
return $filtered;
};
$this->assertSame($filter($expected), $filter($actual));
}
/**
* @param array $stat
* @return string