From a3bc7c194e96cfbffa17487f5bf10980c848af19 Mon Sep 17 00:00:00 2001 From: ADmad Date: Sun, 14 Jul 2024 19:22:12 +0530 Subject: [PATCH] Allow phpunit 11 --- composer.json | 2 +- tests/TestCase/Date/ConstructTest.php | 3 ++- tests/TestCase/Date/DiffTest.php | 3 ++- tests/TestCase/DateTime/DiffTest.php | 3 ++- tests/TestCase/DateTime/StringsTest.php | 5 +++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 22a3bf1..b8f2301 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ }, "require-dev": { "cakephp/cakephp-codesniffer": "^5.0", - "phpunit/phpunit": "^10.1.0" + "phpunit/phpunit": "^10.1.0 || ^11.1.3" }, "provide": { "psr/clock-implementation": "1.0" diff --git a/tests/TestCase/Date/ConstructTest.php b/tests/TestCase/Date/ConstructTest.php index 5ef598f..ee090df 100644 --- a/tests/TestCase/Date/ConstructTest.php +++ b/tests/TestCase/Date/ConstructTest.php @@ -20,6 +20,7 @@ use DateTimeImmutable; use DateTimeZone; use InvalidArgumentException; +use PHPUnit\Framework\Attributes\DataProvider; /** * Test constructors for Date objects. @@ -68,9 +69,9 @@ public static function inputTimeProvider() } /** - * @dataProvider inputTimeProvider * @return void */ + #[DataProvider('inputTimeProvider')] public function testConstructWithTimeParts($time) { $date = new ChronosDate($time); diff --git a/tests/TestCase/Date/DiffTest.php b/tests/TestCase/Date/DiffTest.php index ffa06bd..e78b540 100644 --- a/tests/TestCase/Date/DiffTest.php +++ b/tests/TestCase/Date/DiffTest.php @@ -19,6 +19,7 @@ use Cake\Chronos\Test\TestCase\TestCase; use Closure; use DatePeriod; +use PHPUnit\Framework\Attributes\DataProvider; class DiffTest extends TestCase { @@ -322,9 +323,9 @@ public static function diffForHumansProvider() } /** - * @dataProvider diffForHumansProvider * @return void */ + #[DataProvider('diffForHumansProvider')] public function testDiffForHumansRelative($now, $date, $expected) { $this->assertSame($expected, $now->diffForHumans($date)); diff --git a/tests/TestCase/DateTime/DiffTest.php b/tests/TestCase/DateTime/DiffTest.php index a82b0e7..90abb7e 100644 --- a/tests/TestCase/DateTime/DiffTest.php +++ b/tests/TestCase/DateTime/DiffTest.php @@ -20,6 +20,7 @@ use Closure; use DatePeriod; use DateTimeZone; +use PHPUnit\Framework\Attributes\DataProvider; class DiffTest extends TestCase { @@ -584,9 +585,9 @@ public static function diffForHumansProvider() } /** - * @dataProvider diffForHumansProvider * @return void */ + #[DataProvider('diffForHumansProvider')] public function testDiffForHumansRelative($now, $date, $expected) { $this->assertSame($expected, $now->diffForHumans($date)); diff --git a/tests/TestCase/DateTime/StringsTest.php b/tests/TestCase/DateTime/StringsTest.php index 775a387..72d0b74 100644 --- a/tests/TestCase/DateTime/StringsTest.php +++ b/tests/TestCase/DateTime/StringsTest.php @@ -18,6 +18,7 @@ use Cake\Chronos\Chronos; use Cake\Chronos\Test\TestCase\TestCase; use DateTime; +use PHPUnit\Framework\Attributes\DataProvider; class StringsTest extends TestCase { @@ -180,9 +181,9 @@ public static function toQuarterProvider() /** * testToQuarter method * - * @dataProvider toQuarterProvider * @return void */ + #[DataProvider('toQuarterProvider')] public function testToQuarter($date, $expected, $range = false) { $this->assertSame($expected, (new Chronos($date))->toQuarter($range)); @@ -206,9 +207,9 @@ public static function toWeekProvider() /** * testToWeek method * - * @dataProvider toWeekProvider * @return void */ + #[DataProvider('toWeekProvider')] public function testToWeek($date, $expected) { $this->assertSame($expected, (new Chronos($date))->toWeek());