Merge branch '6.1' into 6.2

* 6.1: Update ComposerPlugin.php [Notifier] [OvhCloud] handle invalid receiver [Cache] fix collecting cache stats when nesting computations [VarDumper] Fix JS to expand / collapse [Validator] Fix Email validator logic Fix user_identifier support after username has been deprecated in favor of it. [Tests] Remove `$this` occurrences in future static data providers [PropertyInfo] Fixes constructor extractor for mixed type use method_exists() instead of catching reflection exceptions
symfony · Jan 20, 2023 · c90dc44 · c90dc44
2 parents eba9fbf + 1efd836
commit c90dc44
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/Tests/Iterator/DepthRangeFilterIteratorTest.php b/Tests/Iterator/DepthRangeFilterIteratorTest.php
@@ -95,11 +95,11 @@ public function getAcceptData()
         ];
 
         return [
-            [0, 0, $this->toAbsolute($lessThan1)],
-            [0, 1, $this->toAbsolute($lessThanOrEqualTo1)],
+            [0, 0, static::toAbsolute($lessThan1)],
+            [0, 1, static::toAbsolute($lessThanOrEqualTo1)],
             [2, \PHP_INT_MAX, []],
-            [1, \PHP_INT_MAX, $this->toAbsolute($graterThanOrEqualTo1)],
-            [1, 1, $this->toAbsolute($equalTo1)],
+            [1, \PHP_INT_MAX, static::toAbsolute($graterThanOrEqualTo1)],
+            [1, 1, static::toAbsolute($equalTo1)],
         ];
     }
 }
diff --git a/Tests/Iterator/ExcludeDirectoryFilterIteratorTest.php b/Tests/Iterator/ExcludeDirectoryFilterIteratorTest.php
@@ -105,9 +105,9 @@ public function getAcceptData()
         ];
 
         return [
-            [['foo'], $this->toAbsolute($foo)],
-            [['fo'], $this->toAbsolute($fo)],
-            [['toto/'], $this->toAbsolute($toto)],
+            [['foo'], static::toAbsolute($foo)],
+            [['fo'], static::toAbsolute($fo)],
+            [['toto/'], static::toAbsolute($toto)],
         ];
     }
 }
diff --git a/Tests/Iterator/FileTypeFilterIteratorTest.php b/Tests/Iterator/FileTypeFilterIteratorTest.php
@@ -59,8 +59,8 @@ public function getAcceptData()
         ];
 
         return [
-            [FileTypeFilterIterator::ONLY_FILES, $this->toAbsolute($onlyFiles)],
-            [FileTypeFilterIterator::ONLY_DIRECTORIES, $this->toAbsolute($onlyDirectories)],
+            [FileTypeFilterIterator::ONLY_FILES, static::toAbsolute($onlyFiles)],
+            [FileTypeFilterIterator::ONLY_DIRECTORIES, static::toAbsolute($onlyDirectories)],
         ];
     }
 }

diff --git a/Tests/Iterator/SortableIteratorTest.php b/Tests/Iterator/SortableIteratorTest.php
@@ -261,13 +261,13 @@ public function getAcceptData()
         ];
 
         return [
-            [SortableIterator::SORT_BY_NAME, $this->toAbsolute($sortByName)],
-            [SortableIterator::SORT_BY_TYPE, $this->toAbsolute($sortByType)],
-            [SortableIterator::SORT_BY_ACCESSED_TIME, $this->toAbsolute($sortByAccessedTime)],
-            [SortableIterator::SORT_BY_CHANGED_TIME, $this->toAbsolute($sortByChangedTime)],
-            [SortableIterator::SORT_BY_MODIFIED_TIME, $this->toAbsolute($sortByModifiedTime)],
-            [SortableIterator::SORT_BY_NAME_NATURAL, $this->toAbsolute($sortByNameNatural)],
-            [function (\SplFileInfo $a, \SplFileInfo $b) { return strcmp($a->getRealPath(), $b->getRealPath()); }, $this->toAbsolute($customComparison)],
+            [SortableIterator::SORT_BY_NAME, static::toAbsolute($sortByName)],
+            [SortableIterator::SORT_BY_TYPE, static::toAbsolute($sortByType)],
+            [SortableIterator::SORT_BY_ACCESSED_TIME, static::toAbsolute($sortByAccessedTime)],
+            [SortableIterator::SORT_BY_CHANGED_TIME, static::toAbsolute($sortByChangedTime)],
+            [SortableIterator::SORT_BY_MODIFIED_TIME, static::toAbsolute($sortByModifiedTime)],
+            [SortableIterator::SORT_BY_NAME_NATURAL, static::toAbsolute($sortByNameNatural)],
+            [function (\SplFileInfo $a, \SplFileInfo $b) { return strcmp($a->getRealPath(), $b->getRealPath()); }, static::toAbsolute($customComparison)],
         ];
     }
 }