diff --git a/CHANGELOG.md b/CHANGELOG.md index 5aa8fd54..35bd9aac 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.0.0...main`][4.0.0...main]. +### Changed + +- Updated `friendsofphp/php-cs-fixer` ([#565]), by [@dependabot] + ## [`4.0.0`][4.0.0] For a full diff see [`3.4.0...4.0.0`][3.4.0...4.0.0]. @@ -568,6 +572,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [#544]: https://github.com/ergebnis/php-cs-fixer-config/pull/544 [#545]: https://github.com/ergebnis/php-cs-fixer-config/pull/545 [#553]: https://github.com/ergebnis/php-cs-fixer-config/pull/553 +[#565]: https://github.com/ergebnis/php-cs-fixer-config/pull/565 [@dependabot]: https://github.com/apps/dependabot [@linuxjuggler]: https://github.com/linuxjuggler diff --git a/composer.json b/composer.json index 4219899a..70009e00 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "require": { "php": "^7.4 || ^8.0", "ext-filter": "*", - "friendsofphp/php-cs-fixer": "~3.5.0" + "friendsofphp/php-cs-fixer": "~3.6.0" }, "require-dev": { "ergebnis/composer-normalize": "^2.23.1", diff --git a/composer.lock b/composer.lock index 692ed01d..f167b534 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": "3a9e4e2b71d7096a18129314bcbee27a", + "content-hash": "28c249736aa1115622f77b737c1c155e", "packages": [ { "name": "composer/pcre", @@ -79,16 +79,16 @@ }, { "name": "composer/semver", - "version": "3.2.8", + "version": "3.2.9", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "3976a9e563da06e8dd8ca856fa2adcd66cdd98f3" + "reference": "a951f614bd64dcd26137bc9b7b2637ddcfc57649" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/3976a9e563da06e8dd8ca856fa2adcd66cdd98f3", - "reference": "3976a9e563da06e8dd8ca856fa2adcd66cdd98f3", + "url": "https://api.github.com/repos/composer/semver/zipball/a951f614bd64dcd26137bc9b7b2637ddcfc57649", + "reference": "a951f614bd64dcd26137bc9b7b2637ddcfc57649", "shasum": "" }, "require": { @@ -140,7 +140,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.2.8" + "source": "https://github.com/composer/semver/tree/3.2.9" }, "funding": [ { @@ -156,7 +156,7 @@ "type": "tidelift" } ], - "time": "2022-02-04T12:12:24+00:00" + "time": "2022-02-04T13:58:43+00:00" }, { "name": "composer/xdebug-handler", @@ -374,16 +374,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.5.0", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "333f15e07c866e33e2765e84ba1e0b88e6a3af3b" + "reference": "1975e4453eb2726d1f50da0ce7fa91295029a4fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/333f15e07c866e33e2765e84ba1e0b88e6a3af3b", - "reference": "333f15e07c866e33e2765e84ba1e0b88e6a3af3b", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/1975e4453eb2726d1f50da0ce7fa91295029a4fa", + "reference": "1975e4453eb2726d1f50da0ce7fa91295029a4fa", "shasum": "" }, "require": { @@ -451,7 +451,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.5.0" + "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.6.0" }, "funding": [ { @@ -459,7 +459,7 @@ "type": "github" } ], - "time": "2022-01-14T00:29:20+00:00" + "time": "2022-02-07T18:02:40+00:00" }, { "name": "php-cs-fixer/diff", @@ -878,16 +878,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v5.4.0", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb" + "reference": "dec8a9f58d20df252b9cd89f1c6c1530f747685d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/27d39ae126352b9fa3be5e196ccf4617897be3eb", - "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/dec8a9f58d20df252b9cd89f1c6c1530f747685d", + "reference": "dec8a9f58d20df252b9cd89f1c6c1530f747685d", "shasum": "" }, "require": { @@ -943,7 +943,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.0" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.3" }, "funding": [ { @@ -959,7 +959,7 @@ "type": "tidelift" } ], - "time": "2021-11-23T10:19:22+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -1042,16 +1042,16 @@ }, { "name": "symfony/filesystem", - "version": "v5.4.0", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01" + "reference": "0f0c4bf1840420f4aef3f32044a9dbb24682731b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/731f917dc31edcffec2c6a777f3698c33bea8f01", - "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/0f0c4bf1840420f4aef3f32044a9dbb24682731b", + "reference": "0f0c4bf1840420f4aef3f32044a9dbb24682731b", "shasum": "" }, "require": { @@ -1086,7 +1086,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.0" + "source": "https://github.com/symfony/filesystem/tree/v5.4.3" }, "funding": [ { @@ -1102,20 +1102,20 @@ "type": "tidelift" } ], - "time": "2021-10-28T13:39:27+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/finder", - "version": "v5.4.2", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "e77046c252be48c48a40816187ed527703c8f76c" + "reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/e77046c252be48c48a40816187ed527703c8f76c", - "reference": "e77046c252be48c48a40816187ed527703c8f76c", + "url": "https://api.github.com/repos/symfony/finder/zipball/231313534dded84c7ecaa79d14bc5da4ccb69b7d", + "reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d", "shasum": "" }, "require": { @@ -1149,7 +1149,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.2" + "source": "https://github.com/symfony/finder/tree/v5.4.3" }, "funding": [ { @@ -1165,20 +1165,20 @@ "type": "tidelift" } ], - "time": "2021-12-15T11:06:13+00:00" + "time": "2022-01-26T16:34:36+00:00" }, { "name": "symfony/options-resolver", - "version": "v5.4.0", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "b0fb78576487af19c500aaddb269fd36701d4847" + "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/b0fb78576487af19c500aaddb269fd36701d4847", - "reference": "b0fb78576487af19c500aaddb269fd36701d4847", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/cc1147cb11af1b43f503ac18f31aa3bec213aba8", + "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8", "shasum": "" }, "require": { @@ -1218,7 +1218,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.4.0" + "source": "https://github.com/symfony/options-resolver/tree/v5.4.3" }, "funding": [ { @@ -1234,7 +1234,7 @@ "type": "tidelift" } ], - "time": "2021-11-23T10:19:22+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/polyfill-ctype", @@ -1349,12 +1349,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Grapheme\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1430,12 +1430,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -1594,12 +1594,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -1673,12 +1673,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -1756,12 +1756,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php81\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php81\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -1809,16 +1809,16 @@ }, { "name": "symfony/process", - "version": "v5.4.2", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "2b3ba8722c4aaf3e88011be5e7f48710088fb5e4" + "reference": "553f50487389a977eb31cf6b37faae56da00f753" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/2b3ba8722c4aaf3e88011be5e7f48710088fb5e4", - "reference": "2b3ba8722c4aaf3e88011be5e7f48710088fb5e4", + "url": "https://api.github.com/repos/symfony/process/zipball/553f50487389a977eb31cf6b37faae56da00f753", + "reference": "553f50487389a977eb31cf6b37faae56da00f753", "shasum": "" }, "require": { @@ -1851,7 +1851,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.2" + "source": "https://github.com/symfony/process/tree/v5.4.3" }, "funding": [ { @@ -1867,7 +1867,7 @@ "type": "tidelift" } ], - "time": "2021-12-27T21:01:00+00:00" + "time": "2022-01-26T16:28:35+00:00" }, { "name": "symfony/service-contracts", @@ -1954,16 +1954,16 @@ }, { "name": "symfony/stopwatch", - "version": "v5.4.0", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "208ef96122bfed82a8f3a61458a07113a08bdcfe" + "reference": "395220730edceb6bd745236ccb5c9125c748f779" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/208ef96122bfed82a8f3a61458a07113a08bdcfe", - "reference": "208ef96122bfed82a8f3a61458a07113a08bdcfe", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/395220730edceb6bd745236ccb5c9125c748f779", + "reference": "395220730edceb6bd745236ccb5c9125c748f779", "shasum": "" }, "require": { @@ -1996,7 +1996,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.4.0" + "source": "https://github.com/symfony/stopwatch/tree/v5.4.3" }, "funding": [ { @@ -2012,7 +2012,7 @@ "type": "tidelift" } ], - "time": "2021-11-23T10:19:22+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/string", diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php index 5b2ebfed..97e45e82 100644 --- a/src/RuleSet/Php74.php +++ b/src/RuleSet/Php74.php @@ -81,6 +81,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet 'single_line' => false, 'space_before_parenthesis' => false, ], + 'class_reference_name_casing' => false, 'clean_namespace' => true, 'combine_consecutive_issets' => true, 'combine_consecutive_unsets' => true, @@ -342,6 +343,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet 'no_unneeded_final_method' => [ 'private_methods' => true, ], + 'no_unneeded_import_alias' => false, 'no_unreachable_default_argument_value' => true, 'no_unset_cast' => true, 'no_unset_on_property' => true, diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php index 8e993665..c7d890ff 100644 --- a/src/RuleSet/Php80.php +++ b/src/RuleSet/Php80.php @@ -81,6 +81,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet 'single_line' => false, 'space_before_parenthesis' => false, ], + 'class_reference_name_casing' => false, 'clean_namespace' => true, 'combine_consecutive_issets' => true, 'combine_consecutive_unsets' => true, @@ -342,6 +343,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet 'no_unneeded_final_method' => [ 'private_methods' => true, ], + 'no_unneeded_import_alias' => false, 'no_unreachable_default_argument_value' => true, 'no_unset_cast' => true, 'no_unset_on_property' => true, diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index 771986ca..0a0ac8eb 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -81,6 +81,7 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet 'single_line' => false, 'space_before_parenthesis' => false, ], + 'class_reference_name_casing' => false, 'clean_namespace' => true, 'combine_consecutive_issets' => true, 'combine_consecutive_unsets' => true, @@ -342,6 +343,7 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet 'no_unneeded_final_method' => [ 'private_methods' => true, ], + 'no_unneeded_import_alias' => false, 'no_unreachable_default_argument_value' => true, 'no_unset_cast' => true, 'no_unset_on_property' => true, diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php index 9775d043..34cc443d 100644 --- a/test/Unit/RuleSet/Php74Test.php +++ b/test/Unit/RuleSet/Php74Test.php @@ -87,6 +87,7 @@ final class Php74Test extends ExplicitRuleSetTestCase 'single_line' => false, 'space_before_parenthesis' => false, ], + 'class_reference_name_casing' => false, 'clean_namespace' => true, 'combine_consecutive_issets' => true, 'combine_consecutive_unsets' => true, @@ -348,6 +349,7 @@ final class Php74Test extends ExplicitRuleSetTestCase 'no_unneeded_final_method' => [ 'private_methods' => true, ], + 'no_unneeded_import_alias' => false, 'no_unreachable_default_argument_value' => true, 'no_unset_cast' => true, 'no_unset_on_property' => true, diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php index 20a6be03..ecd06391 100644 --- a/test/Unit/RuleSet/Php80Test.php +++ b/test/Unit/RuleSet/Php80Test.php @@ -87,6 +87,7 @@ final class Php80Test extends ExplicitRuleSetTestCase 'single_line' => false, 'space_before_parenthesis' => false, ], + 'class_reference_name_casing' => false, 'clean_namespace' => true, 'combine_consecutive_issets' => true, 'combine_consecutive_unsets' => true, @@ -348,6 +349,7 @@ final class Php80Test extends ExplicitRuleSetTestCase 'no_unneeded_final_method' => [ 'private_methods' => true, ], + 'no_unneeded_import_alias' => false, 'no_unreachable_default_argument_value' => true, 'no_unset_cast' => true, 'no_unset_on_property' => true, diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php index 5107a2b9..79da063f 100644 --- a/test/Unit/RuleSet/Php81Test.php +++ b/test/Unit/RuleSet/Php81Test.php @@ -87,6 +87,7 @@ final class Php81Test extends ExplicitRuleSetTestCase 'single_line' => false, 'space_before_parenthesis' => false, ], + 'class_reference_name_casing' => false, 'clean_namespace' => true, 'combine_consecutive_issets' => true, 'combine_consecutive_unsets' => true, @@ -348,6 +349,7 @@ final class Php81Test extends ExplicitRuleSetTestCase 'no_unneeded_final_method' => [ 'private_methods' => true, ], + 'no_unneeded_import_alias' => false, 'no_unreachable_default_argument_value' => true, 'no_unset_cast' => true, 'no_unset_on_property' => true,