Merge pull request #1141 from ergebnis/feature/php-cs-fixer

Enhancement: Update `friendsofphp/php-cs-fixer`
ergebnis · Nov 25, 2024 · 0b71e4a · 0b71e4a
2 parents 0a3e42e + bc3db2f
commit 0b71e4a
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 16 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 [`6.38.0...main`][6.38.0...main].
 
+### Changed
+
+- Updated `friendsofphp/php-cs-fixer` ([#1141]), by [@localheinz]
+
 ## [`6.38.0`][6.38.0]
 
 For a full diff see [`6.37.0...6.38.0`][6.37.0...6.38.0].
@@ -1774,6 +1778,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
 [#1109]: https://github.com/ergebnis/php-cs-fixer-config/pull/1109
 [#1139]: https://github.com/ergebnis/php-cs-fixer-config/pull/1139
 [#1140]: https://github.com/ergebnis/php-cs-fixer-config/pull/1140
+[#1141]: https://github.com/ergebnis/php-cs-fixer-config/pull/1141
 
 [@dependabot]: https://github.com/apps/dependabot
 [@linuxjuggler]: https://github.com/linuxjuggler

diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
     "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
     "ext-filter": "*",
     "erickskrauch/php-cs-fixer-custom-fixers": "~1.3.0",
-    "friendsofphp/php-cs-fixer": "~3.64.0",
+    "friendsofphp/php-cs-fixer": "~3.65.0",
     "kubawerlos/php-cs-fixer-custom-fixers": "~3.22.0"
   },
   "require-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php
@@ -683,6 +683,7 @@ public static function create(): RuleSet
                 'phpdoc_to_param_type' => false,
                 'phpdoc_to_property_type' => [
                     'scalar_types' => true,
+                    'types_map' => [],
                     'union_types' => false,
                 ],
                 'phpdoc_to_return_type' => false,

diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php
@@ -696,6 +696,7 @@ public static function create(): RuleSet
                 'phpdoc_to_param_type' => false,
                 'phpdoc_to_property_type' => [
                     'scalar_types' => true,
+                    'types_map' => [],
                     'union_types' => true,
                 ],
                 'phpdoc_to_return_type' => false,

diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php
@@ -698,6 +698,7 @@ public static function create(): RuleSet
                 'phpdoc_to_param_type' => false,
                 'phpdoc_to_property_type' => [
                     'scalar_types' => true,
+                    'types_map' => [],
                     'union_types' => true,
                 ],
                 'phpdoc_to_return_type' => false,

diff --git a/src/RuleSet/Php82.php b/src/RuleSet/Php82.php
@@ -698,6 +698,7 @@ public static function create(): RuleSet
                 'phpdoc_to_param_type' => false,
                 'phpdoc_to_property_type' => [
                     'scalar_types' => true,
+                    'types_map' => [],
                     'union_types' => true,
                 ],
                 'phpdoc_to_return_type' => false,

diff --git a/src/RuleSet/Php83.php b/src/RuleSet/Php83.php
@@ -698,6 +698,7 @@ public static function create(): RuleSet
                 'phpdoc_to_param_type' => false,
                 'phpdoc_to_property_type' => [
                     'scalar_types' => true,
+                    'types_map' => [],
                     'union_types' => true,
                 ],
                 'phpdoc_to_return_type' => false,

diff --git a/src/RuleSet/Php84.php b/src/RuleSet/Php84.php
@@ -698,6 +698,7 @@ public static function create(): RuleSet
                 'phpdoc_to_param_type' => false,
                 'phpdoc_to_property_type' => [
                     'scalar_types' => true,
+                    'types_map' => [],
                     'union_types' => true,
                 ],
                 'phpdoc_to_return_type' => false,

diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php
@@ -706,6 +706,7 @@ protected function expectedRules(): Rules
             'phpdoc_to_param_type' => false,
             'phpdoc_to_property_type' => [
                 'scalar_types' => true,
+                'types_map' => [],
                 'union_types' => false,
             ],
             'phpdoc_to_return_type' => false,

diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php
@@ -719,6 +719,7 @@ protected function expectedRules(): Rules
             'phpdoc_to_param_type' => false,
             'phpdoc_to_property_type' => [
                 'scalar_types' => true,
+                'types_map' => [],
                 'union_types' => true,
             ],
             'phpdoc_to_return_type' => false,

diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php
@@ -721,6 +721,7 @@ protected function expectedRules(): Rules
             'phpdoc_to_param_type' => false,
             'phpdoc_to_property_type' => [
                 'scalar_types' => true,
+                'types_map' => [],
                 'union_types' => true,
             ],
             'phpdoc_to_return_type' => false,

diff --git a/test/Unit/RuleSet/Php82Test.php b/test/Unit/RuleSet/Php82Test.php
@@ -721,6 +721,7 @@ protected function expectedRules(): Rules
             'phpdoc_to_param_type' => false,
             'phpdoc_to_property_type' => [
                 'scalar_types' => true,
+                'types_map' => [],
                 'union_types' => true,
             ],
             'phpdoc_to_return_type' => false,

diff --git a/test/Unit/RuleSet/Php83Test.php b/test/Unit/RuleSet/Php83Test.php
@@ -721,6 +721,7 @@ protected function expectedRules(): Rules
             'phpdoc_to_param_type' => false,
             'phpdoc_to_property_type' => [
                 'scalar_types' => true,
+                'types_map' => [],
                 'union_types' => true,
             ],
             'phpdoc_to_return_type' => false,

diff --git a/test/Unit/RuleSet/Php84Test.php b/test/Unit/RuleSet/Php84Test.php
@@ -721,6 +721,7 @@ protected function expectedRules(): Rules
             'phpdoc_to_param_type' => false,
             'phpdoc_to_property_type' => [
                 'scalar_types' => true,
+                'types_map' => [],
                 'union_types' => true,
             ],
             'phpdoc_to_return_type' => false,