diff options
Diffstat (limited to 'tests/lib/NaturalSortTest.php')
| -rw-r--r-- | tests/lib/NaturalSortTest.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/lib/NaturalSortTest.php b/tests/lib/NaturalSortTest.php index 3a07c5ceb66..48d09f03087 100644 --- a/tests/lib/NaturalSortTest.php +++ b/tests/lib/NaturalSortTest.php @@ -1,4 +1,5 @@ <?php + /** * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors * SPDX-FileCopyrightText: 2016 ownCloud, Inc. @@ -7,25 +8,24 @@ namespace Test; +use OC\NaturalSort; +use OC\NaturalSort_DefaultCollator; + class NaturalSortTest extends \Test\TestCase { - /** - * @dataProvider naturalSortDataProvider - */ + #[\PHPUnit\Framework\Attributes\DataProvider('naturalSortDataProvider')] public function testNaturalSortCompare($array, $sorted): void { if (!class_exists('Collator')) { $this->markTestSkipped('The intl module is not available, natural sorting might not work as expected.'); return; } - $comparator = \OC\NaturalSort::getInstance(); + $comparator = NaturalSort::getInstance(); usort($array, [$comparator, 'compare']); $this->assertEquals($sorted, $array); } - /** - * @dataProvider defaultCollatorDataProvider - */ + #[\PHPUnit\Framework\Attributes\DataProvider('defaultCollatorDataProvider')] public function testDefaultCollatorCompare($array, $sorted): void { - $comparator = new \OC\NaturalSort(new \OC\NaturalSort_DefaultCollator()); + $comparator = new NaturalSort(new NaturalSort_DefaultCollator()); usort($array, [$comparator, 'compare']); $this->assertEquals($sorted, $array); } @@ -35,7 +35,7 @@ class NaturalSortTest extends \Test\TestCase { * Must provide the same result as in core/js/tests/specs/coreSpec.js * @return array test cases */ - public function naturalSortDataProvider() { + public static function naturalSortDataProvider(): array { return [ // different casing [ @@ -189,7 +189,7 @@ class NaturalSortTest extends \Test\TestCase { * Must provide the same result as in core/js/tests/specs/coreSpec.js * @return array test cases */ - public function defaultCollatorDataProvider() { + public static function defaultCollatorDataProvider(): array { return [ // different casing [ |