Skip to content

Commit

Permalink
Merge branch '4.3'
Browse files Browse the repository at this point in the history
* 4.3:
  [github] Implement the new security policy.
  [Finder] fix wrong method call casing
  Make tempfile path unique
  minor: fix phpdocs in the ldap component
  [Process] Fix infinite waiting for stopped process
  Use absolute URL for when the profiler's domain differs from the controller's domain which initialises the profiler.
  fix phpdoc
  [DI] fix using bindings with locators of service subscribers
  • Loading branch information
nicolas-grekas committed May 26, 2019
2 parents c7c8437 + 5d92515 commit 5f9ad41
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Iterator/SortableIterator.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public function __construct(\Traversable $iterator, $sort, bool $reverseOrder =

if (self::SORT_BY_NAME === $sort) {
$this->sort = function ($a, $b) use ($order) {
return $order * strcmp($a->getRealpath() ?: $a->getPathname(), $b->getRealpath() ?: $b->getPathname());
return $order * strcmp($a->getRealPath() ?: $a->getPathname(), $b->getRealPath() ?: $b->getPathname());
};
} elseif (self::SORT_BY_NAME_NATURAL === $sort) {
$this->sort = function ($a, $b) use ($order) {
Expand All @@ -56,7 +56,7 @@ public function __construct(\Traversable $iterator, $sort, bool $reverseOrder =
return $order;
}

return $order * strcmp($a->getRealpath() ?: $a->getPathname(), $b->getRealpath() ?: $b->getPathname());
return $order * strcmp($a->getRealPath() ?: $a->getPathname(), $b->getRealPath() ?: $b->getPathname());
};
} elseif (self::SORT_BY_ACCESSED_TIME === $sort) {
$this->sort = function ($a, $b) use ($order) {
Expand Down

0 comments on commit 5f9ad41

Please sign in to comment.