changelog 6.2 branch

hmoreau · hmoreau · commit 30f62b624a9a · 2022-04-27T08:45:25.000Z
diff --git a/src/Symfony/Component/Finder/CHANGELOG.md b/src/Symfony/Component/Finder/CHANGELOG.md
@@ -1,7 +1,7 @@
 CHANGELOG
 =========
 
-6.1
+6.2
 ---
 
  * Add `Finder::sortByCaseName()` to sort by name with case insensitive sorting methods 
diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
@@ -451,8 +451,7 @@ public function sortByName(bool $useNaturalSort = false): static
      */
     public function sortByCaseName(bool $useNaturalSort = false): static
     {
-        $this->sort = $useNaturalSort ? Iterator\SortableIterator::SORT_BY_NAME_NATURAL_CASE_INSENSITIVE :
-            Iterator\SortableIterator::SORT_BY_NAME_CASE_INSENSITIVE;
+        $this->sort = $useNaturalSort ? Iterator\SortableIterator::SORT_BY_NAME_NATURAL_CASE_INSENSITIVE : Iterator\SortableIterator::SORT_BY_NAME_CASE_INSENSITIVE;
 
         return $this;
     }
diff --git a/src/Symfony/Component/Finder/Iterator/SortableIterator.php b/src/Symfony/Component/Finder/Iterator/SortableIterator.php
@@ -86,8 +86,7 @@ public function __construct(\Traversable $iterator, int|callable $sort, bool $re
         } elseif (self::SORT_BY_NONE === $sort) {
             $this->sort = $order;
         } elseif (\is_callable($sort)) {
-            $this->sort = $reverseOrder ? static function (\SplFileInfo $a, \SplFileInfo $b) use ($sort) { return -$sort($a, $b); }
-            : $sort(...);
+            $this->sort = $reverseOrder ? static function (\SplFileInfo $a, \SplFileInfo $b) use ($sort) { return -$sort($a, $b); } : $sort(...);
         } else {
             throw new \InvalidArgumentException('The SortableIterator takes a PHP callable or a valid built-in sort algorithm as an argument.');
         }

Original file line number	Diff line number	Diff line change
`@@ -451,8 +451,7 @@ public function sortByName(bool $useNaturalSort = false): static`
`451`	`451`	`*/`
`452`	`452`	`public function sortByCaseName(bool $useNaturalSort = false): static`
`453`	`453`	`{`
`454`		`- $this->sort = $useNaturalSort ? Iterator\SortableIterator::SORT_BY_NAME_NATURAL_CASE_INSENSITIVE :`
`455`		`- Iterator\SortableIterator::SORT_BY_NAME_CASE_INSENSITIVE;`
	`454`	`+ $this->sort = $useNaturalSort ? Iterator\SortableIterator::SORT_BY_NAME_NATURAL_CASE_INSENSITIVE : Iterator\SortableIterator::SORT_BY_NAME_CASE_INSENSITIVE;`
`456`	`455`
`457`	`456`	`return $this;`
`458`	`457`	`}`