Merge pull request #1306 from ergebnis/dependabot/composer/friendsofphp/php-cs-fixer-3.89.1

localheinz · web-flow · commit 83dd4096d4dd · 2025-11-08T10:34:08.000+01:00
composer(deps): Bump friendsofphp/php-cs-fixer from 3.88.2 to 3.89.1
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.55.0...main`][6.55.0...main].
 
+### Changed
+
+- Updated `friendsofphp/php-cs-fixer` ([#1306]), by [@dependabot]
+
 ## [`6.55.0`][6.55.0]
 
 For a full diff see [`6.54.0...6.55.0`][6.54.0...6.55.0].
@@ -2081,6 +2085,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
 [#1289]: https://github.com/ergebnis/php-cs-fixer-config/pull/1289
 [#1296]: https://github.com/ergebnis/php-cs-fixer-config/pull/1296
 [#1298]: https://github.com/ergebnis/php-cs-fixer-config/pull/1298
+[#1306]: https://github.com/ergebnis/php-cs-fixer-config/pull/1306
 
 [@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 || ~8.5.0",
     "ext-filter": "*",
     "erickskrauch/php-cs-fixer-custom-fixers": "~1.3.0",
-    "friendsofphp/php-cs-fixer": "~3.88.2",
+    "friendsofphp/php-cs-fixer": "~3.89.1",
     "kubawerlos/php-cs-fixer-custom-fixers": "~3.35.1"
   },
   "require-dev": {
diff --git a/composer.lock b/composer.lock
diff --git a/src/RuleSet/Php53.php b/src/RuleSet/Php53.php
@@ -157,7 +157,9 @@ public static function create(): RuleSet
                     'space' => 'none',
                 ],
                 'declare_parentheses' => true,
-                'declare_strict_types' => true,
+                'declare_strict_types' => [
+                    'preserve_existing_declaration' => false,
+                ],
                 'dir_constant' => true,
                 'doctrine_annotation_array_assignment' => [
                     'ignored_tags' => Doctrine::IGNORED_TAGS,
diff --git a/src/RuleSet/Php54.php b/src/RuleSet/Php54.php
@@ -158,7 +158,9 @@ public static function create(): RuleSet
                     'space' => 'none',
                 ],
                 'declare_parentheses' => true,
-                'declare_strict_types' => true,
+                'declare_strict_types' => [
+                    'preserve_existing_declaration' => false,
+                ],
                 'dir_constant' => true,
                 'doctrine_annotation_array_assignment' => [
                     'ignored_tags' => Doctrine::IGNORED_TAGS,
diff --git a/src/RuleSet/Php55.php b/src/RuleSet/Php55.php
@@ -160,7 +160,9 @@ public static function create(): RuleSet
                     'space' => 'none',
                 ],
                 'declare_parentheses' => true,
-                'declare_strict_types' => true,
+                'declare_strict_types' => [
+                    'preserve_existing_declaration' => false,
+                ],
                 'dir_constant' => true,
                 'doctrine_annotation_array_assignment' => [
                     'ignored_tags' => Doctrine::IGNORED_TAGS,
diff --git a/src/RuleSet/Php56.php b/src/RuleSet/Php56.php
@@ -160,7 +160,9 @@ public static function create(): RuleSet
                     'space' => 'none',
                 ],
                 'declare_parentheses' => true,
-                'declare_strict_types' => true,
+                'declare_strict_types' => [
+                    'preserve_existing_declaration' => false,
+                ],
                 'dir_constant' => true,
                 'doctrine_annotation_array_assignment' => [
                     'ignored_tags' => Doctrine::IGNORED_TAGS,
diff --git a/src/RuleSet/Php70.php b/src/RuleSet/Php70.php
@@ -160,7 +160,9 @@ public static function create(): RuleSet
                     'space' => 'none',
                 ],
                 'declare_parentheses' => true,
-                'declare_strict_types' => true,
+                'declare_strict_types' => [
+                    'preserve_existing_declaration' => false,
+                ],
                 'dir_constant' => true,
                 'doctrine_annotation_array_assignment' => [
                     'ignored_tags' => Doctrine::IGNORED_TAGS,
diff --git a/src/RuleSet/Php71.php b/src/RuleSet/Php71.php
@@ -160,7 +160,9 @@ public static function create(): RuleSet
                     'space' => 'none',
                 ],
                 'declare_parentheses' => true,
-                'declare_strict_types' => true,
+                'declare_strict_types' => [
+                    'preserve_existing_declaration' => false,
+                ],
                 'dir_constant' => true,
                 'doctrine_annotation_array_assignment' => [
                     'ignored_tags' => Doctrine::IGNORED_TAGS,
diff --git a/src/RuleSet/Php72.php b/src/RuleSet/Php72.php
@@ -160,7 +160,9 @@ public static function create(): RuleSet
                     'space' => 'none',
                 ],
                 'declare_parentheses' => true,
-                'declare_strict_types' => true,
+                'declare_strict_types' => [
+                    'preserve_existing_declaration' => false,
+                ],
                 'dir_constant' => true,
                 'doctrine_annotation_array_assignment' => [
                     'ignored_tags' => Doctrine::IGNORED_TAGS,
diff --git a/src/RuleSet/Php73.php b/src/RuleSet/Php73.php
@@ -160,7 +160,9 @@ public static function create(): RuleSet
                     'space' => 'none',
                 ],
                 'declare_parentheses' => true,
-                'declare_strict_types' => true,
+                'declare_strict_types' => [
+                    'preserve_existing_declaration' => false,
+                ],
                 'dir_constant' => true,
                 'doctrine_annotation_array_assignment' => [
                     'ignored_tags' => Doctrine::IGNORED_TAGS,
diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php
@@ -160,7 +160,9 @@ public static function create(): RuleSet
                     'space' => 'none',
                 ],
                 'declare_parentheses' => true,
-                'declare_strict_types' => true,
+                'declare_strict_types' => [
+                    'preserve_existing_declaration' => false,
+                ],
                 'dir_constant' => true,
                 'doctrine_annotation_array_assignment' => [
                     'ignored_tags' => Doctrine::IGNORED_TAGS,
diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php
@@ -162,7 +162,9 @@ public static function create(): RuleSet
                     'space' => 'none',
                 ],
                 'declare_parentheses' => true,
-                'declare_strict_types' => true,
+                'declare_strict_types' => [
+                    'preserve_existing_declaration' => false,
+                ],
                 'dir_constant' => true,
                 'doctrine_annotation_array_assignment' => [
                     'ignored_tags' => Doctrine::IGNORED_TAGS,
diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php
@@ -163,7 +163,9 @@ public static function create(): RuleSet
                     'space' => 'none',
                 ],
                 'declare_parentheses' => true,
-                'declare_strict_types' => true,
+                'declare_strict_types' => [
+                    'preserve_existing_declaration' => false,
+                ],
                 'dir_constant' => true,
                 'doctrine_annotation_array_assignment' => [
                     'ignored_tags' => Doctrine::IGNORED_TAGS,
diff --git a/src/RuleSet/Php82.php b/src/RuleSet/Php82.php
@@ -163,7 +163,9 @@ public static function create(): RuleSet
                     'space' => 'none',
                 ],
                 'declare_parentheses' => true,
-                'declare_strict_types' => true,
+                'declare_strict_types' => [
+                    'preserve_existing_declaration' => false,
+                ],
                 'dir_constant' => true,
                 'doctrine_annotation_array_assignment' => [
                     'ignored_tags' => Doctrine::IGNORED_TAGS,
diff --git a/src/RuleSet/Php83.php b/src/RuleSet/Php83.php
@@ -165,7 +165,9 @@ public static function create(): RuleSet
                     'space' => 'none',
                 ],
                 'declare_parentheses' => true,
-                'declare_strict_types' => true,
+                'declare_strict_types' => [
+                    'preserve_existing_declaration' => false,
+                ],
                 'dir_constant' => true,
                 'doctrine_annotation_array_assignment' => [
                     'ignored_tags' => Doctrine::IGNORED_TAGS,
diff --git a/src/RuleSet/Php84.php b/src/RuleSet/Php84.php
@@ -165,7 +165,9 @@ public static function create(): RuleSet
                     'space' => 'none',
                 ],
                 'declare_parentheses' => true,
-                'declare_strict_types' => true,
+                'declare_strict_types' => [
+                    'preserve_existing_declaration' => false,
+                ],
                 'dir_constant' => true,
                 'doctrine_annotation_array_assignment' => [
                     'ignored_tags' => Doctrine::IGNORED_TAGS,
diff --git a/src/RuleSet/Php85.php b/src/RuleSet/Php85.php
@@ -165,7 +165,9 @@ public static function create(): RuleSet
                     'space' => 'none',
                 ],
                 'declare_parentheses' => true,
-                'declare_strict_types' => true,
+                'declare_strict_types' => [
+                    'preserve_existing_declaration' => false,
+                ],
                 'dir_constant' => true,
                 'doctrine_annotation_array_assignment' => [
                     'ignored_tags' => Doctrine::IGNORED_TAGS,
diff --git a/test/Unit/RuleSet/Php53Test.php b/test/Unit/RuleSet/Php53Test.php
@@ -179,7 +179,9 @@ protected function expectedRules(): Rules
                 'space' => 'none',
             ],
             'declare_parentheses' => true,
-            'declare_strict_types' => true,
+            'declare_strict_types' => [
+                'preserve_existing_declaration' => false,
+            ],
             'dir_constant' => true,
             'doctrine_annotation_array_assignment' => [
                 'ignored_tags' => RuleSet\Doctrine::IGNORED_TAGS,
diff --git a/test/Unit/RuleSet/Php54Test.php b/test/Unit/RuleSet/Php54Test.php
@@ -180,7 +180,9 @@ protected function expectedRules(): Rules
                 'space' => 'none',
             ],
             'declare_parentheses' => true,
-            'declare_strict_types' => true,
+            'declare_strict_types' => [
+                'preserve_existing_declaration' => false,
+            ],
             'dir_constant' => true,
             'doctrine_annotation_array_assignment' => [
                 'ignored_tags' => RuleSet\Doctrine::IGNORED_TAGS,
diff --git a/test/Unit/RuleSet/Php55Test.php b/test/Unit/RuleSet/Php55Test.php
@@ -182,7 +182,9 @@ protected function expectedRules(): Rules
                 'space' => 'none',
             ],
             'declare_parentheses' => true,
-            'declare_strict_types' => true,
+            'declare_strict_types' => [
+                'preserve_existing_declaration' => false,
+            ],
             'dir_constant' => true,
             'doctrine_annotation_array_assignment' => [
                 'ignored_tags' => RuleSet\Doctrine::IGNORED_TAGS,
diff --git a/test/Unit/RuleSet/Php56Test.php b/test/Unit/RuleSet/Php56Test.php
@@ -182,7 +182,9 @@ protected function expectedRules(): Rules
                 'space' => 'none',
             ],
             'declare_parentheses' => true,
-            'declare_strict_types' => true,
+            'declare_strict_types' => [
+                'preserve_existing_declaration' => false,
+            ],
             'dir_constant' => true,
             'doctrine_annotation_array_assignment' => [
                 'ignored_tags' => RuleSet\Doctrine::IGNORED_TAGS,
diff --git a/test/Unit/RuleSet/Php70Test.php b/test/Unit/RuleSet/Php70Test.php
@@ -182,7 +182,9 @@ protected function expectedRules(): Rules
                 'space' => 'none',
             ],
             'declare_parentheses' => true,
-            'declare_strict_types' => true,
+            'declare_strict_types' => [
+                'preserve_existing_declaration' => false,
+            ],
             'dir_constant' => true,
             'doctrine_annotation_array_assignment' => [
                 'ignored_tags' => RuleSet\Doctrine::IGNORED_TAGS,
diff --git a/test/Unit/RuleSet/Php71Test.php b/test/Unit/RuleSet/Php71Test.php
@@ -182,7 +182,9 @@ protected function expectedRules(): Rules
                 'space' => 'none',
             ],
             'declare_parentheses' => true,
-            'declare_strict_types' => true,
+            'declare_strict_types' => [
+                'preserve_existing_declaration' => false,
+            ],
             'dir_constant' => true,
             'doctrine_annotation_array_assignment' => [
                 'ignored_tags' => RuleSet\Doctrine::IGNORED_TAGS,
diff --git a/test/Unit/RuleSet/Php72Test.php b/test/Unit/RuleSet/Php72Test.php
@@ -182,7 +182,9 @@ protected function expectedRules(): Rules
                 'space' => 'none',
             ],
             'declare_parentheses' => true,
-            'declare_strict_types' => true,
+            'declare_strict_types' => [
+                'preserve_existing_declaration' => false,
+            ],
             'dir_constant' => true,
             'doctrine_annotation_array_assignment' => [
                 'ignored_tags' => RuleSet\Doctrine::IGNORED_TAGS,
diff --git a/test/Unit/RuleSet/Php73Test.php b/test/Unit/RuleSet/Php73Test.php
@@ -182,7 +182,9 @@ protected function expectedRules(): Rules
                 'space' => 'none',
             ],
             'declare_parentheses' => true,
-            'declare_strict_types' => true,
+            'declare_strict_types' => [
+                'preserve_existing_declaration' => false,
+            ],
             'dir_constant' => true,
             'doctrine_annotation_array_assignment' => [
                 'ignored_tags' => RuleSet\Doctrine::IGNORED_TAGS,
diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php
@@ -182,7 +182,9 @@ protected function expectedRules(): Rules
                 'space' => 'none',
             ],
             'declare_parentheses' => true,
-            'declare_strict_types' => true,
+            'declare_strict_types' => [
+                'preserve_existing_declaration' => false,
+            ],
             'dir_constant' => true,
             'doctrine_annotation_array_assignment' => [
                 'ignored_tags' => RuleSet\Doctrine::IGNORED_TAGS,
diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php
@@ -184,7 +184,9 @@ protected function expectedRules(): Rules
                 'space' => 'none',
             ],
             'declare_parentheses' => true,
-            'declare_strict_types' => true,
+            'declare_strict_types' => [
+                'preserve_existing_declaration' => false,
+            ],
             'dir_constant' => true,
             'doctrine_annotation_array_assignment' => [
                 'ignored_tags' => RuleSet\Doctrine::IGNORED_TAGS,
diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php
@@ -185,7 +185,9 @@ protected function expectedRules(): Rules
                 'space' => 'none',
             ],
             'declare_parentheses' => true,
-            'declare_strict_types' => true,
+            'declare_strict_types' => [
+                'preserve_existing_declaration' => false,
+            ],
             'dir_constant' => true,
             'doctrine_annotation_array_assignment' => [
                 'ignored_tags' => RuleSet\Doctrine::IGNORED_TAGS,
diff --git a/test/Unit/RuleSet/Php82Test.php b/test/Unit/RuleSet/Php82Test.php
@@ -185,7 +185,9 @@ protected function expectedRules(): Rules
                 'space' => 'none',
             ],
             'declare_parentheses' => true,
-            'declare_strict_types' => true,
+            'declare_strict_types' => [
+                'preserve_existing_declaration' => false,
+            ],
             'dir_constant' => true,
             'doctrine_annotation_array_assignment' => [
                 'ignored_tags' => RuleSet\Doctrine::IGNORED_TAGS,
diff --git a/test/Unit/RuleSet/Php83Test.php b/test/Unit/RuleSet/Php83Test.php
@@ -187,7 +187,9 @@ protected function expectedRules(): Rules
                 'space' => 'none',
             ],
             'declare_parentheses' => true,
-            'declare_strict_types' => true,
+            'declare_strict_types' => [
+                'preserve_existing_declaration' => false,
+            ],
             'dir_constant' => true,
             'doctrine_annotation_array_assignment' => [
                 'ignored_tags' => RuleSet\Doctrine::IGNORED_TAGS,
diff --git a/test/Unit/RuleSet/Php84Test.php b/test/Unit/RuleSet/Php84Test.php
diff --git a/test/Unit/RuleSet/Php85Test.php b/test/Unit/RuleSet/Php85Test.php
