diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Finder] Prevent unintentional file locks in Windows

Browse Source
This commit is contained in:
Joe Springe 2019-08-30 15:02:11 -04:00 committed by Nicolas Grekas
parent 71a8ecbfd6
commit 997cc5c3f0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Symfony/Component/Finder/Iterator/SortableIterator.php
View File

@ -38,11 +38,11 @@ class SortableIterator implements \IteratorAggregate
$this->iterator = $iterator; $this->iterator = $iterator;
if (self::SORT_BY_NAME === $sort) { if (self::SORT_BY_NAME === $sort) {
$this->sort = function ($a, $b) { $this->sort = static function ($a, $b) {
return strcmp($a->getRealPath() ?: $a->getPathname(), $b->getRealPath() ?: $b->getPathname()); return strcmp($a->getRealPath() ?: $a->getPathname(), $b->getRealPath() ?: $b->getPathname());
}; };
} elseif (self::SORT_BY_TYPE === $sort) { } elseif (self::SORT_BY_TYPE === $sort) {
$this->sort = function ($a, $b) { $this->sort = static function ($a, $b) {
if ($a->isDir() && $b->isFile()) { if ($a->isDir() && $b->isFile()) {
return -1; return -1;
} elseif ($a->isFile() && $b->isDir()) { } elseif ($a->isFile() && $b->isDir()) {
@ -52,15 +52,15 @@ class SortableIterator implements \IteratorAggregate
return strcmp($a->getRealPath() ?: $a->getPathname(), $b->getRealPath() ?: $b->getPathname()); return strcmp($a->getRealPath() ?: $a->getPathname(), $b->getRealPath() ?: $b->getPathname());
}; };
} elseif (self::SORT_BY_ACCESSED_TIME === $sort) { } elseif (self::SORT_BY_ACCESSED_TIME === $sort) {
$this->sort = function ($a, $b) { $this->sort = static function ($a, $b) {
return $a->getATime() - $b->getATime(); return $a->getATime() - $b->getATime();
}; };
} elseif (self::SORT_BY_CHANGED_TIME === $sort) { } elseif (self::SORT_BY_CHANGED_TIME === $sort) {
$this->sort = function ($a, $b) { $this->sort = static function ($a, $b) {
return $a->getCTime() - $b->getCTime(); return $a->getCTime() - $b->getCTime();
}; };
} elseif (self::SORT_BY_MODIFIED_TIME === $sort) { } elseif (self::SORT_BY_MODIFIED_TIME === $sort) {
$this->sort = function ($a, $b) { $this->sort = static function ($a, $b) {
return $a->getMTime() - $b->getMTime(); return $a->getMTime() - $b->getMTime();
}; };
} elseif (\is_callable($sort)) { } elseif (\is_callable($sort)) {