Update dev dependencies

yiisoft · Dec 2, 2023 · 374fc87 · 374fc87
1 parent b249fae
commit 374fc87
Show file tree

Hide file tree

Showing 19 changed files with 146 additions and 226 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,4 +27,4 @@ phpunit.phar
 # local phpunit config
 /phpunit.xml
 # phpunit cache
-.phpunit.result.cache
+/.phpunit.cache/
diff --git a/composer.json b/composer.json
@@ -25,12 +25,12 @@
         "yiisoft/widget": "^2.1"
     },
     "require-dev": {
-        "maglnet/composer-require-checker": "^4.2",
-        "phpunit/phpunit": "^9.5",
-        "rector/rector": "^0.18.3",
-        "roave/infection-static-analysis-plugin": "^1.18",
+        "maglnet/composer-require-checker": "^4.7",
+        "phpunit/phpunit": "^10.5",
+        "rector/rector": "^0.18.11",
+        "roave/infection-static-analysis-plugin": "^1.34",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.30|^5.6",
+        "vimeo/psalm": "^5.16",
         "yiisoft/test-support": " ^3.0"
     },
     "autoload": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit
-    bootstrap="vendor/autoload.php"
-    colors="true"
-    verbose="true"
-    failOnRisky="true"
-    failOnWarning="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    stopOnFailure="false"
-    executionOrder="random"
-    resolveDependencies="true"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         cacheDirectory=".phpunit.cache"
+         requireCoverageMetadata="false"
+         beStrictAboutCoverageMetadata="true"
+         beStrictAboutOutputDuringTests="true"
+         executionOrder="random"
+         failOnRisky="true"
+         failOnWarning="true"
+         stopOnFailure="false"
+         colors="true"
 >
     <php>
         <ini name="error_reporting" value="-1"/>
@@ -23,10 +22,10 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source>
         <include>
-            <directory>./src</directory>
-            <directory>./config</directory>
+            <directory suffix=".php">./src</directory>
+            <directory suffix=".php">./config</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>
diff --git a/tests/Field/Base/BaseFieldTest.php b/tests/Field/Base/BaseFieldTest.php
@@ -4,6 +4,7 @@
 
 namespace Yiisoft\Form\Tests\Field\Base;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Yiisoft\Form\Tests\Support\StubBaseField;
 use Yiisoft\Form\ThemeContainer;
@@ -19,17 +20,15 @@ protected function setUp(): void
         ThemeContainer::initialize();
     }
 
-    public function dataContainerId(): array
+    public static function dataContainerId(): array
     {
         return [
             ['', null],
             [' id="main"', 'main'],
         ];
     }
 
-    /**
-     * @dataProvider dataContainerId
-     */
+    #[DataProvider('dataContainerId')]
     public function testContainerId(string $expectedId, ?string $id): void
     {
         $result = StubBaseField::widget()
@@ -45,7 +44,7 @@ public function testContainerId(string $expectedId, ?string $id): void
         $this->assertSame($expected, $result);
     }
 
-    public function dataAddContainerClass(): array
+    public static function dataAddContainerClass(): array
     {
         return [
             [' class="main"', []],
@@ -56,11 +55,7 @@ public function dataAddContainerClass(): array
         ];
     }
 
