Merge pull request #6674 from codeigniter4/dependabot/composer/friendsofphp/php-cs-fixer-approx-3.12.0

kenjis · web-flow · commit a3eedf4055c1 · 2022-10-14T09:25:08.000+09:00
chore: update friendsofphp/php-cs-fixer requirement from ~3.11.0 to ~3.12.0
diff --git a/admin/framework/composer.json b/admin/framework/composer.json
@@ -17,7 +17,7 @@
     "require-dev": {
         "codeigniter/coding-standard": "^1.5",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "~3.11.0",
+        "friendsofphp/php-cs-fixer": "~3.12.0",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",
         "phpunit/phpunit": "^9.1",
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
     "require-dev": {
         "codeigniter/coding-standard": "^1.5",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "~3.11.0",
+        "friendsofphp/php-cs-fixer": "~3.12.0",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",
         "nexusphp/tachycardia": "^1.0",
diff --git a/tests/_support/Log/Handlers/TestHandler.php b/tests/_support/Log/Handlers/TestHandler.php
@@ -47,8 +47,8 @@ public function __construct(array $config)
      * will stop. Any handlers that have not run, yet, will not
      * be run.
      *
-     * @param $level
-     * @param $message
+     * @param string $level
+     * @param string $message
      */
     public function handle($level, $message): bool
     {
diff --git a/tests/system/Config/MimesTest.php b/tests/system/Config/MimesTest.php
@@ -47,12 +47,8 @@ public function extensionsList()
 
     /**
      * @dataProvider extensionsList
-     *
-     * @param $expected
-     * @param $ext
-     * @param mixed $mime
      */
-    public function testGuessExtensionFromType($expected, $mime)
+    public function testGuessExtensionFromType(?string $expected, string $mime)
     {
         $this->assertSame($expected, Mimes::guessExtensionFromType($mime));
     }
@@ -85,11 +81,8 @@ public function mimesList()
 
     /**
      * @dataProvider mimesList
-     *
-     * @param mixed $expected
-     * @param mixed $ext
      */
-    public function testGuessTypeFromExtension($expected, $ext)
+    public function testGuessTypeFromExtension(?string $expected, string $ext)
     {
         $this->assertSame($expected, Mimes::guessTypeFromExtension($ext));
     }
diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php
@@ -411,9 +411,6 @@ public function stringProvider(): Generator
 
     /**
      * @dataProvider alphaProvider
-     *
-     * @param $str
-     * @param $expected
      */
     public function testAlpha(?string $str, bool $expected): void
     {

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,8 @@ public function __construct(array $config)`
`47`	`47`	`* will stop. Any handlers that have not run, yet, will not`
`48`	`48`	`* be run.`
`49`	`49`	`*`
`50`		`- * @param $level`
`51`		`- * @param $message`
	`50`	`+ * @param string $level`
	`51`	`+ * @param string $message`
`52`	`52`	`*/`
`53`	`53`	`public function handle($level, $message): bool`
`54`	`54`	`{`
Original file line number	Diff line number	Diff line change
`@@ -47,12 +47,8 @@ public function extensionsList()`
`47`	`47`
`48`	`48`	`/**`
`49`	`49`	`* @dataProvider extensionsList`
`50`		`- *`
`51`		`- * @param $expected`
`52`		`- * @param $ext`
`53`		`- * @param mixed $mime`
`54`	`50`	`*/`
`55`		`- public function testGuessExtensionFromType($expected, $mime)`
	`51`	`+ public function testGuessExtensionFromType(?string $expected, string $mime)`
`56`	`52`	`{`
`57`	`53`	`$this->assertSame($expected, Mimes::guessExtensionFromType($mime));`
`58`	`54`	`}`
`@@ -85,11 +81,8 @@ public function mimesList()`
`85`	`81`
`86`	`82`	`/**`
`87`	`83`	`* @dataProvider mimesList`
`88`		`- *`
`89`		`- * @param mixed $expected`
`90`		`- * @param mixed $ext`
`91`	`84`	`*/`
`92`		`- public function testGuessTypeFromExtension($expected, $ext)`
	`85`	`+ public function testGuessTypeFromExtension(?string $expected, string $ext)`
`93`	`86`	`{`
`94`	`87`	`$this->assertSame($expected, Mimes::guessTypeFromExtension($ext));`
`95`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -411,9 +411,6 @@ public function stringProvider(): Generator`
`411`	`411`
`412`	`412`	`/**`
`413`	`413`	`* @dataProvider alphaProvider`
`414`		`- *`
`415`		`- * @param $str`
`416`		`- * @param $expected`
`417`	`414`	`*/`
`418`	`415`	`public function testAlpha(?string $str, bool $expected): void`
`419`	`416`	`{`