Skip to content

Commit 85f2e41

Browse files
Merge branch '5.4' into 6.2
* 5.4: [FrameworkBundle] Improve error message in MicroKernelTrait when using deprecated configureRoutes(RouteCollectionBuilder) with symfony/routing >= 6.0 Add warning about Symfony 5.2 changing pcntl_async_signals [Tests] Fix static calls and Mock var annotation [FrameworkBundle] Fix checkboxes check assertions [Notifier][WebProfilerBundle] Ignore messages whose `getNotification` returns `null` [HttpClient] Fix over-encoding of URL parts to match browser's behavior Fix Psalm job [HttpClient] Fix data collector [Tests] Migrate tests to static data providers [Semaphore] Fix test Fix: Split and clean up tests Remove unused data provider add Sender to the list of bypassed headers
2 parents 5f12afa + c4b6c34 commit 85f2e41

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

Tests/Iterator/DepthRangeFilterIteratorTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ public function getAcceptData()
9595
];
9696

9797
return [
98-
[0, 0, static::toAbsolute($lessThan1)],
99-
[0, 1, static::toAbsolute($lessThanOrEqualTo1)],
98+
[0, 0, self::toAbsolute($lessThan1)],
99+
[0, 1, self::toAbsolute($lessThanOrEqualTo1)],
100100
[2, \PHP_INT_MAX, []],
101-
[1, \PHP_INT_MAX, static::toAbsolute($graterThanOrEqualTo1)],
102-
[1, 1, static::toAbsolute($equalTo1)],
101+
[1, \PHP_INT_MAX, self::toAbsolute($graterThanOrEqualTo1)],
102+
[1, 1, self::toAbsolute($equalTo1)],
103103
];
104104
}
105105
}

Tests/Iterator/ExcludeDirectoryFilterIteratorTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ public function getAcceptData()
105105
];
106106

107107
return [
108-
[['foo'], static::toAbsolute($foo)],
109-
[['fo'], static::toAbsolute($fo)],
110-
[['toto/'], static::toAbsolute($toto)],
108+
[['foo'], self::toAbsolute($foo)],
109+
[['fo'], self::toAbsolute($fo)],
110+
[['toto/'], self::toAbsolute($toto)],
111111
];
112112
}
113113
}

Tests/Iterator/FileTypeFilterIteratorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ public function getAcceptData()
5959
];
6060

6161
return [
62-
[FileTypeFilterIterator::ONLY_FILES, static::toAbsolute($onlyFiles)],
63-
[FileTypeFilterIterator::ONLY_DIRECTORIES, static::toAbsolute($onlyDirectories)],
62+
[FileTypeFilterIterator::ONLY_FILES, self::toAbsolute($onlyFiles)],
63+
[FileTypeFilterIterator::ONLY_DIRECTORIES, self::toAbsolute($onlyDirectories)],
6464
];
6565
}
6666
}

Tests/Iterator/SortableIteratorTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -261,13 +261,13 @@ public function getAcceptData()
261261
];
262262

263263
return [
264-
[SortableIterator::SORT_BY_NAME, static::toAbsolute($sortByName)],
265-
[SortableIterator::SORT_BY_TYPE, static::toAbsolute($sortByType)],
266-
[SortableIterator::SORT_BY_ACCESSED_TIME, static::toAbsolute($sortByAccessedTime)],
267-
[SortableIterator::SORT_BY_CHANGED_TIME, static::toAbsolute($sortByChangedTime)],
268-
[SortableIterator::SORT_BY_MODIFIED_TIME, static::toAbsolute($sortByModifiedTime)],
269-
[SortableIterator::SORT_BY_NAME_NATURAL, static::toAbsolute($sortByNameNatural)],
270-
[function (\SplFileInfo $a, \SplFileInfo $b) { return strcmp($a->getRealPath(), $b->getRealPath()); }, static::toAbsolute($customComparison)],
264+
[SortableIterator::SORT_BY_NAME, self::toAbsolute($sortByName)],
265+
[SortableIterator::SORT_BY_TYPE, self::toAbsolute($sortByType)],
266+
[SortableIterator::SORT_BY_ACCESSED_TIME, self::toAbsolute($sortByAccessedTime)],
267+
[SortableIterator::SORT_BY_CHANGED_TIME, self::toAbsolute($sortByChangedTime)],
268+
[SortableIterator::SORT_BY_MODIFIED_TIME, self::toAbsolute($sortByModifiedTime)],
269+
[SortableIterator::SORT_BY_NAME_NATURAL, self::toAbsolute($sortByNameNatural)],
270+
[function (\SplFileInfo $a, \SplFileInfo $b) { return strcmp($a->getRealPath(), $b->getRealPath()); }, self::toAbsolute($customComparison)],
271271
];
272272
}
273273
}

0 commit comments

Comments
 (0)