From 5b24da005aa106c0f3211e7c5e1e51c1be2658f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 13:17:21 +0000 Subject: [PATCH 1/4] composer(deps): Bump friendsofphp/php-cs-fixer from 3.34.1 to 3.35.0 Bumps [friendsofphp/php-cs-fixer](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer) from 3.34.1 to 3.35.0. - [Release notes](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases) - [Changelog](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/CHANGELOG.md) - [Commits](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.34.1...v3.35.0) --- updated-dependencies: - dependency-name: friendsofphp/php-cs-fixer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- composer.lock | 28 +++++++++++++--------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/composer.json b/composer.json index 1eb5bb9b..4a3b7ec9 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "php": "~8.1.0 || ~8.2.0 || ~8.3.0", "ext-filter": "*", "erickskrauch/php-cs-fixer-custom-fixers": "~1.2.0", - "friendsofphp/php-cs-fixer": "~3.34.1", + "friendsofphp/php-cs-fixer": "~3.35.0", "kubawerlos/php-cs-fixer-custom-fixers": "~3.16.2" }, "require-dev": { diff --git a/composer.lock b/composer.lock index a82da672..c3e342ae 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "dac77bd7b0249c18cfdb112dd518bf7e", + "content-hash": "91bbc28d9f333bfce276396b86b0afd7", "packages": [ { "name": "composer/pcre", - "version": "3.1.0", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2" + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", - "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", + "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", "shasum": "" }, "require": { @@ -59,7 +59,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.0" + "source": "https://github.com/composer/pcre/tree/3.1.1" }, "funding": [ { @@ -75,7 +75,7 @@ "type": "tidelift" } ], - "time": "2022-11-17T09:50:14+00:00" + "time": "2023-10-11T07:11:09+00:00" }, { "name": "composer/semver", @@ -288,16 +288,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.34.1", + "version": "v3.35.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "98bf1b1068b4ceddbbc2a2b70b67a5e380add9e3" + "reference": "eff6f13505a39ba0b08d0eee4a232ddc5d6d3734" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/98bf1b1068b4ceddbbc2a2b70b67a5e380add9e3", - "reference": "98bf1b1068b4ceddbbc2a2b70b67a5e380add9e3", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/eff6f13505a39ba0b08d0eee4a232ddc5d6d3734", + "reference": "eff6f13505a39ba0b08d0eee4a232ddc5d6d3734", "shasum": "" }, "require": { @@ -330,8 +330,6 @@ "phpspec/prophecy": "^1.16", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.5", - "phpunitgoodpractices/polyfill": "^1.6", - "phpunitgoodpractices/traits": "^1.9.2", "symfony/phpunit-bridge": "^6.2.3", "symfony/yaml": "^5.4 || ^6.0" }, @@ -371,7 +369,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.34.1" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.35.0" }, "funding": [ { @@ -379,7 +377,7 @@ "type": "github" } ], - "time": "2023-10-03T23:51:05+00:00" + "time": "2023-10-12T12:58:48+00:00" }, { "name": "kubawerlos/php-cs-fixer-custom-fixers", From 0c61c3d7ed433478cf1880f50f638cb12a45ca4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Thu, 12 Oct 2023 15:26:49 +0200 Subject: [PATCH 2/4] Fix: Disable newly added fixer --- src/RuleSet/Php53.php | 1 + src/RuleSet/Php54.php | 1 + src/RuleSet/Php55.php | 1 + src/RuleSet/Php56.php | 1 + src/RuleSet/Php70.php | 1 + src/RuleSet/Php71.php | 1 + src/RuleSet/Php72.php | 1 + src/RuleSet/Php73.php | 1 + src/RuleSet/Php74.php | 1 + src/RuleSet/Php80.php | 1 + src/RuleSet/Php81.php | 1 + src/RuleSet/Php82.php | 1 + src/RuleSet/Php83.php | 1 + test/Unit/RuleSet/Php53Test.php | 1 + test/Unit/RuleSet/Php54Test.php | 1 + test/Unit/RuleSet/Php55Test.php | 1 + test/Unit/RuleSet/Php56Test.php | 1 + test/Unit/RuleSet/Php70Test.php | 1 + test/Unit/RuleSet/Php71Test.php | 1 + test/Unit/RuleSet/Php72Test.php | 1 + test/Unit/RuleSet/Php73Test.php | 1 + test/Unit/RuleSet/Php74Test.php | 1 + test/Unit/RuleSet/Php80Test.php | 1 + test/Unit/RuleSet/Php81Test.php | 1 + test/Unit/RuleSet/Php82Test.php | 1 + test/Unit/RuleSet/Php83Test.php | 1 + 26 files changed, 26 insertions(+) diff --git a/src/RuleSet/Php53.php b/src/RuleSet/Php53.php index 33466965..7eb653ac 100644 --- a/src/RuleSet/Php53.php +++ b/src/RuleSet/Php53.php @@ -598,6 +598,7 @@ public static function create(): RuleSet ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/src/RuleSet/Php54.php b/src/RuleSet/Php54.php index 9c3ca9d4..22332d66 100644 --- a/src/RuleSet/Php54.php +++ b/src/RuleSet/Php54.php @@ -599,6 +599,7 @@ public static function create(): RuleSet ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/src/RuleSet/Php55.php b/src/RuleSet/Php55.php index 1c389d67..5f06bc62 100644 --- a/src/RuleSet/Php55.php +++ b/src/RuleSet/Php55.php @@ -603,6 +603,7 @@ public static function create(): RuleSet ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/src/RuleSet/Php56.php b/src/RuleSet/Php56.php index e782fa77..df1bcaaf 100644 --- a/src/RuleSet/Php56.php +++ b/src/RuleSet/Php56.php @@ -603,6 +603,7 @@ public static function create(): RuleSet ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/src/RuleSet/Php70.php b/src/RuleSet/Php70.php index 81d8b102..6bb080f7 100644 --- a/src/RuleSet/Php70.php +++ b/src/RuleSet/Php70.php @@ -601,6 +601,7 @@ public static function create(): RuleSet ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/src/RuleSet/Php71.php b/src/RuleSet/Php71.php index 9d53038d..641d5230 100644 --- a/src/RuleSet/Php71.php +++ b/src/RuleSet/Php71.php @@ -603,6 +603,7 @@ public static function create(): RuleSet ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/src/RuleSet/Php72.php b/src/RuleSet/Php72.php index d57a8445..20a026c2 100644 --- a/src/RuleSet/Php72.php +++ b/src/RuleSet/Php72.php @@ -603,6 +603,7 @@ public static function create(): RuleSet ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/src/RuleSet/Php73.php b/src/RuleSet/Php73.php index 27747ee7..2acc26f8 100644 --- a/src/RuleSet/Php73.php +++ b/src/RuleSet/Php73.php @@ -603,6 +603,7 @@ public static function create(): RuleSet ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php index 4b6324d1..6d265d84 100644 --- a/src/RuleSet/Php74.php +++ b/src/RuleSet/Php74.php @@ -603,6 +603,7 @@ public static function create(): RuleSet ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php index fa54fecd..64f5c997 100644 --- a/src/RuleSet/Php80.php +++ b/src/RuleSet/Php80.php @@ -608,6 +608,7 @@ public static function create(): RuleSet ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index 96ef6707..0891bbac 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -609,6 +609,7 @@ public static function create(): RuleSet ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/src/RuleSet/Php82.php b/src/RuleSet/Php82.php index 16f9cbc6..53494101 100644 --- a/src/RuleSet/Php82.php +++ b/src/RuleSet/Php82.php @@ -609,6 +609,7 @@ public static function create(): RuleSet ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/src/RuleSet/Php83.php b/src/RuleSet/Php83.php index adf55c62..278fb91a 100644 --- a/src/RuleSet/Php83.php +++ b/src/RuleSet/Php83.php @@ -609,6 +609,7 @@ public static function create(): RuleSet ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/test/Unit/RuleSet/Php53Test.php b/test/Unit/RuleSet/Php53Test.php index 338957ed..07bb5160 100644 --- a/test/Unit/RuleSet/Php53Test.php +++ b/test/Unit/RuleSet/Php53Test.php @@ -620,6 +620,7 @@ protected function expectedRules(): Rules ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/test/Unit/RuleSet/Php54Test.php b/test/Unit/RuleSet/Php54Test.php index 3818843a..e2be68e2 100644 --- a/test/Unit/RuleSet/Php54Test.php +++ b/test/Unit/RuleSet/Php54Test.php @@ -621,6 +621,7 @@ protected function expectedRules(): Rules ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/test/Unit/RuleSet/Php55Test.php b/test/Unit/RuleSet/Php55Test.php index 4a724fba..a8cfa375 100644 --- a/test/Unit/RuleSet/Php55Test.php +++ b/test/Unit/RuleSet/Php55Test.php @@ -625,6 +625,7 @@ protected function expectedRules(): Rules ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/test/Unit/RuleSet/Php56Test.php b/test/Unit/RuleSet/Php56Test.php index ac46306e..729a8915 100644 --- a/test/Unit/RuleSet/Php56Test.php +++ b/test/Unit/RuleSet/Php56Test.php @@ -625,6 +625,7 @@ protected function expectedRules(): Rules ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/test/Unit/RuleSet/Php70Test.php b/test/Unit/RuleSet/Php70Test.php index 74b8f9c6..1ef44318 100644 --- a/test/Unit/RuleSet/Php70Test.php +++ b/test/Unit/RuleSet/Php70Test.php @@ -623,6 +623,7 @@ protected function expectedRules(): Rules ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/test/Unit/RuleSet/Php71Test.php b/test/Unit/RuleSet/Php71Test.php index f9b1d612..3bfb5b72 100644 --- a/test/Unit/RuleSet/Php71Test.php +++ b/test/Unit/RuleSet/Php71Test.php @@ -625,6 +625,7 @@ protected function expectedRules(): Rules ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/test/Unit/RuleSet/Php72Test.php b/test/Unit/RuleSet/Php72Test.php index 0db2287b..229959bf 100644 --- a/test/Unit/RuleSet/Php72Test.php +++ b/test/Unit/RuleSet/Php72Test.php @@ -625,6 +625,7 @@ protected function expectedRules(): Rules ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/test/Unit/RuleSet/Php73Test.php b/test/Unit/RuleSet/Php73Test.php index f24487f8..dfb33d2b 100644 --- a/test/Unit/RuleSet/Php73Test.php +++ b/test/Unit/RuleSet/Php73Test.php @@ -625,6 +625,7 @@ protected function expectedRules(): Rules ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php index 8187a5d7..b5d1edc3 100644 --- a/test/Unit/RuleSet/Php74Test.php +++ b/test/Unit/RuleSet/Php74Test.php @@ -625,6 +625,7 @@ protected function expectedRules(): Rules ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php index 9f5a88e8..b431d836 100644 --- a/test/Unit/RuleSet/Php80Test.php +++ b/test/Unit/RuleSet/Php80Test.php @@ -630,6 +630,7 @@ protected function expectedRules(): Rules ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php index e0afda4d..9109f767 100644 --- a/test/Unit/RuleSet/Php81Test.php +++ b/test/Unit/RuleSet/Php81Test.php @@ -631,6 +631,7 @@ protected function expectedRules(): Rules ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/test/Unit/RuleSet/Php82Test.php b/test/Unit/RuleSet/Php82Test.php index e9d3338a..d0a793e5 100644 --- a/test/Unit/RuleSet/Php82Test.php +++ b/test/Unit/RuleSet/Php82Test.php @@ -631,6 +631,7 @@ protected function expectedRules(): Rules ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', diff --git a/test/Unit/RuleSet/Php83Test.php b/test/Unit/RuleSet/Php83Test.php index fc7911d8..06a38e20 100644 --- a/test/Unit/RuleSet/Php83Test.php +++ b/test/Unit/RuleSet/Php83Test.php @@ -631,6 +631,7 @@ protected function expectedRules(): Rules ], ], 'phpdoc_param_order' => true, + 'phpdoc_readonly_class_comment_to_keyword' => false, 'phpdoc_return_self_reference' => [ 'replacements' => [ '$self' => 'self', From 90c4d9d79bafcb98b28aef7e3618e735e2b8e820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Thu, 12 Oct 2023 15:29:27 +0200 Subject: [PATCH 3/4] Fix: Configure fixer that has become configurable --- src/RuleSet/Php53.php | 4 +++- src/RuleSet/Php54.php | 4 +++- src/RuleSet/Php55.php | 4 +++- src/RuleSet/Php56.php | 4 +++- src/RuleSet/Php70.php | 4 +++- src/RuleSet/Php71.php | 4 +++- src/RuleSet/Php72.php | 4 +++- src/RuleSet/Php73.php | 4 +++- src/RuleSet/Php74.php | 4 +++- src/RuleSet/Php80.php | 4 +++- src/RuleSet/Php81.php | 4 +++- src/RuleSet/Php82.php | 4 +++- src/RuleSet/Php83.php | 4 +++- test/Unit/RuleSet/Php53Test.php | 4 +++- test/Unit/RuleSet/Php54Test.php | 4 +++- test/Unit/RuleSet/Php55Test.php | 4 +++- test/Unit/RuleSet/Php56Test.php | 4 +++- test/Unit/RuleSet/Php70Test.php | 4 +++- test/Unit/RuleSet/Php71Test.php | 4 +++- test/Unit/RuleSet/Php72Test.php | 4 +++- test/Unit/RuleSet/Php73Test.php | 4 +++- test/Unit/RuleSet/Php74Test.php | 4 +++- test/Unit/RuleSet/Php80Test.php | 4 +++- test/Unit/RuleSet/Php81Test.php | 4 +++- test/Unit/RuleSet/Php82Test.php | 4 +++- test/Unit/RuleSet/Php83Test.php | 4 +++- 26 files changed, 78 insertions(+), 26 deletions(-) diff --git a/src/RuleSet/Php53.php b/src/RuleSet/Php53.php index 7eb653ac..dd65f9cb 100644 --- a/src/RuleSet/Php53.php +++ b/src/RuleSet/Php53.php @@ -214,7 +214,9 @@ public static function create(): RuleSet 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/src/RuleSet/Php54.php b/src/RuleSet/Php54.php index 22332d66..a1680773 100644 --- a/src/RuleSet/Php54.php +++ b/src/RuleSet/Php54.php @@ -215,7 +215,9 @@ public static function create(): RuleSet 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/src/RuleSet/Php55.php b/src/RuleSet/Php55.php index 5f06bc62..36656f44 100644 --- a/src/RuleSet/Php55.php +++ b/src/RuleSet/Php55.php @@ -217,7 +217,9 @@ public static function create(): RuleSet 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/src/RuleSet/Php56.php b/src/RuleSet/Php56.php index df1bcaaf..475760c7 100644 --- a/src/RuleSet/Php56.php +++ b/src/RuleSet/Php56.php @@ -217,7 +217,9 @@ public static function create(): RuleSet 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/src/RuleSet/Php70.php b/src/RuleSet/Php70.php index 6bb080f7..52185a87 100644 --- a/src/RuleSet/Php70.php +++ b/src/RuleSet/Php70.php @@ -217,7 +217,9 @@ public static function create(): RuleSet 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/src/RuleSet/Php71.php b/src/RuleSet/Php71.php index 641d5230..5c0ad4f2 100644 --- a/src/RuleSet/Php71.php +++ b/src/RuleSet/Php71.php @@ -217,7 +217,9 @@ public static function create(): RuleSet 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/src/RuleSet/Php72.php b/src/RuleSet/Php72.php index 20a026c2..1467977a 100644 --- a/src/RuleSet/Php72.php +++ b/src/RuleSet/Php72.php @@ -217,7 +217,9 @@ public static function create(): RuleSet 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/src/RuleSet/Php73.php b/src/RuleSet/Php73.php index 2acc26f8..c5a13d42 100644 --- a/src/RuleSet/Php73.php +++ b/src/RuleSet/Php73.php @@ -217,7 +217,9 @@ public static function create(): RuleSet 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php index 6d265d84..e4fea62d 100644 --- a/src/RuleSet/Php74.php +++ b/src/RuleSet/Php74.php @@ -217,7 +217,9 @@ public static function create(): RuleSet 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php index 64f5c997..11fcaf3b 100644 --- a/src/RuleSet/Php80.php +++ b/src/RuleSet/Php80.php @@ -219,7 +219,9 @@ public static function create(): RuleSet 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index 0891bbac..28ed25e9 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -219,7 +219,9 @@ public static function create(): RuleSet 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/src/RuleSet/Php82.php b/src/RuleSet/Php82.php index 53494101..df5ec01d 100644 --- a/src/RuleSet/Php82.php +++ b/src/RuleSet/Php82.php @@ -219,7 +219,9 @@ public static function create(): RuleSet 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/src/RuleSet/Php83.php b/src/RuleSet/Php83.php index 278fb91a..2a7a0fa5 100644 --- a/src/RuleSet/Php83.php +++ b/src/RuleSet/Php83.php @@ -219,7 +219,9 @@ public static function create(): RuleSet 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/test/Unit/RuleSet/Php53Test.php b/test/Unit/RuleSet/Php53Test.php index 07bb5160..2c86dc32 100644 --- a/test/Unit/RuleSet/Php53Test.php +++ b/test/Unit/RuleSet/Php53Test.php @@ -236,7 +236,9 @@ protected function expectedRules(): Rules 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/test/Unit/RuleSet/Php54Test.php b/test/Unit/RuleSet/Php54Test.php index e2be68e2..6dfbf7ad 100644 --- a/test/Unit/RuleSet/Php54Test.php +++ b/test/Unit/RuleSet/Php54Test.php @@ -237,7 +237,9 @@ protected function expectedRules(): Rules 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/test/Unit/RuleSet/Php55Test.php b/test/Unit/RuleSet/Php55Test.php index a8cfa375..a6cfced8 100644 --- a/test/Unit/RuleSet/Php55Test.php +++ b/test/Unit/RuleSet/Php55Test.php @@ -239,7 +239,9 @@ protected function expectedRules(): Rules 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/test/Unit/RuleSet/Php56Test.php b/test/Unit/RuleSet/Php56Test.php index 729a8915..f25d2a0b 100644 --- a/test/Unit/RuleSet/Php56Test.php +++ b/test/Unit/RuleSet/Php56Test.php @@ -239,7 +239,9 @@ protected function expectedRules(): Rules 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/test/Unit/RuleSet/Php70Test.php b/test/Unit/RuleSet/Php70Test.php index 1ef44318..a1ac6037 100644 --- a/test/Unit/RuleSet/Php70Test.php +++ b/test/Unit/RuleSet/Php70Test.php @@ -239,7 +239,9 @@ protected function expectedRules(): Rules 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/test/Unit/RuleSet/Php71Test.php b/test/Unit/RuleSet/Php71Test.php index 3bfb5b72..358a1162 100644 --- a/test/Unit/RuleSet/Php71Test.php +++ b/test/Unit/RuleSet/Php71Test.php @@ -239,7 +239,9 @@ protected function expectedRules(): Rules 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/test/Unit/RuleSet/Php72Test.php b/test/Unit/RuleSet/Php72Test.php index 229959bf..85d44a45 100644 --- a/test/Unit/RuleSet/Php72Test.php +++ b/test/Unit/RuleSet/Php72Test.php @@ -239,7 +239,9 @@ protected function expectedRules(): Rules 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/test/Unit/RuleSet/Php73Test.php b/test/Unit/RuleSet/Php73Test.php index dfb33d2b..e91c6831 100644 --- a/test/Unit/RuleSet/Php73Test.php +++ b/test/Unit/RuleSet/Php73Test.php @@ -239,7 +239,9 @@ protected function expectedRules(): Rules 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php index b5d1edc3..d00f3ceb 100644 --- a/test/Unit/RuleSet/Php74Test.php +++ b/test/Unit/RuleSet/Php74Test.php @@ -239,7 +239,9 @@ protected function expectedRules(): Rules 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php index b431d836..ffa676c5 100644 --- a/test/Unit/RuleSet/Php80Test.php +++ b/test/Unit/RuleSet/Php80Test.php @@ -241,7 +241,9 @@ protected function expectedRules(): Rules 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php index 9109f767..9b5f16ae 100644 --- a/test/Unit/RuleSet/Php81Test.php +++ b/test/Unit/RuleSet/Php81Test.php @@ -241,7 +241,9 @@ protected function expectedRules(): Rules 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/test/Unit/RuleSet/Php82Test.php b/test/Unit/RuleSet/Php82Test.php index d0a793e5..c57270bf 100644 --- a/test/Unit/RuleSet/Php82Test.php +++ b/test/Unit/RuleSet/Php82Test.php @@ -241,7 +241,9 @@ protected function expectedRules(): Rules 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', diff --git a/test/Unit/RuleSet/Php83Test.php b/test/Unit/RuleSet/Php83Test.php index 06a38e20..22175590 100644 --- a/test/Unit/RuleSet/Php83Test.php +++ b/test/Unit/RuleSet/Php83Test.php @@ -241,7 +241,9 @@ protected function expectedRules(): Rules 'b_mode' => true, ], 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => [ + 'leading_backslash_in_global_namespace' => false, + ], 'function_declaration' => [ 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', From 5e88ca98939a5ee3c0c66e7ee7827d762c7eba38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Thu, 12 Oct 2023 15:31:08 +0200 Subject: [PATCH 4/4] Fix: Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e4a6241..269433a7 100644 --- 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.7.0...main`][6.7.0...main]. +### Changed + +- Updated `friendsofphp/php-cs-fixer` ([#917]), by [@dependabot] + ## [`6.7.0`][6.7.0] For a full diff see [`6.6.0...6.7.0`][6.6.0...6.7.0]. @@ -1303,6 +1307,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [#908]: https://github.com/ergebnis/php-cs-fixer-config/pull/908 [#913]: https://github.com/ergebnis/php-cs-fixer-config/pull/913 [#914]: https://github.com/ergebnis/php-cs-fixer-config/pull/914 +[#917]: https://github.com/ergebnis/php-cs-fixer-config/pull/917 [@dependabot]: https://github.com/apps/dependabot [@linuxjuggler]: https://github.com/linuxjuggler