From adb88adb25a5c5d4503e2a6fcdaea72f654d971e Mon Sep 17 00:00:00 2001 From: W0rma Date: Wed, 31 Jul 2024 11:16:00 +0200 Subject: [PATCH] Bump PHPUnit version to 10 --- composer.json | 2 +- .../Pagination/AbstractPaginationTest.php | 5 +- .../Pager/Pagination/CustomParameterTest.php | 5 +- .../Pagination/DefaultLimitOptionTest.php | 9 +- .../Pagination/PaginationInterfaceTest.php | 13 +-- tests/Test/Pager/Pagination/PaginatorTest.php | 9 +- .../PreventPageOutOfRangeOptionTest.php | 21 ++-- tests/Test/Pager/Pagination/SlidingTest.php | 17 +--- .../Pager/Pagination/TraversableItemsTest.php | 5 +- tests/Test/Pager/PaginatorTest.php | 9 +- .../Filtration/Doctrine/ORM/AllowListTest.php | 13 +-- .../Filtration/Doctrine/ORM/QueryTest.php | 97 +++++-------------- .../Filtration/FiltrationSubscriberTest.php | 5 +- .../Pager/Subscriber/Paginate/ArrayTest.php | 17 +--- .../Paginate/Callback/CallbackTest.php | 9 +- .../Paginate/Doctrine/CollectionTest.php | 17 +--- .../Doctrine/DBALQueryBuilderTest.php | 5 +- .../Doctrine/ODM/MongoDB/GridFsTest.php | 5 +- .../Doctrine/ODM/MongoDB/QueryBuilderTest.php | 5 +- .../Doctrine/ODM/MongoDB/QueryTest.php | 9 +- .../ODM/PHPCR/QueryBuilderSubscriberTest.php | 5 +- .../ODM/PHPCR/QuerySubscriberTest.php | 9 +- .../Doctrine/ORM/AdvancedQueryTest.php | 20 ++-- .../Doctrine/ORM/CompositeKeyTest.php | 5 +- .../Doctrine/ORM/QueryBuilderTest.php | 5 +- .../Paginate/Doctrine/ORM/QueryTest.php | 13 +-- .../Paginate/PaginationSubscriberTest.php | 5 +- .../Paginate/SolariumQuerySubscriberTest.php | 5 +- .../Sortable/ArraySubscriberTest.php | 20 ++-- .../Doctrine/ODM/MongoDB/AllowListTest.php | 9 +- .../Doctrine/ODM/MongoDB/QueryTest.php | 9 +- .../Sortable/Doctrine/ORM/AllowListTest.php | 9 +- .../Sortable/Doctrine/ORM/QueryTest.php | 33 ++----- .../Sortable/SolariumQuerySubscriberTest.php | 5 +- .../Sortable/SortableSubscriberTest.php | 5 +- 35 files changed, 136 insertions(+), 298 deletions(-) diff --git a/composer.json b/composer.json index 6ef90249..614e75fa 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "doctrine/orm": "^2.13 || ^3.0", "doctrine/phpcr-odm": "^1.8 || ^2.0", "jackalope/jackalope-doctrine-dbal": "^1.12 || ^2.0", - "phpunit/phpunit": "^9.6", + "phpunit/phpunit": "^10.5.29", "propel/propel1": "^1.7", "ruflin/elastica": "^7.0", "solarium/solarium": "^6.0", diff --git a/tests/Test/Pager/Pagination/AbstractPaginationTest.php b/tests/Test/Pager/Pagination/AbstractPaginationTest.php index 023bb1e2..6d0a8db1 100644 --- a/tests/Test/Pager/Pagination/AbstractPaginationTest.php +++ b/tests/Test/Pager/Pagination/AbstractPaginationTest.php @@ -6,15 +6,14 @@ use Knp\Component\Pager\Event\Subscriber\Paginate\ArraySubscriber; use Knp\Component\Pager\Paginator; use Knp\Component\Pager\PaginatorInterface; +use PHPUnit\Framework\Attributes\Test; use Symfony\Component\EventDispatcher\EventDispatcher; use Test\Mock\PaginationSubscriber as MockPaginationSubscriber; use Test\Tool\BaseTestCase; final class AbstractPaginationTest extends BaseTestCase { - /** - * @test - */ + #[Test] public function shouldCustomizeParameterNames(): void { $dispatcher = new EventDispatcher; diff --git a/tests/Test/Pager/Pagination/CustomParameterTest.php b/tests/Test/Pager/Pagination/CustomParameterTest.php index 176d5e48..6774c388 100644 --- a/tests/Test/Pager/Pagination/CustomParameterTest.php +++ b/tests/Test/Pager/Pagination/CustomParameterTest.php @@ -4,6 +4,7 @@ use Knp\Component\Pager\ArgumentAccess\ArgumentAccessInterface; use Knp\Component\Pager\Paginator; +use PHPUnit\Framework\Attributes\Test; use Symfony\Component\EventDispatcher\EventDispatcher; use Test\Mock\CustomParameterSubscriber; use Test\Mock\PaginationSubscriber as MockPaginationSubscriber; @@ -11,9 +12,7 @@ final class CustomParameterTest extends BaseTestCase { - /** - * @test - */ + #[Test] public function shouldGiveCustomParametersToPaginationView(): void { $dispatcher = new EventDispatcher; diff --git a/tests/Test/Pager/Pagination/DefaultLimitOptionTest.php b/tests/Test/Pager/Pagination/DefaultLimitOptionTest.php index 76fcf969..3f659e82 100644 --- a/tests/Test/Pager/Pagination/DefaultLimitOptionTest.php +++ b/tests/Test/Pager/Pagination/DefaultLimitOptionTest.php @@ -3,13 +3,12 @@ namespace Test\Pager\Pagination; use Knp\Component\Pager\PaginatorInterface; +use PHPUnit\Framework\Attributes\Test; use Test\Tool\BaseTestCase; final class DefaultLimitOptionTest extends BaseTestCase { - /** - * @test - */ + #[Test] public function shouldBeAbleToHandleNullLimit(): void { $p = $this->getPaginatorInstance(); @@ -20,9 +19,7 @@ public function shouldBeAbleToHandleNullLimit(): void $this->assertEquals(PaginatorInterface::DEFAULT_LIMIT_VALUE, $pagination['numItemsPerPage']); } - /** - * @test - */ + #[Test] public function shouldBeAbleToOverwriteDefaultLimit(): void { $p = $this->getPaginatorInstance(); diff --git a/tests/Test/Pager/Pagination/PaginationInterfaceTest.php b/tests/Test/Pager/Pagination/PaginationInterfaceTest.php index 36b7fcf1..a9c280d7 100644 --- a/tests/Test/Pager/Pagination/PaginationInterfaceTest.php +++ b/tests/Test/Pager/Pagination/PaginationInterfaceTest.php @@ -3,6 +3,7 @@ namespace Test\Pager\Pagination; use Knp\Component\Pager\Pagination\PaginationInterface; +use PHPUnit\Framework\Attributes\Test; use Test\Tool\BaseTestCase; final class PaginationInterfaceTest extends BaseTestCase @@ -14,17 +15,13 @@ protected function setUp(): void $this->reflection = new \ReflectionClass(PaginationInterface::class); } - /** - * @test - */ + #[Test] public function shouldBeCountable(): void { $this->assertTrue($this->reflection->implementsInterface(\Countable::class)); } - /** - * @test - */ + #[Test] public function shouldBeTraversable(): void { $this->assertTrue($this->reflection->implementsInterface(\Traversable::class)); @@ -32,9 +29,7 @@ public function shouldBeTraversable(): void $this->assertFalse($this->reflection->implementsInterface(\IteratorAggregate::class)); } - /** - * @test - */ + #[Test] public function shouldBeArrayAccessible(): void { $this->assertTrue($this->reflection->implementsInterface(\ArrayAccess::class)); diff --git a/tests/Test/Pager/Pagination/PaginatorTest.php b/tests/Test/Pager/Pagination/PaginatorTest.php index 54912146..0fc9d2da 100644 --- a/tests/Test/Pager/Pagination/PaginatorTest.php +++ b/tests/Test/Pager/Pagination/PaginatorTest.php @@ -4,13 +4,12 @@ use Knp\Component\Pager\Exception\PageLimitInvalidException; use Knp\Component\Pager\Exception\PageNumberInvalidException; +use PHPUnit\Framework\Attributes\Test; use Test\Tool\BaseTestCase; final class PaginatorTest extends BaseTestCase { - /** - * @test - */ + #[Test] public function shouldThrowExceptionIfPageIsInvalid(): void { $this->expectException(PageNumberInvalidException::class); @@ -19,9 +18,7 @@ public function shouldThrowExceptionIfPageIsInvalid(): void $paginator->paginate(['a', 'b'], 0, 10); } - /** - * @test - */ + #[Test] public function shouldThrowExceptionIfLimitIsInvalid(): void { $this->expectException(PageLimitInvalidException::class); diff --git a/tests/Test/Pager/Pagination/PreventPageOutOfRangeOptionTest.php b/tests/Test/Pager/Pagination/PreventPageOutOfRangeOptionTest.php index ed55f408..131568f1 100644 --- a/tests/Test/Pager/Pagination/PreventPageOutOfRangeOptionTest.php +++ b/tests/Test/Pager/Pagination/PreventPageOutOfRangeOptionTest.php @@ -4,13 +4,12 @@ use Knp\Component\Pager\Exception\PageNumberOutOfRangeException; use Knp\Component\Pager\PaginatorInterface; +use PHPUnit\Framework\Attributes\Test; use Test\Tool\BaseTestCase; final class PreventPageOutOfRangeOptionTest extends BaseTestCase { - /** - * @test - */ + #[Test] public function shouldBeAbleToHandleOutOfRangePageNumberAsArgument(): void { $p = $this->getPaginatorInstance(); @@ -31,9 +30,7 @@ public function shouldBeAbleToHandleOutOfRangePageNumberAsArgument(): void $p->paginate($items, 10, 10, [PaginatorInterface::PAGE_OUT_OF_RANGE => PaginatorInterface::PAGE_OUT_OF_RANGE_THROW_EXCEPTION]); } - /** - * @test - */ + #[Test] public function shouldBeAbleToHandleOutOfRangePageNumberAsArgumentWithEmptyList(): void { $p = $this->getPaginatorInstance(); @@ -54,9 +51,7 @@ public function shouldBeAbleToHandleOutOfRangePageNumberAsArgumentWithEmptyList( $p->paginate($items, 10, 10, [PaginatorInterface::PAGE_OUT_OF_RANGE => PaginatorInterface::PAGE_OUT_OF_RANGE_THROW_EXCEPTION]); } - /** - * @test - */ + #[Test] public function shouldBeAbleToHandleOutOfRangePageNumberAsDefaultOption(): void { $p = $this->getPaginatorInstance(); @@ -83,9 +78,7 @@ public function shouldBeAbleToHandleOutOfRangePageNumberAsDefaultOption(): void $p->paginate($items, 10, 10); } - /** - * @test - */ + #[Test] public function shouldBeAbleToGetMaxPageWhenExceptionIsThrown(): void { $p = $this->getPaginatorInstance(); @@ -98,9 +91,7 @@ public function shouldBeAbleToGetMaxPageWhenExceptionIsThrown(): void } } - /** - * @test - */ + #[Test] public function shouldBeAbleToTreatFirstPageAsValidWithEmptyList(): void { $p = $this->getPaginatorInstance(); diff --git a/tests/Test/Pager/Pagination/SlidingTest.php b/tests/Test/Pager/Pagination/SlidingTest.php index 479c0055..f7e2eb56 100644 --- a/tests/Test/Pager/Pagination/SlidingTest.php +++ b/tests/Test/Pager/Pagination/SlidingTest.php @@ -2,13 +2,12 @@ namespace Test\Pager\Pagination; +use PHPUnit\Framework\Attributes\Test; use Test\Tool\BaseTestCase; final class SlidingTest extends BaseTestCase { - /** - * @test - */ + #[Test] public function shouldBeAbleToProducePagination(): void { $p = $this->getPaginatorInstance(); @@ -35,9 +34,7 @@ public function shouldBeAbleToProducePagination(): void $this->assertEquals(10, $pagination['lastItemNumber']); } - /** - * @test - */ + #[Test] public function shouldBeAbleToProduceWiderPagination(): void { $p = $this->getPaginatorInstance(); @@ -62,9 +59,7 @@ public function shouldBeAbleToProduceWiderPagination(): void $this->assertEquals(20, $pagination['lastItemNumber']); } - /** - * @test - */ + #[Test] public function shouldHandleOddAndEvenRange(): void { $p = $this->getPaginatorInstance(); @@ -88,9 +83,7 @@ public function shouldHandleOddAndEvenRange(): void $this->assertEquals(5, $pagination['lastPageInRange']); } - /** - * @test - */ + #[Test] public function shouldNotFallbackToPageInCaseIfExceedsItemLimit(): void { $p = $this->getPaginatorInstance(); diff --git a/tests/Test/Pager/Pagination/TraversableItemsTest.php b/tests/Test/Pager/Pagination/TraversableItemsTest.php index e0fcbfa6..2cd2222c 100644 --- a/tests/Test/Pager/Pagination/TraversableItemsTest.php +++ b/tests/Test/Pager/Pagination/TraversableItemsTest.php @@ -2,13 +2,12 @@ namespace Test\Pager\Pagination; +use PHPUnit\Framework\Attributes\Test; use Test\Tool\BaseTestCase; final class TraversableItemsTest extends BaseTestCase { - /** - * @test - */ + #[Test] public function shouldBeAbleToUseTraversableItems(): void { $p = $this->getPaginatorInstance(); diff --git a/tests/Test/Pager/PaginatorTest.php b/tests/Test/Pager/PaginatorTest.php index ba13a6ad..e41fcde7 100644 --- a/tests/Test/Pager/PaginatorTest.php +++ b/tests/Test/Pager/PaginatorTest.php @@ -3,14 +3,13 @@ namespace Test\Pager; use Knp\Component\Pager\Event\Subscriber\Paginate\PaginationSubscriber; +use PHPUnit\Framework\Attributes\Test; use Symfony\Component\EventDispatcher\EventDispatcher; use Test\Tool\BaseTestCase; final class PaginatorTest extends BaseTestCase { - /** - * @test - */ + #[Test] public function shouldNotBeAbleToPaginateWithoutListeners(): void { $this->expectException(\RuntimeException::class); @@ -19,9 +18,7 @@ public function shouldNotBeAbleToPaginateWithoutListeners(): void $paginator->paginate([]); } - /** - * @test - */ + #[Test] public function shouldFailToPaginateUnsupportedValue(): void { $this->expectException(\RuntimeException::class); diff --git a/tests/Test/Pager/Subscriber/Filtration/Doctrine/ORM/AllowListTest.php b/tests/Test/Pager/Subscriber/Filtration/Doctrine/ORM/AllowListTest.php index a0cddd2c..b2c41023 100644 --- a/tests/Test/Pager/Subscriber/Filtration/Doctrine/ORM/AllowListTest.php +++ b/tests/Test/Pager/Subscriber/Filtration/Doctrine/ORM/AllowListTest.php @@ -7,15 +7,14 @@ use Knp\Component\Pager\Event\Subscriber\Paginate\PaginationSubscriber; use Knp\Component\Pager\Paginator; use Knp\Component\Pager\PaginatorInterface; +use PHPUnit\Framework\Attributes\Test; use Symfony\Component\EventDispatcher\EventDispatcher; use Test\Fixture\Entity\Article; use Test\Tool\BaseTestCaseORM; final class AllowListTest extends BaseTestCaseORM { - /** - * @test - */ + #[Test] public function shouldAllowListFiltrationFields(): void { $this->expectException(\UnexpectedValueException::class); @@ -43,9 +42,7 @@ public function shouldAllowListFiltrationFields(): void $p->paginate($query, 1, 10, \compact(PaginatorInterface::FILTER_FIELD_ALLOW_LIST)); } - /** - * @test - */ + #[Test] public function shouldFilterWithoutSpecificAllowList(): void { $this->populate(); @@ -63,9 +60,7 @@ public function shouldFilterWithoutSpecificAllowList(): void self::assertEquals('autumn', $items[0]->getTitle()); } - /** - * @test - */ + #[Test] public function shouldFilterWithoutSpecificAllowList2(): void { $this->populate(); diff --git a/tests/Test/Pager/Subscriber/Filtration/Doctrine/ORM/QueryTest.php b/tests/Test/Pager/Subscriber/Filtration/Doctrine/ORM/QueryTest.php index 790ec74a..e9be9429 100644 --- a/tests/Test/Pager/Subscriber/Filtration/Doctrine/ORM/QueryTest.php +++ b/tests/Test/Pager/Subscriber/Filtration/Doctrine/ORM/QueryTest.php @@ -12,6 +12,7 @@ use Knp\Component\Pager\Pagination\SlidingPagination; use Knp\Component\Pager\Paginator; use Knp\Component\Pager\PaginatorInterface; +use PHPUnit\Framework\Attributes\Test; use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\HttpFoundation\RequestStack; use Test\Fixture\Entity\Article; @@ -19,9 +20,7 @@ final class QueryTest extends BaseTestCaseORM { - /** - * @test - */ + #[Test] public function shouldHandleApcQueryCache(): void { if (!\extension_loaded('apc') || !\ini_get('apc.enable_cli')) { @@ -60,9 +59,7 @@ public function shouldHandleApcQueryCache(): void $p->paginate($query, 1, 10); } - /** - * @test - */ + #[Test] public function shouldFilterSimpleDoctrineQuery(): void { $em = $this->getMockSqliteEntityManager(); @@ -92,9 +89,7 @@ public function shouldFilterSimpleDoctrineQuery(): void $this->assertEquals('SELECT a0_.id AS id_0, a0_.title AS title_1, a0_.enabled AS enabled_2 FROM Article a0_ WHERE a0_.title LIKE \'%er\' LIMIT 10', $executed[1]); } - /** - * @test - */ + #[Test] public function shouldFilterSimpleDoctrineQueryWithoutWildcard(): void { $em = $this->getMockSqliteEntityManager(); @@ -123,9 +118,7 @@ public function shouldFilterSimpleDoctrineQueryWithoutWildcard(): void $this->assertEquals('SELECT a0_.id AS id_0, a0_.title AS title_1, a0_.enabled AS enabled_2 FROM Article a0_ WHERE a0_.title LIKE \'summer\' LIMIT 10', $executed[1]); } - /** - * @test - */ + #[Test] public function shouldFilterBooleanFilterValuesWithInteger(): void { $em = $this->getMockSqliteEntityManager(); @@ -153,9 +146,7 @@ public function shouldFilterBooleanFilterValuesWithInteger(): void $this->assertEquals('SELECT a0_.id AS id_0, a0_.title AS title_1, a0_.enabled AS enabled_2 FROM Article a0_ WHERE a0_.enabled = 1 LIMIT 10', $executed[1]); } - /** - * @test - */ + #[Test] public function shouldFilterBooleanFilterValues(): void { $em = $this->getMockSqliteEntityManager(); @@ -183,9 +174,7 @@ public function shouldFilterBooleanFilterValues(): void $this->assertEquals('SELECT a0_.id AS id_0, a0_.title AS title_1, a0_.enabled AS enabled_2 FROM Article a0_ WHERE a0_.enabled = 1 LIMIT 10', $executed[1]); } - /** - * @test - */ + #[Test] public function shouldFilterBooleanFilterValuesWithZero(): void { $em = $this->getMockSqliteEntityManager(); @@ -212,9 +201,7 @@ public function shouldFilterBooleanFilterValuesWithZero(): void $this->assertEquals('SELECT a0_.id AS id_0, a0_.title AS title_1, a0_.enabled AS enabled_2 FROM Article a0_ WHERE a0_.enabled = 0 LIMIT 10', $executed[1]); } - /** - * @test - */ + #[Test] public function shouldFilterBooleanFilterValuesFalse(): void { $em = $this->getMockSqliteEntityManager(); @@ -241,9 +228,7 @@ public function shouldFilterBooleanFilterValuesFalse(): void $this->assertEquals('SELECT a0_.id AS id_0, a0_.title AS title_1, a0_.enabled AS enabled_2 FROM Article a0_ WHERE a0_.enabled = 0 LIMIT 10', $executed[1]); } - /** - * @test - */ + #[Test] public function shouldNotFilterInvalidBooleanFilterValues(): void { $em = $this->getMockSqliteEntityManager(); @@ -269,9 +254,7 @@ public function shouldNotFilterInvalidBooleanFilterValues(): void $this->assertEquals('SELECT a0_.id AS id_0, a0_.title AS title_1, a0_.enabled AS enabled_2 FROM Article a0_ LIMIT 10', $executed[1]); } - /** - * @test - */ + #[Test] public function shouldFilterNumericFilterValues(): void { $em = $this->getMockSqliteEntityManager(); @@ -298,9 +281,7 @@ public function shouldFilterNumericFilterValues(): void $this->assertEquals('SELECT a0_.id AS id_0, a0_.title AS title_1, a0_.enabled AS enabled_2 FROM Article a0_ WHERE a0_.title LIKE \'0\' LIMIT 10', $executed[1]); } - /** - * @test - */ + #[Test] public function shouldFilterNumericFilterValuesOne(): void { $em = $this->getMockSqliteEntityManager(); @@ -328,9 +309,7 @@ public function shouldFilterNumericFilterValuesOne(): void $this->assertEquals('SELECT a0_.id AS id_0, a0_.title AS title_1, a0_.enabled AS enabled_2 FROM Article a0_ WHERE a0_.title LIKE \'1\' LIMIT 10', $executed[1]); } - /** - * @test - */ + #[Test] public function shouldFilterComplexDoctrineQuery(): void { $em = $this->getMockSqliteEntityManager(); @@ -356,9 +335,7 @@ public function shouldFilterComplexDoctrineQuery(): void $this->assertEquals('SELECT a0_.id AS id_0, a0_.title AS title_1, a0_.enabled AS enabled_2 FROM Article a0_ WHERE a0_.title LIKE \'%er\' AND a0_.title <> \'\' AND (a0_.title LIKE \'summer\' OR a0_.title LIKE \'spring\') LIMIT 10', $executed[1]); } - /** - * @test - */ + #[Test] public function shouldFilterComplexDoctrineQuery2(): void { $em = $this->getMockSqliteEntityManager(); @@ -402,9 +379,7 @@ public function shouldFilterComplexDoctrineQuery2(): void $this->assertEquals('SELECT a0_.id AS id_0, a0_.title AS title_1, a0_.enabled AS enabled_2 FROM Article a0_ WHERE (a0_.id LIKE \'%er\' OR a0_.title LIKE \'%er\') AND a0_.title <> \'\' LIMIT 10', $executed[5]); } - /** - * @test - */ + #[Test] public function shouldFilterComplexDoctrineQuery3(): void { $em = $this->getMockSqliteEntityManager(); @@ -431,9 +406,7 @@ public function shouldFilterComplexDoctrineQuery3(): void $this->assertEquals('SELECT a0_.id AS id_0, a0_.title AS title_1, a0_.enabled AS enabled_2 FROM Article a0_ WHERE a0_.title LIKE \'%er\' AND a0_.title <> \'\' LIMIT 10', $executed[1]); } - /** - * @test - */ + #[Test] public function shouldFilterSimpleDoctrineQueryWithMultipleProperties(): void { $em = $this->getMockSqliteEntityManager(); @@ -469,9 +442,7 @@ public function shouldFilterSimpleDoctrineQueryWithMultipleProperties(): void $this->assertEquals('SELECT a0_.id AS id_0, a0_.title AS title_1, a0_.enabled AS enabled_2 FROM Article a0_ WHERE a0_.id LIKE \'%er\' OR a0_.title LIKE \'%er\' LIMIT 10', $executed[3]); } - /** - * @test - */ + #[Test] public function shouldFilterComplexDoctrineQueryWithMultipleProperties(): void { $em = $this->getMockSqliteEntityManager(); @@ -497,9 +468,7 @@ public function shouldFilterComplexDoctrineQueryWithMultipleProperties(): void $this->assertEquals('SELECT a0_.id AS id_0, a0_.title AS title_1, a0_.enabled AS enabled_2 FROM Article a0_ WHERE (a0_.id LIKE \'%er\' OR a0_.title LIKE \'%er\') AND a0_.title <> \'\' AND (a0_.title LIKE \'summer\' OR a0_.title LIKE \'spring\') LIMIT 10', $executed[1]); } - /** - * @test - */ + #[Test] public function shouldValidateFiltrationParameter(): void { $this->expectException(\UnexpectedValueException::class); @@ -519,9 +488,7 @@ public function shouldValidateFiltrationParameter(): void $items = $view->getItems(); } - /** - * @test - */ + #[Test] public function shouldValidateFiltrationParameterWithoutAlias(): void { $this->expectException(\UnexpectedValueException::class); @@ -541,9 +508,7 @@ public function shouldValidateFiltrationParameterWithoutAlias(): void $items = $view->getItems(); } - /** - * @test - */ + #[Test] public function shouldValidateFiltrationParameterExistance(): void { $this->expectException(\UnexpectedValueException::class); @@ -564,9 +529,7 @@ public function shouldValidateFiltrationParameterExistance(): void $items = $view->getItems(); } - /** - * @test - */ + #[Test] public function shouldFilterByAnyAvailableAlias(): void { $em = $this->getMockSqliteEntityManager(); @@ -598,9 +561,7 @@ public function shouldFilterByAnyAvailableAlias(): void $this->assertEquals('SELECT a0_.id AS id_0, a0_.title AS title_1, a0_.enabled AS enabled_2, a0_.title AS title_3 FROM Article a0_ WHERE a0_.title LIKE \'%er\' LIMIT 10', $executed[1]); } - /** - * @test - */ + #[Test] public function shouldNotWorkWithInitialPaginatorEventDispatcher(): void { $em = $this->getMockSqliteEntityManager(); @@ -621,9 +582,7 @@ public function shouldNotWorkWithInitialPaginatorEventDispatcher(): void $this->assertEquals('SELECT a0_.id AS id_0, a0_.title AS title_1, a0_.enabled AS enabled_2 FROM Article a0_ LIMIT 10', $executed[1]); } - /** - * @test - */ + #[Test] public function shouldNotExecuteExtraQueriesWhenCountIsZero(): void { $query = $this @@ -641,9 +600,7 @@ public function shouldNotExecuteExtraQueriesWhenCountIsZero(): void $this->assertEquals(2, $this->queryAnalyzer->getNumExecutedQueries()); } - /** - * @test - */ + #[Test] public function shouldFilterWithEmptyParametersAndDefaults(): void { $em = $this->getMockSqliteEntityManager(); @@ -681,9 +638,7 @@ public function shouldFilterWithEmptyParametersAndDefaults(): void $this->assertEquals('SELECT a0_.id AS id_0, a0_.title AS title_1, a0_.enabled AS enabled_2 FROM Article a0_ WHERE a0_.id LIKE \'summer\' OR a0_.title LIKE \'summer\' LIMIT 10', $executed[5]); } - /** - * @test - */ + #[Test] public function shouldNotFilterWithEmptyParametersAndDefaults(): void { $em = $this->getMockSqliteEntityManager(); @@ -723,9 +678,7 @@ public function shouldNotFilterWithEmptyParametersAndDefaults(): void $this->assertEquals('SELECT a0_.id AS id_0, a0_.title AS title_1, a0_.enabled AS enabled_2 FROM Article a0_ LIMIT 10', $executed[5]); } - /** - * @test - */ + #[Test] public function shouldFilterCaseInsensitiveWhenAsked(): void { $em = $this->getMockSqliteEntityManager(); diff --git a/tests/Test/Pager/Subscriber/Filtration/FiltrationSubscriberTest.php b/tests/Test/Pager/Subscriber/Filtration/FiltrationSubscriberTest.php index 1ef2c212..5c5ee260 100644 --- a/tests/Test/Pager/Subscriber/Filtration/FiltrationSubscriberTest.php +++ b/tests/Test/Pager/Subscriber/Filtration/FiltrationSubscriberTest.php @@ -5,14 +5,13 @@ use Knp\Component\Pager\ArgumentAccess\ArgumentAccessInterface; use Knp\Component\Pager\Event\BeforeEvent; use Knp\Component\Pager\Event\Subscriber\Filtration\FiltrationSubscriber; +use PHPUnit\Framework\Attributes\Test; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Test\Tool\BaseTestCase; final class FiltrationSubscriberTest extends BaseTestCase { - /** - * @test - */ + #[Test] public function shouldRegisterExpectedSubscribersOnlyOnce(): void { $dispatcher = $this->getMockBuilder(EventDispatcherInterface::class)->getMock(); diff --git a/tests/Test/Pager/Subscriber/Paginate/ArrayTest.php b/tests/Test/Pager/Subscriber/Paginate/ArrayTest.php index 88ad72ef..21d1e719 100644 --- a/tests/Test/Pager/Subscriber/Paginate/ArrayTest.php +++ b/tests/Test/Pager/Subscriber/Paginate/ArrayTest.php @@ -6,15 +6,14 @@ use Knp\Component\Pager\Event\Subscriber\Paginate\ArraySubscriber; use Knp\Component\Pager\Pagination\PaginationInterface; use Knp\Component\Pager\Paginator; +use PHPUnit\Framework\Attributes\Test; use Symfony\Component\EventDispatcher\EventDispatcher; use Test\Mock\PaginationSubscriber as MockPaginationSubscriber; use Test\Tool\BaseTestCase; final class ArrayTest extends BaseTestCase { - /** - * @test - */ + #[Test] public function shouldPaginateAnArray(): void { $dispatcher = new EventDispatcher; @@ -33,9 +32,7 @@ public function shouldPaginateAnArray(): void $this->assertEquals(2, $view->getTotalItemCount()); } - /** - * @test - */ + #[Test] public function shouldSlicePaginateAnArray(): void { $dispatcher = new EventDispatcher; @@ -53,9 +50,7 @@ public function shouldSlicePaginateAnArray(): void $this->assertEquals(21, $view->getTotalItemCount()); } - /** - * @test - */ + #[Test] public function shouldSupportPaginateStrategySubscriber(): void { $items = ['first', 'second']; @@ -64,9 +59,7 @@ public function shouldSupportPaginateStrategySubscriber(): void $this->assertInstanceOf(PaginationInterface::class, $view); } - /** - * @test - */ + #[Test] public function shouldPaginateArrayObject(): void { $items = ['first', 'second']; diff --git a/tests/Test/Pager/Subscriber/Paginate/Callback/CallbackTest.php b/tests/Test/Pager/Subscriber/Paginate/Callback/CallbackTest.php index 8cacdf03..149ecc62 100644 --- a/tests/Test/Pager/Subscriber/Paginate/Callback/CallbackTest.php +++ b/tests/Test/Pager/Subscriber/Paginate/Callback/CallbackTest.php @@ -5,6 +5,7 @@ use Knp\Component\Pager\Event\Subscriber\Paginate\Callback\CallbackSubscriber; use Knp\Component\Pager\Pagination\PaginationInterface; use Knp\Component\Pager\Paginator; +use PHPUnit\Framework\Attributes\Test; use Symfony\Component\EventDispatcher\EventDispatcher; use Test\Mock\PaginationSubscriber as MockPaginationSubscriber; use Test\Tool\BaseTestCase; @@ -14,9 +15,7 @@ final class CallbackTest extends BaseTestCase public const ITEMS_PER_PAGE = 10; public const TOTAL_NUMBER_OF_ITEMS = 35; - /** - * @test - */ + #[Test] public function shouldPaginate(): void { $p = $this->givenPaginatorConfigured(); @@ -33,9 +32,7 @@ public function shouldPaginate(): void $this->assertEquals(self::TOTAL_NUMBER_OF_ITEMS, $view->getTotalItemCount()); } - /** - * @test - */ + #[Test] public function shouldSlicePaginate(): void { $p = $this->givenPaginatorConfigured(); diff --git a/tests/Test/Pager/Subscriber/Paginate/Doctrine/CollectionTest.php b/tests/Test/Pager/Subscriber/Paginate/Doctrine/CollectionTest.php index 5920fe97..8eea0caf 100644 --- a/tests/Test/Pager/Subscriber/Paginate/Doctrine/CollectionTest.php +++ b/tests/Test/Pager/Subscriber/Paginate/Doctrine/CollectionTest.php @@ -7,15 +7,14 @@ use Knp\Component\Pager\Event\Subscriber\Paginate\Doctrine\CollectionSubscriber; use Knp\Component\Pager\Pagination\PaginationInterface; use Knp\Component\Pager\Paginator; +use PHPUnit\Framework\Attributes\Test; use Symfony\Component\EventDispatcher\EventDispatcher; use Test\Mock\PaginationSubscriber as MockPaginationSubscriber; use Test\Tool\BaseTestCase; final class CollectionTest extends BaseTestCase { - /** - * @test - */ + #[Test] public function shouldPaginateCollection(): void { $dispatcher = new EventDispatcher; @@ -33,9 +32,7 @@ public function shouldPaginateCollection(): void $this->assertEquals(2, $view->getTotalItemCount()); } - /** - * @test - */ + #[Test] public function shouldLoopOverPagination(): void { $dispatcher = new EventDispatcher; @@ -58,9 +55,7 @@ public function shouldLoopOverPagination(): void $this->assertEquals(2, $counter); } - /** - * @test - */ + #[Test] public function shouldSlicePaginateAnArray(): void { $dispatcher = new EventDispatcher; @@ -78,9 +73,7 @@ public function shouldSlicePaginateAnArray(): void $this->assertEquals(21, $view->getTotalItemCount()); } - /** - * @test - */ + #[Test] public function shouldSupportPaginateStrategySubscriber(): void { $items = new ArrayCollection(['first', 'second']); diff --git a/tests/Test/Pager/Subscriber/Paginate/Doctrine/DBALQueryBuilderTest.php b/tests/Test/Pager/Subscriber/Paginate/Doctrine/DBALQueryBuilderTest.php index 6b62023f..a21395a9 100644 --- a/tests/Test/Pager/Subscriber/Paginate/Doctrine/DBALQueryBuilderTest.php +++ b/tests/Test/Pager/Subscriber/Paginate/Doctrine/DBALQueryBuilderTest.php @@ -3,14 +3,13 @@ namespace Test\Pager\Subscriber\Paginate\Doctrine; use Doctrine\DBAL\Query\QueryBuilder; +use PHPUnit\Framework\Attributes\Test; use Test\Fixture\Entity\Article; use Test\Tool\BaseTestCaseORM; final class DBALQueryBuilderTest extends BaseTestCaseORM { - /** - * @test - */ + #[Test] public function shouldPaginateSimpleDoctrineQuery(): void { $this->populate(); diff --git a/tests/Test/Pager/Subscriber/Paginate/Doctrine/ODM/MongoDB/GridFsTest.php b/tests/Test/Pager/Subscriber/Paginate/Doctrine/ODM/MongoDB/GridFsTest.php index e83df872..e2d54e3d 100644 --- a/tests/Test/Pager/Subscriber/Paginate/Doctrine/ODM/MongoDB/GridFsTest.php +++ b/tests/Test/Pager/Subscriber/Paginate/Doctrine/ODM/MongoDB/GridFsTest.php @@ -2,14 +2,13 @@ namespace Test\Pager\Subscriber\Sortable\Doctrine\ODM\MongoDB; +use PHPUnit\Framework\Attributes\Test; use Test\Fixture\Document\Image; use Test\Tool\BaseTestCaseMongoODM; final class GridFsTest extends BaseTestCaseMongoODM { - /** - * @test - */ + #[Test] public function shouldPaginate(): void { $this->populate(); diff --git a/tests/Test/Pager/Subscriber/Paginate/Doctrine/ODM/MongoDB/QueryBuilderTest.php b/tests/Test/Pager/Subscriber/Paginate/Doctrine/ODM/MongoDB/QueryBuilderTest.php index 3c8477b2..8a2ebb51 100644 --- a/tests/Test/Pager/Subscriber/Paginate/Doctrine/ODM/MongoDB/QueryBuilderTest.php +++ b/tests/Test/Pager/Subscriber/Paginate/Doctrine/ODM/MongoDB/QueryBuilderTest.php @@ -2,14 +2,13 @@ namespace Test\Pager\Subscriber\Paginate\Doctrine\ODM\MongoDB; +use PHPUnit\Framework\Attributes\Test; use Test\Fixture\Document\Article; use Test\Tool\BaseTestCaseMongoODM; final class QueryBuilderTest extends BaseTestCaseMongoODM { - /** - * @test - */ + #[Test] public function shouldSupportPaginateStrategySubscriber(): void { $this->populate(); diff --git a/tests/Test/Pager/Subscriber/Paginate/Doctrine/ODM/MongoDB/QueryTest.php b/tests/Test/Pager/Subscriber/Paginate/Doctrine/ODM/MongoDB/QueryTest.php index 0fccea3b..38777727 100644 --- a/tests/Test/Pager/Subscriber/Paginate/Doctrine/ODM/MongoDB/QueryTest.php +++ b/tests/Test/Pager/Subscriber/Paginate/Doctrine/ODM/MongoDB/QueryTest.php @@ -5,15 +5,14 @@ use Knp\Component\Pager\Event\Subscriber\Paginate\Doctrine\ODM\MongoDB\QuerySubscriber; use Knp\Component\Pager\Event\Subscriber\Paginate\PaginationSubscriber; use Knp\Component\Pager\Pagination\SlidingPagination; +use PHPUnit\Framework\Attributes\Test; use Symfony\Component\EventDispatcher\EventDispatcher; use Test\Fixture\Document\Article; use Test\Tool\BaseTestCaseMongoODM; final class QueryTest extends BaseTestCaseMongoODM { - /** - * @test - */ + #[Test] public function shouldPaginateSimpleDoctrineMongoDBQuery(): void { $this->populate(); @@ -38,9 +37,7 @@ public function shouldPaginateSimpleDoctrineMongoDBQuery(): void $this->assertEquals('winter', $items[1]->getTitle()); } - /** - * @test - */ + #[Test] public function shouldSupportPaginateStrategySubscriber(): void { $query = $this diff --git a/tests/Test/Pager/Subscriber/Paginate/Doctrine/ODM/PHPCR/QueryBuilderSubscriberTest.php b/tests/Test/Pager/Subscriber/Paginate/Doctrine/ODM/PHPCR/QueryBuilderSubscriberTest.php index ad9e77e1..6ec66797 100644 --- a/tests/Test/Pager/Subscriber/Paginate/Doctrine/ODM/PHPCR/QueryBuilderSubscriberTest.php +++ b/tests/Test/Pager/Subscriber/Paginate/Doctrine/ODM/PHPCR/QueryBuilderSubscriberTest.php @@ -2,14 +2,13 @@ namespace Test\Pager\Subscriber\Paginate\Doctrine\ODM\PHPCR; +use PHPUnit\Framework\Attributes\Test; use Test\Fixture\Document\PHPCR\Article; use Test\Tool\BaseTestCasePHPCRODM; final class QueryBuilderSubscriberTest extends BaseTestCasePHPCRODM { - /** - * @test - */ + #[Test] public function shouldSupportPaginateStrategySubscriber(): void { $this->populate(); diff --git a/tests/Test/Pager/Subscriber/Paginate/Doctrine/ODM/PHPCR/QuerySubscriberTest.php b/tests/Test/Pager/Subscriber/Paginate/Doctrine/ODM/PHPCR/QuerySubscriberTest.php index 5b24eb50..56ebe5a6 100644 --- a/tests/Test/Pager/Subscriber/Paginate/Doctrine/ODM/PHPCR/QuerySubscriberTest.php +++ b/tests/Test/Pager/Subscriber/Paginate/Doctrine/ODM/PHPCR/QuerySubscriberTest.php @@ -6,6 +6,7 @@ use Knp\Component\Pager\Event\Subscriber\Paginate\Doctrine\ODM\PHPCR\QuerySubscriber; use Knp\Component\Pager\Pagination\SlidingPagination; use Knp\Component\Pager\Paginator; +use PHPUnit\Framework\Attributes\Test; use Symfony\Component\EventDispatcher\EventDispatcher; use Test\Fixture\Document\PHPCR\Article; use Test\Mock\PaginationSubscriber; @@ -13,9 +14,7 @@ final class QuerySubscriberTest extends BaseTestCasePHPCRODM { - /** - * @test - */ + #[Test] public function shouldPaginateSimpleDoctrinePHPCRQuery(): void { $this->populate(); @@ -42,9 +41,7 @@ public function shouldPaginateSimpleDoctrinePHPCRQuery(): void $this->assertEquals('winter', $items->last()->getTitle()); } - /** - * @test - */ + #[Test] public function shouldSupportPaginateStrategySubscriber(): void { $this->getMockDocumentManager(); diff --git a/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/AdvancedQueryTest.php b/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/AdvancedQueryTest.php index 60ec79db..5bdf0762 100644 --- a/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/AdvancedQueryTest.php +++ b/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/AdvancedQueryTest.php @@ -3,6 +3,7 @@ namespace Test\Pager\Subscriber\Paginate\Doctrine\ORM; use Doctrine\ORM\Query; +use PHPUnit\Framework\Attributes\Test; use Test\Fixture\Entity\Shop\Product; use Test\Fixture\Entity\Shop\Tag; use Test\Tool\BaseTestCaseORM; @@ -12,9 +13,8 @@ final class AdvancedQueryTest extends BaseTestCaseORM /** * It's not possible to make distinction and predict * count of such query - * - * @test */ + #[Test] public function shouldFailToPaginateMultiRootQuery(): void { $this->expectException(\RuntimeException::class); @@ -33,9 +33,7 @@ public function shouldFailToPaginateMultiRootQuery(): void $view = $p->paginate($q, 1, 2); } - /** - * @test - */ + #[Test] public function shouldBeAbleToPaginateWithHavingClause(): void { $this->populate(); @@ -54,9 +52,7 @@ public function shouldBeAbleToPaginateWithHavingClause(): void $this->assertCount(3, $view); } - /** - * @test - */ + #[Test] public function shouldBeAbleToPaginateMixedKeyArray(): void { $this->populate(); @@ -76,9 +72,7 @@ public function shouldBeAbleToPaginateMixedKeyArray(): void $this->assertTrue(isset($items[0]['title'])); } - /** - * @test - */ + #[Test] public function shouldBeAbleToPaginateCaseBasedQuery(): void { $this->populate(); @@ -118,9 +112,7 @@ public function shouldBeAbleToPaginateCaseBasedQuery(): void $this->assertEquals(1, $items[0]['relevance']); } - /** - * @test - */ + #[Test] public function shouldUseOutputWalkersIfHinted(): void { $this->populate(); diff --git a/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/CompositeKeyTest.php b/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/CompositeKeyTest.php index 809608a7..d7552545 100644 --- a/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/CompositeKeyTest.php +++ b/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/CompositeKeyTest.php @@ -4,14 +4,13 @@ use Doctrine\ORM\EntityManagerInterface; use Knp\Component\Pager\Event\Subscriber\Paginate\Doctrine\ORM\QuerySubscriber; +use PHPUnit\Framework\Attributes\Test; use Test\Fixture\Entity\Composite; use Test\Tool\BaseTestCaseORM; final class CompositeKeyTest extends BaseTestCaseORM { - /** - * @test - */ + #[Test] public function shouldBeHandledByQueryHintByPassingCount(): void { $p = $this->getPaginatorInstance(); diff --git a/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/QueryBuilderTest.php b/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/QueryBuilderTest.php index ca92e100..f8abaf59 100644 --- a/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/QueryBuilderTest.php +++ b/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/QueryBuilderTest.php @@ -2,14 +2,13 @@ namespace Test\Pager\Subscriber\Paginate\Doctrine\ORM; +use PHPUnit\Framework\Attributes\Test; use Test\Fixture\Entity\Article; use Test\Tool\BaseTestCaseORM; final class QueryBuilderTest extends BaseTestCaseORM { - /** - * @test - */ + #[Test] public function shouldPaginateSimpleDoctrineQuery(): void { $this->populate(); diff --git a/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/QueryTest.php b/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/QueryTest.php index 57b29b56..33c2b6e0 100644 --- a/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/QueryTest.php +++ b/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/QueryTest.php @@ -4,15 +4,14 @@ use Doctrine\ORM\Query; use Knp\Component\Pager\Event\Subscriber\Paginate\Doctrine\ORM\QuerySubscriber; +use PHPUnit\Framework\Attributes\Test; use Test\Fixture\Entity\Shop\Product; use Test\Fixture\Entity\Shop\Tag; use Test\Tool\BaseTestCaseORM; final class QueryTest extends BaseTestCaseORM { - /** - * @test - */ + #[Test] public function shouldUseOutputWalkersIfAskedTo(): void { $this->populate(); @@ -34,9 +33,7 @@ public function shouldUseOutputWalkersIfAskedTo(): void $this->assertCount(3, $view); } - /** - * @test - */ + #[Test] public function shouldNotUseOutputWalkersByDefault(): void { $this->populate(); @@ -56,9 +53,7 @@ public function shouldNotUseOutputWalkersByDefault(): void $this->assertCount(3, $view); } - /** - * @test - */ + #[Test] public function shouldFetchJoinCollectionsIfNeeded(): void { $this->populate(); diff --git a/tests/Test/Pager/Subscriber/Paginate/PaginationSubscriberTest.php b/tests/Test/Pager/Subscriber/Paginate/PaginationSubscriberTest.php index 80bba93e..0d707d1a 100644 --- a/tests/Test/Pager/Subscriber/Paginate/PaginationSubscriberTest.php +++ b/tests/Test/Pager/Subscriber/Paginate/PaginationSubscriberTest.php @@ -5,14 +5,13 @@ use Knp\Component\Pager\ArgumentAccess\ArgumentAccessInterface; use Knp\Component\Pager\Event\BeforeEvent; use Knp\Component\Pager\Event\Subscriber\Paginate\PaginationSubscriber; +use PHPUnit\Framework\Attributes\Test; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Test\Tool\BaseTestCase; final class PaginationSubscriberTest extends BaseTestCase { - /** - * @test - */ + #[Test] public function shouldRegisterExpectedSubscribersOnlyOnce(): void { $dispatcher = $this->getMockBuilder(EventDispatcherInterface::class)->getMock(); diff --git a/tests/Test/Pager/Subscriber/Paginate/SolariumQuerySubscriberTest.php b/tests/Test/Pager/Subscriber/Paginate/SolariumQuerySubscriberTest.php index ee388ad5..c2ecac9e 100644 --- a/tests/Test/Pager/Subscriber/Paginate/SolariumQuerySubscriberTest.php +++ b/tests/Test/Pager/Subscriber/Paginate/SolariumQuerySubscriberTest.php @@ -5,6 +5,7 @@ use Knp\Component\Pager\ArgumentAccess\ArgumentAccessInterface; use Knp\Component\Pager\Event\Subscriber\Paginate\SolariumQuerySubscriber; use Knp\Component\Pager\Paginator; +use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\TestCase; use Symfony\Component\EventDispatcher\EventDispatcher; @@ -12,9 +13,7 @@ final class SolariumQuerySubscriberTest extends TestCase { - /** - * @test - */ + #[Test] public function arrayShouldNotBeHandled(): void { $this->expectException(\RuntimeException::class); diff --git a/tests/Test/Pager/Subscriber/Sortable/ArraySubscriberTest.php b/tests/Test/Pager/Subscriber/Sortable/ArraySubscriberTest.php index 7daf0d75..a8c62fe0 100644 --- a/tests/Test/Pager/Subscriber/Sortable/ArraySubscriberTest.php +++ b/tests/Test/Pager/Subscriber/Sortable/ArraySubscriberTest.php @@ -6,14 +6,14 @@ use Knp\Component\Pager\Event\ItemsEvent; use Knp\Component\Pager\Event\Subscriber\Sortable\ArraySubscriber; use Knp\Component\Pager\PaginatorInterface; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Test; use Test\Fixture\TestItem; use Test\Tool\BaseTestCase; final class ArraySubscriberTest extends BaseTestCase { - /** - * @test - */ + #[Test] public function shouldSort(): void { $array = [ @@ -43,9 +43,7 @@ public function shouldSort(): void $this->assertEquals(3, $array[0]['entry']['sortProperty']); } - /** - * @test - */ + #[Test] public function shouldSortWithCustomCallback(): void { $array = [ @@ -87,9 +85,7 @@ public function shouldSortWithCustomCallback(): void $this->assertEquals('hot', $array[0]['name']); } - /** - * @test - */ + #[Test] public function shouldSortEvenWhenTheSortPropertyIsNotAccessible(): void { $array = [ @@ -119,10 +115,8 @@ public function shouldSortEvenWhenTheSortPropertyIsNotAccessible(): void $this->assertEquals(2, $array[0]['entry']['sortProperty']); } - /** - * @test - * @dataProvider getItemsData - */ + #[Test] + #[DataProvider('getItemsData')] public function shouldBeKeptTheOrderWhenSortPropertyDoesNotExist(array $items): void { $sameSortOrderItems = [ diff --git a/tests/Test/Pager/Subscriber/Sortable/Doctrine/ODM/MongoDB/AllowListTest.php b/tests/Test/Pager/Subscriber/Sortable/Doctrine/ODM/MongoDB/AllowListTest.php index 6789a40d..f2a11946 100644 --- a/tests/Test/Pager/Subscriber/Sortable/Doctrine/ODM/MongoDB/AllowListTest.php +++ b/tests/Test/Pager/Subscriber/Sortable/Doctrine/ODM/MongoDB/AllowListTest.php @@ -3,14 +3,13 @@ namespace Test\Pager\Subscriber\Sortable\Doctrine\ODM\MongoDB; use Knp\Component\Pager\PaginatorInterface; +use PHPUnit\Framework\Attributes\Test; use Test\Fixture\Document\Article; use Test\Tool\BaseTestCaseMongoODM; final class AllowListTest extends BaseTestCaseMongoODM { - /** - * @test - */ + #[Test] public function shouldAllowListSortableFields(): void { $this->expectException(\UnexpectedValueException::class); @@ -35,9 +34,7 @@ public function shouldAllowListSortableFields(): void $view = $p->paginate($query, 1, 10, \compact(PaginatorInterface::SORT_FIELD_ALLOW_LIST)); } - /** - * @test - */ + #[Test] public function shouldSortWithoutSpecificAllowList(): void { $this->populate(); diff --git a/tests/Test/Pager/Subscriber/Sortable/Doctrine/ODM/MongoDB/QueryTest.php b/tests/Test/Pager/Subscriber/Sortable/Doctrine/ODM/MongoDB/QueryTest.php index 1795bb37..efd5dce3 100644 --- a/tests/Test/Pager/Subscriber/Sortable/Doctrine/ODM/MongoDB/QueryTest.php +++ b/tests/Test/Pager/Subscriber/Sortable/Doctrine/ODM/MongoDB/QueryTest.php @@ -6,15 +6,14 @@ use Knp\Component\Pager\Event\Subscriber\Paginate\PaginationSubscriber; use Knp\Component\Pager\Event\Subscriber\Sortable\Doctrine\ODM\MongoDB\QuerySubscriber as Sortable; use Knp\Component\Pager\Paginator; +use PHPUnit\Framework\Attributes\Test; use Symfony\Component\EventDispatcher\EventDispatcher; use Test\Fixture\Document\Article; use Test\Tool\BaseTestCaseMongoODM; final class QueryTest extends BaseTestCaseMongoODM { - /** - * @test - */ + #[Test] public function shouldSortSimpleDoctrineQuery(): void { $this->populate(); @@ -60,9 +59,7 @@ public function shouldSortSimpleDoctrineQuery(): void $this->assertEquals('spring', $items[3]->getTitle()); } - /** - * @test - */ + #[Test] public function shouldSortOnAnyField(): void { $query = $this diff --git a/tests/Test/Pager/Subscriber/Sortable/Doctrine/ORM/AllowListTest.php b/tests/Test/Pager/Subscriber/Sortable/Doctrine/ORM/AllowListTest.php index 47387a36..66ab5061 100644 --- a/tests/Test/Pager/Subscriber/Sortable/Doctrine/ORM/AllowListTest.php +++ b/tests/Test/Pager/Subscriber/Sortable/Doctrine/ORM/AllowListTest.php @@ -3,14 +3,13 @@ namespace Test\Pager\Subscriber\Sortable\Doctrine\ORM; use Knp\Component\Pager\PaginatorInterface; +use PHPUnit\Framework\Attributes\Test; use Test\Fixture\Entity\Article; use Test\Tool\BaseTestCaseORM; final class AllowListTest extends BaseTestCaseORM { - /** - * @test - */ + #[Test] public function shouldAllowListSortableFields(): void { $this->expectException(\UnexpectedValueException::class); @@ -32,9 +31,7 @@ public function shouldAllowListSortableFields(): void $view = $p->paginate($query, 1, 10, \compact(PaginatorInterface::SORT_FIELD_ALLOW_LIST)); } - /** - * @test - */ + #[Test] public function shouldSortWithoutSpecificAllowList(): void { $this->populate(); diff --git a/tests/Test/Pager/Subscriber/Sortable/Doctrine/ORM/QueryTest.php b/tests/Test/Pager/Subscriber/Sortable/Doctrine/ORM/QueryTest.php index df2caace..9038b581 100644 --- a/tests/Test/Pager/Subscriber/Sortable/Doctrine/ORM/QueryTest.php +++ b/tests/Test/Pager/Subscriber/Sortable/Doctrine/ORM/QueryTest.php @@ -13,15 +13,14 @@ use Knp\Component\Pager\Pagination\SlidingPagination; use Knp\Component\Pager\Paginator; use Knp\Component\Pager\PaginatorInterface; +use PHPUnit\Framework\Attributes\Test; use Symfony\Component\EventDispatcher\EventDispatcher; use Test\Fixture\Entity\Article; use Test\Tool\BaseTestCaseORM; final class QueryTest extends BaseTestCaseORM { - /** - * @test - */ + #[Test] public function shouldHandleApcQueryCache(): void { if (!\extension_loaded('apc') || !\ini_get('apc.enable_cli')) { @@ -59,9 +58,7 @@ public function shouldHandleApcQueryCache(): void $view = $p->paginate($query, 1, 10); } - /** - * @test - */ + #[Test] public function shouldSortSimpleDoctrineQuery(): void { $em = $this->getMockSqliteEntityManager(); @@ -92,9 +89,7 @@ public function shouldSortSimpleDoctrineQuery(): void $this->assertEquals('SELECT a0_.id AS id_0, a0_.title AS title_1, a0_.enabled AS enabled_2 FROM Article a0_ ORDER BY a0_.title ASC LIMIT 10', $executed[1]); } - /** - * @test - */ + #[Test] public function shouldSortSimpleDoctrineQuery2(): void { $em = $this->getMockSqliteEntityManager(); @@ -125,9 +120,7 @@ public function shouldSortSimpleDoctrineQuery2(): void $this->assertEquals('SELECT a0_.id AS id_0, a0_.title AS title_1, a0_.enabled AS enabled_2 FROM Article a0_ ORDER BY a0_.title DESC LIMIT 10', $executed[1]); } - /** - * @test - */ + #[Test] public function shouldValidateSortableParameters(): void { $this->expectException(\UnexpectedValueException::class); @@ -142,9 +135,7 @@ public function shouldValidateSortableParameters(): void $view = $p->paginate($query, 1, 10); } - /** - * @test - */ + #[Test] public function shouldSortByAnyAvailableAlias(): void { $em = $this->getMockSqliteEntityManager(); @@ -168,9 +159,7 @@ public function shouldSortByAnyAvailableAlias(): void $this->assertEquals('SELECT a0_.id AS id_0, a0_.title AS title_1, a0_.enabled AS enabled_2, COUNT(a0_.id) AS sclr_3 FROM Article a0_ ORDER BY sclr_3 ASC LIMIT 10', $executed[1]); } - /** - * @test - */ + #[Test] public function shouldWorkWithInitialPaginatorEventDispatcher(): void { $em = $this->getMockSqliteEntityManager(); @@ -193,9 +182,7 @@ public function shouldWorkWithInitialPaginatorEventDispatcher(): void $this->assertEquals('SELECT a0_.id AS id_0, a0_.title AS title_1, a0_.enabled AS enabled_2 FROM Article a0_ ORDER BY a0_.title ASC LIMIT 10', $executed[1]); } - /** - * @test - */ + #[Test] public function shouldNotExecuteExtraQueriesWhenCountIsZero(): void { $query = $this @@ -212,9 +199,7 @@ public function shouldNotExecuteExtraQueriesWhenCountIsZero(): void $this->assertEquals(2, $this->queryAnalyzer->getNumExecutedQueries()); } - /** - * @test - */ + #[Test] public function shouldNotAcceptArrayParameter(): void { if (version_compare(InstalledVersions::getVersion('symfony/http-foundation'), '6.0', '<')) { diff --git a/tests/Test/Pager/Subscriber/Sortable/SolariumQuerySubscriberTest.php b/tests/Test/Pager/Subscriber/Sortable/SolariumQuerySubscriberTest.php index fe900e79..7aa6fc28 100644 --- a/tests/Test/Pager/Subscriber/Sortable/SolariumQuerySubscriberTest.php +++ b/tests/Test/Pager/Subscriber/Sortable/SolariumQuerySubscriberTest.php @@ -5,15 +5,14 @@ use Knp\Component\Pager\ArgumentAccess\ArgumentAccessInterface; use Knp\Component\Pager\Event\Subscriber\Sortable\SolariumQuerySubscriber; use Knp\Component\Pager\Paginator; +use PHPUnit\Framework\Attributes\Test; use Symfony\Component\EventDispatcher\EventDispatcher; use Test\Mock\PaginationSubscriber as MockPaginationSubscriber; use Test\Tool\BaseTestCase; final class SolariumQuerySubscriberTest extends BaseTestCase { - /** - * @test - */ + #[Test] public function testArrayShouldNotBeHandled(): void { $this->expectException(\RuntimeException::class); diff --git a/tests/Test/Pager/Subscriber/Sortable/SortableSubscriberTest.php b/tests/Test/Pager/Subscriber/Sortable/SortableSubscriberTest.php index 72313e94..519700b7 100644 --- a/tests/Test/Pager/Subscriber/Sortable/SortableSubscriberTest.php +++ b/tests/Test/Pager/Subscriber/Sortable/SortableSubscriberTest.php @@ -3,14 +3,13 @@ use Knp\Component\Pager\ArgumentAccess\ArgumentAccessInterface; use Knp\Component\Pager\Event\BeforeEvent; use Knp\Component\Pager\Event\Subscriber\Sortable\SortableSubscriber; +use PHPUnit\Framework\Attributes\Test; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Test\Tool\BaseTestCase; final class SortableSubscriberTest extends BaseTestCase { - /** - * @test - */ + #[Test] public function shouldRegisterExpectedSubscribersOnlyOnce(): void { $dispatcher = $this->getMockBuilder(EventDispatcherInterface::class)->getMock();