From 3730a8cd683b75bedd6d60a9a2270dc2ad438700 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Jan 2024 11:49:08 +0000 Subject: [PATCH 1/2] composer(deps): Bump friendsofphp/php-cs-fixer from 3.46.0 to 3.48.0 Bumps [friendsofphp/php-cs-fixer](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer) from 3.46.0 to 3.48.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.46.0...v3.48.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 | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 4e63e685..a8098ba8 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ }, "require": { "php": "~8.1.0 || ~8.2.0 || ~8.3.0", - "friendsofphp/php-cs-fixer": "~3.46.0" + "friendsofphp/php-cs-fixer": "~3.48.0" }, "require-dev": { "ergebnis/composer-normalize": "^2.41.1", diff --git a/composer.lock b/composer.lock index 6d4fd44d..98322f6d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4a127be1c8816bae6cf2723c781f7aa9", + "content-hash": "85d846a32e155a7c616bcf679bb8b905", "packages": [ { "name": "composer/pcre", @@ -226,16 +226,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.46.0", + "version": "v3.48.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "be6831c9af1740470d2a773119b9273f8ac1c3d2" + "reference": "a92472c6fb66349de25211f31c77eceae3df024e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/be6831c9af1740470d2a773119b9273f8ac1c3d2", - "reference": "be6831c9af1740470d2a773119b9273f8ac1c3d2", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/a92472c6fb66349de25211f31c77eceae3df024e", + "reference": "a92472c6fb66349de25211f31c77eceae3df024e", "shasum": "" }, "require": { @@ -305,7 +305,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.46.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.48.0" }, "funding": [ { @@ -313,7 +313,7 @@ "type": "github" } ], - "time": "2024-01-03T21:38:46+00:00" + "time": "2024-01-19T21:44:39+00:00" }, { "name": "psr/container", From f1d94c1b172ffe859675cf975ab0e29ade000d7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sat, 20 Jan 2024 12:51:52 +0100 Subject: [PATCH 2/2] Fix: Disable newly added fixers --- src/RuleSet/Custom.php | 3 +++ test/Unit/RuleSet/CustomTest.php | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/RuleSet/Custom.php b/src/RuleSet/Custom.php index 6f44762e..22cc8ffc 100644 --- a/src/RuleSet/Custom.php +++ b/src/RuleSet/Custom.php @@ -103,6 +103,7 @@ public static function create(): RuleSet 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => false, 'implode_call' => false, @@ -128,6 +129,7 @@ public static function create(): RuleSet 'modernize_strpos' => false, 'modernize_types_casting' => false, 'multiline_comment_opening_closing' => false, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => false, 'native_constant_invocation' => false, 'native_function_casing' => false, @@ -186,6 +188,7 @@ public static function create(): RuleSet 'not_operator_with_successor_space' => false, 'nullable_type_declaration' => false, 'nullable_type_declaration_for_default_null_value' => false, + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => false, 'octal_notation' => false, 'operator_linebreak' => false, diff --git a/test/Unit/RuleSet/CustomTest.php b/test/Unit/RuleSet/CustomTest.php index 94d50352..59ccbc88 100644 --- a/test/Unit/RuleSet/CustomTest.php +++ b/test/Unit/RuleSet/CustomTest.php @@ -115,6 +115,7 @@ protected function expectedRules(): Rules 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => false, 'implode_call' => false, @@ -140,6 +141,7 @@ protected function expectedRules(): Rules 'modernize_strpos' => false, 'modernize_types_casting' => false, 'multiline_comment_opening_closing' => false, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => false, 'native_constant_invocation' => false, 'native_function_casing' => false, @@ -198,6 +200,7 @@ protected function expectedRules(): Rules 'not_operator_with_successor_space' => false, 'nullable_type_declaration' => false, 'nullable_type_declaration_for_default_null_value' => false, + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => false, 'octal_notation' => false, 'operator_linebreak' => false,