Merge pull request #455 from cakephp/phpunit-11

Allow phpunit 11

.phive/phars.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpstan" version="1.10.22" installed="1.10.22" location="./tools/phpstan" copy="false"/>
-  <phar name="psalm" version="5.13.1" installed="5.13.1" location="./tools/psalm" copy="false"/>
+  <phar name="phpstan" version="1.11.7" installed="1.11.7" location="./tools/phpstan" copy="false"/>
+  <phar name="psalm" version="5.25.0" installed="5.25.0" location="./tools/psalm" copy="false"/>
 </phive>

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"

phpstan.neon

@@ -1,9 +1,9 @@
 parameters:
 	level: 8
-	checkMissingIterableValueType: false
-	checkGenericClassInNonGenericObjectType: false
 	treatPhpDocTypesAsCertain: false
 	bootstrapFiles:
 		- tests/bootstrap.php
 	paths:
 		- src/
+	ignoreErrors:
+		- identifier: missingType.iterableValue

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);

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));

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));

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());