Merge pull request #661 from ergebnis/dependabot/composer/friendsofph…

…p/php-cs-fixer-3.12.0 composer(deps): bump friendsofphp/php-cs-fixer from 3.11.0 to 3.12.0
ergebnis · Oct 13, 2022 · ad8a971 · ad8a971
2 parents 64a344e + 2eaf72f
commit ad8a971
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 For a full diff see [`4.9.0...main`][4.9.0...main].
 
+### Changed
+
+- Updated `friendsofphp/php-cs-fixer` ([#661]), by [@dependabot]
+
 ## [`4.9.0`][4.9.0]
 
 For a full diff see [`4.8.0...4.9.0`][4.7.0...4.9.0].
@@ -753,6 +757,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
 [#646]: https://github.com/ergebnis/php-cs-fixer-config/pull/646
 [#651]: https://github.com/ergebnis/php-cs-fixer-config/pull/651
 [#655]: https://github.com/ergebnis/php-cs-fixer-config/pull/655
+[#661]: https://github.com/ergebnis/php-cs-fixer-config/pull/661
 
 [@dependabot]: https://github.com/apps/dependabot
 [@linuxjuggler]: https://github.com/linuxjuggler

diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
   "require": {
     "php": "^7.4 || ^8.0",
     "ext-filter": "*",
-    "friendsofphp/php-cs-fixer": "~3.11.0"
+    "friendsofphp/php-cs-fixer": "~3.12.0"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2.28.3",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Factory.php b/src/Factory.php
@@ -20,7 +20,7 @@ final class Factory
     /**
      * Creates a configuration based on a rule set.
      *
-     * @param array<string, array|bool> $overrideRules
+     * @param array<string, array<string, mixed>|bool> $overrideRules
      *
      * @throws \RuntimeException
      */

diff --git a/src/RuleSet.php b/src/RuleSet.php
@@ -23,7 +23,7 @@ public function name(): string;
     /**
      * Returns an array of rules along with their configuration.
      *
-     * @return array<string, array|bool>
+     * @return array<string, array<string, mixed>|bool>
      */
     public function rules(): array;
 

diff --git a/src/RuleSet/AbstractRuleSet.php b/src/RuleSet/AbstractRuleSet.php
@@ -122,7 +122,7 @@ abstract class AbstractRuleSet implements RuleSet
     protected string $name = '';
 
     /**
-     * @var array<string, array|bool>
+     * @var array<string, array<string, mixed>|bool>
      */
     protected array $rules = [];
     protected int $targetPhpVersion = 0;

diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php
@@ -380,6 +380,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
         'no_unset_cast' => true,
         'no_unset_on_property' => true,
         'no_unused_imports' => true,
+        'no_useless_concat_operator' => false,
         'no_useless_else' => true,
         'no_useless_nullsafe_operator' => false,
         'no_useless_return' => true,

diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php
@@ -381,6 +381,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet
         'no_unset_cast' => true,
         'no_unset_on_property' => true,
         'no_unused_imports' => true,
+        'no_useless_concat_operator' => false,
         'no_useless_else' => true,
         'no_useless_nullsafe_operator' => true,
         'no_useless_return' => true,

diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php
@@ -381,6 +381,7 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet
         'no_unset_cast' => true,
         'no_unset_on_property' => true,
         'no_unused_imports' => true,
+        'no_useless_concat_operator' => false,
         'no_useless_else' => true,
         'no_useless_nullsafe_operator' => true,
         'no_useless_return' => true,

diff --git a/test/Double/Config/RuleSet/DummyRuleSet.php b/test/Double/Config/RuleSet/DummyRuleSet.php
@@ -20,13 +20,13 @@ final class DummyRuleSet implements Config\RuleSet
     private string $name;
 
     /**
-     * @var array<string, array|bool>
+     * @var array<string, array<string, mixed>|bool>
      */
     private array $rules;
     private int $phpVersion;
 
     /**
-     * @param array<string, array|bool> $rules
+     * @param array<string, array<string, mixed>|bool> $rules
      */
     public function __construct(
         string $name,

diff --git a/test/Unit/FactoryTest.php b/test/Unit/FactoryTest.php
@@ -54,7 +54,7 @@ public function testFromRuleSetCreatesConfig(int $targetPhpVersion): void
         $rules = [
             'foo' => true,
             'bar' => [
-                'baz',
+                'baz' => true,
             ],
         ];
 
@@ -93,7 +93,7 @@ public function testFromRuleSetCreatesConfigWithOverrideRules(): void
         $rules = [
             'foo' => true,
             'bar' => [
-                'baz',
+                'baz' => true,
             ],
         ];
 

diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php
@@ -386,6 +386,7 @@ final class Php74Test extends ExplicitRuleSetTestCase
         'no_unset_cast' => true,
         'no_unset_on_property' => true,
         'no_unused_imports' => true,
+        'no_useless_concat_operator' => false,
         'no_useless_else' => true,
         'no_useless_nullsafe_operator' => false,
         'no_useless_return' => true,

diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php
@@ -387,6 +387,7 @@ final class Php80Test extends ExplicitRuleSetTestCase
         'no_unset_cast' => true,
         'no_unset_on_property' => true,
         'no_unused_imports' => true,
+        'no_useless_concat_operator' => false,
         'no_useless_else' => true,
         'no_useless_nullsafe_operator' => true,
         'no_useless_return' => true,

diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php
@@ -387,6 +387,7 @@ final class Php81Test extends ExplicitRuleSetTestCase
         'no_unset_cast' => true,
         'no_unset_on_property' => true,
         'no_unused_imports' => true,
+        'no_useless_concat_operator' => false,
         'no_useless_else' => true,
         'no_useless_nullsafe_operator' => true,
         'no_useless_return' => true,