From be4b6135c0b612eb66b463e4c89285f1d0404f84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jul 2022 10:32:21 +0000 Subject: [PATCH 1/3] composer(deps): bump friendsofphp/php-cs-fixer from 3.8.0 to 3.9.1 Bumps [friendsofphp/php-cs-fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer) from 3.8.0 to 3.9.1. - [Release notes](https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases) - [Changelog](https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/master/CHANGELOG.md) - [Commits](https://github.com/FriendsOfPHP/PHP-CS-Fixer/compare/v3.8.0...v3.9.1) --- 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 | 93 ++++++++++++++++++++++++++------------------------- 2 files changed, 48 insertions(+), 47 deletions(-) diff --git a/composer.json b/composer.json index 05c21bed..99c983ed 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "require": { "php": "^7.4 || ^8.0", "ext-filter": "*", - "friendsofphp/php-cs-fixer": "~3.8.0" + "friendsofphp/php-cs-fixer": "~3.9.1" }, "require-dev": { "ergebnis/composer-normalize": "^2.28.3", diff --git a/composer.lock b/composer.lock index 03f3fbd3..24cbe833 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": "7d2f1c926ebf008241ba96bb557cb96d", + "content-hash": "2e2d2bb56c3ef47fd16e1f221861071e", "packages": [ { "name": "composer/pcre", @@ -226,16 +226,16 @@ }, { "name": "doctrine/annotations", - "version": "1.13.2", + "version": "1.13.3", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "5b668aef16090008790395c02c893b1ba13f7e08" + "reference": "648b0343343565c4a056bfc8392201385e8d89f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08", - "reference": "5b668aef16090008790395c02c893b1ba13f7e08", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/648b0343343565c4a056bfc8392201385e8d89f0", + "reference": "648b0343343565c4a056bfc8392201385e8d89f0", "shasum": "" }, "require": { @@ -247,9 +247,10 @@ "require-dev": { "doctrine/cache": "^1.11 || ^2.0", "doctrine/coding-standard": "^6.0 || ^8.1", - "phpstan/phpstan": "^0.12.20", + "phpstan/phpstan": "^1.4.10 || ^1.8.0", "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5", - "symfony/cache": "^4.4 || ^5.2" + "symfony/cache": "^4.4 || ^5.2", + "vimeo/psalm": "^4.10" }, "type": "library", "autoload": { @@ -292,9 +293,9 @@ ], "support": { "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.13.2" + "source": "https://github.com/doctrine/annotations/tree/1.13.3" }, - "time": "2021-08-05T19:00:23+00:00" + "time": "2022-07-02T10:48:51+00:00" }, { "name": "doctrine/lexer", @@ -374,16 +375,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.8.0", + "version": "v3.9.1", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "cbad1115aac4b5c3c5540e7210d3c9fba2f81fa3" + "reference": "94441633b80495464eb34eb3f7d63445221b2585" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/cbad1115aac4b5c3c5540e7210d3c9fba2f81fa3", - "reference": "cbad1115aac4b5c3c5540e7210d3c9fba2f81fa3", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/94441633b80495464eb34eb3f7d63445221b2585", + "reference": "94441633b80495464eb34eb3f7d63445221b2585", "shasum": "" }, "require": { @@ -451,7 +452,7 @@ "description": "A tool to automatically fix PHP code style", "support": { "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", - "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.8.0" + "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.9.1" }, "funding": [ { @@ -459,7 +460,7 @@ "type": "github" } ], - "time": "2022-03-18T17:20:59+00:00" + "time": "2022-07-11T08:51:43+00:00" }, { "name": "php-cs-fixer/diff", @@ -878,16 +879,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v5.4.3", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "dec8a9f58d20df252b9cd89f1c6c1530f747685d" + "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/dec8a9f58d20df252b9cd89f1c6c1530f747685d", - "reference": "dec8a9f58d20df252b9cd89f1c6c1530f747685d", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc", + "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc", "shasum": "" }, "require": { @@ -943,7 +944,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.3" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.9" }, "funding": [ { @@ -959,7 +960,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2022-05-05T16:45:39+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -1042,16 +1043,16 @@ }, { "name": "symfony/filesystem", - "version": "v5.4.6", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "d53a45039974952af7f7ebc461ccdd4295e29440" + "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/d53a45039974952af7f7ebc461ccdd4295e29440", - "reference": "d53a45039974952af7f7ebc461ccdd4295e29440", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/36a017fa4cce1eff1b8e8129ff53513abcef05ba", + "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba", "shasum": "" }, "require": { @@ -1086,7 +1087,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.6" + "source": "https://github.com/symfony/filesystem/tree/v5.4.9" }, "funding": [ { @@ -1102,20 +1103,20 @@ "type": "tidelift" } ], - "time": "2022-03-02T12:42:23+00:00" + "time": "2022-05-20T13:55:35+00:00" }, { "name": "symfony/finder", - "version": "v5.4.3", + "version": "v5.4.8", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d" + "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/231313534dded84c7ecaa79d14bc5da4ccb69b7d", - "reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d", + "url": "https://api.github.com/repos/symfony/finder/zipball/9b630f3427f3ebe7cd346c277a1408b00249dad9", + "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9", "shasum": "" }, "require": { @@ -1149,7 +1150,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.3" + "source": "https://github.com/symfony/finder/tree/v5.4.8" }, "funding": [ { @@ -1165,7 +1166,7 @@ "type": "tidelift" } ], - "time": "2022-01-26T16:34:36+00:00" + "time": "2022-04-15T08:07:45+00:00" }, { "name": "symfony/options-resolver", @@ -1730,16 +1731,16 @@ }, { "name": "symfony/polyfill-php81", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f" + "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f", - "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1", + "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1", "shasum": "" }, "require": { @@ -1748,7 +1749,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1789,7 +1790,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.26.0" }, "funding": [ { @@ -1805,20 +1806,20 @@ "type": "tidelift" } ], - "time": "2021-09-13T13:58:11+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/process", - "version": "v5.4.5", + "version": "v5.4.8", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "95440409896f90a5f85db07a32b517ecec17fa4c" + "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/95440409896f90a5f85db07a32b517ecec17fa4c", - "reference": "95440409896f90a5f85db07a32b517ecec17fa4c", + "url": "https://api.github.com/repos/symfony/process/zipball/597f3fff8e3e91836bb0bd38f5718b56ddbde2f3", + "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3", "shasum": "" }, "require": { @@ -1851,7 +1852,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.5" + "source": "https://github.com/symfony/process/tree/v5.4.8" }, "funding": [ { @@ -1867,7 +1868,7 @@ "type": "tidelift" } ], - "time": "2022-01-30T18:16:22+00:00" + "time": "2022-04-08T05:07:18+00:00" }, { "name": "symfony/service-contracts", From e2fc621f4c343c1e1aa66ef7fd62d3d2b4ce1516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Mon, 11 Jul 2022 12:38:37 +0200 Subject: [PATCH 2/3] Fix: Disable newly added fixers --- src/RuleSet/Php74.php | 5 +++++ src/RuleSet/Php80.php | 5 +++++ src/RuleSet/Php81.php | 5 +++++ test/Unit/RuleSet/Php74Test.php | 5 +++++ test/Unit/RuleSet/Php80Test.php | 5 +++++ test/Unit/RuleSet/Php81Test.php | 5 +++++ 6 files changed, 30 insertions(+) diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php index 313adf73..9e51984a 100644 --- a/src/RuleSet/Php74.php +++ b/src/RuleSet/Php74.php @@ -60,6 +60,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet 'yield_from', ], ], + 'blank_line_between_import_groups' => false, 'braces' => [ 'allow_single_line_anonymous_class_with_empty_body' => true, 'allow_single_line_closure' => false, @@ -100,9 +101,11 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet 'constant_case' => [ 'case' => 'lower', ], + 'control_structure_braces' => false, 'control_structure_continuation_position' => [ 'position' => 'same_line', ], + 'curly_braces_position' => false, 'date_time_create_from_format_call' => true, 'date_time_immutable' => true, 'declare_equal_normalize' => [ @@ -357,6 +360,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet 'no_unset_on_property' => true, 'no_unused_imports' => true, 'no_useless_else' => true, + 'no_useless_nullsafe_operator' => false, 'no_useless_return' => true, 'no_useless_sprintf' => true, 'no_whitespace_before_comma_in_array' => [ @@ -695,6 +699,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet ], 'standardize_increment' => true, 'standardize_not_equals' => true, + 'statement_indentation' => false, 'static_lambda' => true, 'strict_comparison' => true, 'strict_param' => true, diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php index dce9b3e1..9fcbf562 100644 --- a/src/RuleSet/Php80.php +++ b/src/RuleSet/Php80.php @@ -60,6 +60,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet 'yield_from', ], ], + 'blank_line_between_import_groups' => false, 'braces' => [ 'allow_single_line_anonymous_class_with_empty_body' => true, 'allow_single_line_closure' => false, @@ -100,9 +101,11 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet 'constant_case' => [ 'case' => 'lower', ], + 'control_structure_braces' => false, 'control_structure_continuation_position' => [ 'position' => 'same_line', ], + 'curly_braces_position' => false, 'date_time_create_from_format_call' => true, 'date_time_immutable' => true, 'declare_equal_normalize' => [ @@ -357,6 +360,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet 'no_unset_on_property' => true, 'no_unused_imports' => true, 'no_useless_else' => true, + 'no_useless_nullsafe_operator' => false, 'no_useless_return' => true, 'no_useless_sprintf' => true, 'no_whitespace_before_comma_in_array' => [ @@ -695,6 +699,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet ], 'standardize_increment' => true, 'standardize_not_equals' => true, + 'statement_indentation' => false, 'static_lambda' => true, 'strict_comparison' => true, 'strict_param' => true, diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index ab34b29a..3e90e0cb 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -60,6 +60,7 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet 'yield_from', ], ], + 'blank_line_between_import_groups' => false, 'braces' => [ 'allow_single_line_anonymous_class_with_empty_body' => true, 'allow_single_line_closure' => false, @@ -100,9 +101,11 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet 'constant_case' => [ 'case' => 'lower', ], + 'control_structure_braces' => false, 'control_structure_continuation_position' => [ 'position' => 'same_line', ], + 'curly_braces_position' => false, 'date_time_create_from_format_call' => true, 'date_time_immutable' => true, 'declare_equal_normalize' => [ @@ -357,6 +360,7 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet 'no_unset_on_property' => true, 'no_unused_imports' => true, 'no_useless_else' => true, + 'no_useless_nullsafe_operator' => false, 'no_useless_return' => true, 'no_useless_sprintf' => true, 'no_whitespace_before_comma_in_array' => [ @@ -698,6 +702,7 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet ], 'standardize_increment' => true, 'standardize_not_equals' => true, + 'statement_indentation' => false, 'static_lambda' => true, 'strict_comparison' => true, 'strict_param' => true, diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php index f5b42dd5..2f41341b 100644 --- a/test/Unit/RuleSet/Php74Test.php +++ b/test/Unit/RuleSet/Php74Test.php @@ -66,6 +66,7 @@ final class Php74Test extends ExplicitRuleSetTestCase 'yield_from', ], ], + 'blank_line_between_import_groups' => false, 'braces' => [ 'allow_single_line_anonymous_class_with_empty_body' => true, 'allow_single_line_closure' => false, @@ -106,9 +107,11 @@ final class Php74Test extends ExplicitRuleSetTestCase 'constant_case' => [ 'case' => 'lower', ], + 'control_structure_braces' => false, 'control_structure_continuation_position' => [ 'position' => 'same_line', ], + 'curly_braces_position' => false, 'date_time_create_from_format_call' => true, 'date_time_immutable' => true, 'declare_equal_normalize' => [ @@ -363,6 +366,7 @@ final class Php74Test extends ExplicitRuleSetTestCase 'no_unset_on_property' => true, 'no_unused_imports' => true, 'no_useless_else' => true, + 'no_useless_nullsafe_operator' => false, 'no_useless_return' => true, 'no_useless_sprintf' => true, 'no_whitespace_before_comma_in_array' => [ @@ -701,6 +705,7 @@ final class Php74Test extends ExplicitRuleSetTestCase ], 'standardize_increment' => true, 'standardize_not_equals' => true, + 'statement_indentation' => false, 'static_lambda' => true, 'strict_comparison' => true, 'strict_param' => true, diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php index 8c181ecf..41b5120c 100644 --- a/test/Unit/RuleSet/Php80Test.php +++ b/test/Unit/RuleSet/Php80Test.php @@ -66,6 +66,7 @@ final class Php80Test extends ExplicitRuleSetTestCase 'yield_from', ], ], + 'blank_line_between_import_groups' => false, 'braces' => [ 'allow_single_line_anonymous_class_with_empty_body' => true, 'allow_single_line_closure' => false, @@ -106,9 +107,11 @@ final class Php80Test extends ExplicitRuleSetTestCase 'constant_case' => [ 'case' => 'lower', ], + 'control_structure_braces' => false, 'control_structure_continuation_position' => [ 'position' => 'same_line', ], + 'curly_braces_position' => false, 'date_time_create_from_format_call' => true, 'date_time_immutable' => true, 'declare_equal_normalize' => [ @@ -363,6 +366,7 @@ final class Php80Test extends ExplicitRuleSetTestCase 'no_unset_on_property' => true, 'no_unused_imports' => true, 'no_useless_else' => true, + 'no_useless_nullsafe_operator' => false, 'no_useless_return' => true, 'no_useless_sprintf' => true, 'no_whitespace_before_comma_in_array' => [ @@ -701,6 +705,7 @@ final class Php80Test extends ExplicitRuleSetTestCase ], 'standardize_increment' => true, 'standardize_not_equals' => true, + 'statement_indentation' => false, 'static_lambda' => true, 'strict_comparison' => true, 'strict_param' => true, diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php index 6ec19d82..10f1c01c 100644 --- a/test/Unit/RuleSet/Php81Test.php +++ b/test/Unit/RuleSet/Php81Test.php @@ -66,6 +66,7 @@ final class Php81Test extends ExplicitRuleSetTestCase 'yield_from', ], ], + 'blank_line_between_import_groups' => false, 'braces' => [ 'allow_single_line_anonymous_class_with_empty_body' => true, 'allow_single_line_closure' => false, @@ -106,9 +107,11 @@ final class Php81Test extends ExplicitRuleSetTestCase 'constant_case' => [ 'case' => 'lower', ], + 'control_structure_braces' => false, 'control_structure_continuation_position' => [ 'position' => 'same_line', ], + 'curly_braces_position' => false, 'date_time_create_from_format_call' => true, 'date_time_immutable' => true, 'declare_equal_normalize' => [ @@ -363,6 +366,7 @@ final class Php81Test extends ExplicitRuleSetTestCase 'no_unset_on_property' => true, 'no_unused_imports' => true, 'no_useless_else' => true, + 'no_useless_nullsafe_operator' => false, 'no_useless_return' => true, 'no_useless_sprintf' => true, 'no_whitespace_before_comma_in_array' => [ @@ -704,6 +708,7 @@ final class Php81Test extends ExplicitRuleSetTestCase ], 'standardize_increment' => true, 'standardize_not_equals' => true, + 'statement_indentation' => false, 'static_lambda' => true, 'strict_comparison' => true, 'strict_param' => true, From e62f83b5ea75b2a3cb75ffcab1f1e06fe2f68922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Mon, 11 Jul 2022 12:39:17 +0200 Subject: [PATCH 3/3] Fix: Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6a8437c..bcf94187 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 [`4.4.0...main`][4.4.0...main]. +### Changed + +- Updated `friendsofphp/php-cs-fixer` ([#620]), by [@dependabot] + ## [`4.4.0`][4.4.0] For a full diff see [`4.3.0...4.4.0`][4.3.0...4.4.0]. @@ -634,6 +638,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [#591]: https://github.com/ergebnis/php-cs-fixer-config/pull/591 [#592]: https://github.com/ergebnis/php-cs-fixer-config/pull/592 [#593]: https://github.com/ergebnis/php-cs-fixer-config/pull/593 +[#620]: https://github.com/ergebnis/php-cs-fixer-config/pull/620 [@dependabot]: https://github.com/apps/dependabot [@linuxjuggler]: https://github.com/linuxjuggler