-    /**
-     * @dataProvider dataAddContainerClass
-     *
-     * @param string[] $class
-     */
+    #[DataProvider('dataAddContainerClass')]
     public function testAddContainerClass(string $expectedClassAttribute, array $class): void
     {
         $result = StubBaseField::widget()
@@ -77,7 +72,7 @@ public function testAddContainerClass(string $expectedClassAttribute, array $cla
         $this->assertSame($expected, $result);
     }
 
-    public function dataAddContainerNewClass(): array
+    public static function dataAddContainerNewClass(): array
     {
         return [
             ['', null],
@@ -86,9 +81,7 @@ public function dataAddContainerNewClass(): array
         ];
     }
 
-    /**
-     * @dataProvider dataAddContainerNewClass
-     */
+     #[DataProvider('dataAddContainerNewClass')]
     public function testAddContainerNewClass(string $expectedClassAttribute, ?string $class): void
     {
         $result = StubBaseField::widget()
@@ -104,7 +97,7 @@ public function testAddContainerNewClass(string $expectedClassAttribute, ?string
         $this->assertSame($expected, $result);
     }
 
-    public function dataContainerClass(): array
+    public static function dataContainerClass(): array
     {
         return [
             ['', []],
@@ -117,10 +110,9 @@ public function dataContainerClass(): array
     }
 
     /**
-     * @dataProvider dataContainerClass
-     *
      * @param string[] $class
      */
+    #[DataProvider('dataContainerClass')]
     public function testContainerClass(string $expectedClassAttribute, array $class): void
     {
         $result = StubBaseField::widget()

diff --git a/tests/Field/Base/ButtonFieldTest.php b/tests/Field/Base/ButtonFieldTest.php
@@ -4,6 +4,7 @@
 
 namespace Yiisoft\Form\Tests\Field\Base;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Yiisoft\Form\Tests\Support\StubButtonField;
 use Yiisoft\Form\ThemeContainer;
@@ -96,17 +97,15 @@ public function testButtonAttributes(): void
         $this->assertSame($expected, $result);
     }
 
-    public function dataButtonId(): array
+    public static function dataButtonId(): array
     {
         return [
             ['', null],
             [' id="main"', 'main'],
         ];
     }
 
-    /**
-     * @dataProvider dataButtonId
-     */
+    #[DataProvider('dataButtonId')]
     public function testButtonId(string $expectedId, ?string $id): void
     {
         $result = StubButtonField::widget()
@@ -122,17 +121,15 @@ public function testButtonId(string $expectedId, ?string $id): void
         $this->assertSame($expected, $result);
     }
 
-    public function dataName(): array
+    public static function dataProviderName(): array
     {
         return [
             ['', null],
             [' name="go-btn"', 'go-btn'],
         ];
     }
 
-    /**
-     * @dataProvider dataName
-     */
+    #[DataProvider('dataProviderName')]
     public function testName(string $expectedNameAttribute, ?string $name): void
     {
         $result = StubButtonField::widget()
@@ -238,7 +235,7 @@ public function testForm(): void
         $this->assertSame($expected, $result);
     }
 
-    public function dataAddButtonClass(): array
+    public static function dataAddButtonClass(): array
     {
         return [
             [' class="main"', []],
@@ -250,10 +247,9 @@ public function dataAddButtonClass(): array
     }
 
     /**
-     * @dataProvider dataAddButtonClass
-     *
      * @param string[] $class
      */
+    #[DataProvider('dataAddButtonClass')]
     public function testAddButtonClass(string $expectedClassAttribute, array $class): void
     {
         $result = StubButtonField::widget()
@@ -270,7 +266,7 @@ public function testAddButtonClass(string $expectedClassAttribute, array $class)
         $this->assertSame($expected, $result);
     }
 
-    public function dataAddButtonNewClass(): array
+    public static function dataAddButtonNewClass(): array
     {
         return [
             ['', null],
@@ -279,9 +275,7 @@ public function dataAddButtonNewClass(): array
         ];
     }
 
-    /**
-     * @dataProvider dataAddButtonNewClass
-     */
+    #[DataProvider('dataAddButtonNewClass')]
     public function testAddButtonNewClass(string $expectedClassAttribute, ?string $class): void
     {
         $result = StubButtonField::widget()
@@ -297,7 +291,7 @@ public function testAddButtonNewClass(string $expectedClassAttribute, ?string $c
         $this->assertSame($expected, $result);
     }
 
-    public function dataButtonClass(): array
+    public static function dataButtonClass(): array
     {
         return [
             ['', []],
@@ -310,10 +304,9 @@ public function dataButtonClass(): array
     }
 
     /**
-     * @dataProvider dataButtonClass
-     *
      * @param string[] $class
      */
+    #[DataProvider('dataButtonClass')]
     public function testButtonClass(string $expectedClassAttribute, array $class): void
     {
         $result = StubButtonField::widget()

diff --git a/tests/Field/Base/FieldContentTraitTest.php b/tests/Field/Base/FieldContentTraitTest.php
@@ -4,6 +4,7 @@
 
 namespace Yiisoft\Form\Tests\Field\Base;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Yiisoft\Form\Tests\Support\StringableObject;
 use Yiisoft\Form\Tests\Support\StubFieldContentTrait;
@@ -62,7 +63,7 @@ public function testWithoutDoubleEncode(): void
         $this->assertSame('&lt;b&gt;A &gt; B&lt;/b&gt;', $result);
     }
 
-    public function dataContent(): array
+    public static function dataContent(): array
     {
         return [
             'string' => ['hello', 'hello'],
@@ -75,9 +76,7 @@ public function dataContent(): array
         ];
     }
 
-    /**
-     * @dataProvider dataContent
-     */
+    #[DataProvider('dataContent')]
     public function testContent(string $expected, $content): void
     {
         $object = new StubFieldContentTrait();

diff --git a/tests/Field/Base/InputFieldTest.php b/tests/Field/Base/InputFieldTest.php
@@ -4,6 +4,7 @@
 
 namespace Yiisoft\Form\Tests\Field\Base;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Yiisoft\Form\Tests\Support\StubInputField;
 use Yiisoft\Form\ThemeContainer;
@@ -36,7 +37,7 @@ public function testForm(): void
         $this->assertSame($expected, $result);
     }
 
-    public function dataAddInputClass(): array
+    public static function dataAddInputClass(): array
     {
         return [
             [' class="main"', []],
@@ -48,10 +49,9 @@ public function dataAddInputClass(): array
     }
 
     /**
-     * @dataProvider dataAddInputClass
-     *
      * @param string[] $class
      */
+    #[DataProvider('dataAddInputClass')]
     public function testAddInputClass(string $expectedClassAttribute, array $class): void
     {
         $result = StubInputField::widget()
@@ -70,7 +70,7 @@ public function testAddInputClass(string $expectedClassAttribute, array $class):
         $this->assertSame($expected, $result);
     }
 
-    public function dataAddInputNewClass(): array
+    public static function dataAddInputNewClass(): array
     {
         return [
             ['', null],
@@ -79,9 +79,7 @@ public function dataAddInputNewClass(): array
         ];
     }
 
-    /**
-     * @dataProvider dataAddInputNewClass
-     */
+     #[DataProvider('dataAddInputNewClass')]
     public function testAddInputNewClass(string $expectedClassAttribute, ?string $class): void
     {
         $result = StubInputField::widget()
@@ -99,7 +97,7 @@ public function testAddInputNewClass(string $expectedClassAttribute, ?string $cl
         $this->assertSame($expected, $result);
     }
 
-    public function dataInputClass(): array
+    public static function dataInputClass(): array
     {
         return [
             ['', []],
@@ -112,10 +110,9 @@ public function dataInputClass(): array
     }
 
     /**
-     * @dataProvider dataInputClass
-     *
      * @param string[] $class
      */
+    #[DataProvider('dataInputClass')]
     public function testInputClass(string $expectedClassAttribute, array $class): void
     {
         $result = StubInputField::widget()