diff --git a/CHANGELOG.md b/CHANGELOG.md index f74595a4..0321bd91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## Unreleased -For a full diff see [`4.10.0...main`][4.10.0...main]. +For a full diff see [`4.11.0...main`][4.11.0...main]. + +## [`4.11.0`][4.11.0] + +For a full diff see [`4.10.0...4.11.0`][4.10.0...4.11.0]. + +### Changed + +- Updated `friendsofphp/php-cs-fixer` ([#667]), by [@dependabot] ## [`4.10.0`][4.10.0] @@ -574,6 +582,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [4.8.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/4.8.0 [4.9.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/4.9.0 [4.10.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/4.10.0 +[4.11.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/4.11.0 [d899e77...1.0.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/d899e77...1.0.0 [1.0.0...1.1.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/1.0.0...1.1.0 @@ -624,7 +633,8 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [4.7.0...4.8.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.7.0...4.8.0 [4.8.0...4.9.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.8.0...4.9.0 [4.9.0...4.10.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.9.0...4.10.0 -[4.10.0...main]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.10.0...main +[4.10.0...4.11.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.10.0...4.11.0 +[4.11.0...main]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.11.0...main [#3]: https://github.com/ergebnis/php-cs-fixer-config/pull/3 [#14]: https://github.com/ergebnis/php-cs-fixer-config/pull/14 @@ -767,6 +777,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [#655]: https://github.com/ergebnis/php-cs-fixer-config/pull/655 [#661]: https://github.com/ergebnis/php-cs-fixer-config/pull/661 [#662]: https://github.com/ergebnis/php-cs-fixer-config/pull/662 +[#667]: https://github.com/ergebnis/php-cs-fixer-config/pull/667 [@dependabot]: https://github.com/apps/dependabot [@linuxjuggler]: https://github.com/linuxjuggler diff --git a/composer.json b/composer.json index 04daa89d..05ef207a 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "require": { "php": "^7.4 || ^8.0", "ext-filter": "*", - "friendsofphp/php-cs-fixer": "~3.12.0" + "friendsofphp/php-cs-fixer": "~3.13.0" }, "require-dev": { "ergebnis/composer-normalize": "^2.28.3", diff --git a/composer.lock b/composer.lock index be50252a..a74bd2d1 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": "f8f9e46f053043d0d71e45be4f3a67df", + "content-hash": "57cc189a3ce3758507265b9644a02cdc", "packages": [ { "name": "composer/pcre", @@ -375,16 +375,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.12.0", + "version": "v3.13.0", "source": { "type": "git", - "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "eae11d945e2885d86e1c080eec1bb30a2aa27998" + "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", + "reference": "a6232229a8309e8811dc751c28b91cb34b2943e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/eae11d945e2885d86e1c080eec1bb30a2aa27998", - "reference": "eae11d945e2885d86e1c080eec1bb30a2aa27998", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/a6232229a8309e8811dc751c28b91cb34b2943e1", + "reference": "a6232229a8309e8811dc751c28b91cb34b2943e1", "shasum": "" }, "require": { @@ -408,7 +408,7 @@ }, "require-dev": { "justinrainbow/json-schema": "^5.2", - "keradus/cli-executor": "^1.5", + "keradus/cli-executor": "^2.0", "mikey179/vfsstream": "^1.6.10", "php-coveralls/php-coveralls": "^2.5.2", "php-cs-fixer/accessible-object": "^1.1", @@ -451,8 +451,8 @@ ], "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.12.0" + "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.13.0" }, "funding": [ { @@ -460,7 +460,7 @@ "type": "github" } ], - "time": "2022-10-12T14:20:51+00:00" + "time": "2022-10-31T19:28:50+00:00" }, { "name": "psr/cache", @@ -727,16 +727,16 @@ }, { "name": "symfony/console", - "version": "v5.4.14", + "version": "v5.4.15", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "984ea2c0f45f42dfed01d2f3987b187467c4b16d" + "reference": "ea59bb0edfaf9f28d18d8791410ee0355f317669" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/984ea2c0f45f42dfed01d2f3987b187467c4b16d", - "reference": "984ea2c0f45f42dfed01d2f3987b187467c4b16d", + "url": "https://api.github.com/repos/symfony/console/zipball/ea59bb0edfaf9f28d18d8791410ee0355f317669", + "reference": "ea59bb0edfaf9f28d18d8791410ee0355f317669", "shasum": "" }, "require": { @@ -806,7 +806,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.14" + "source": "https://github.com/symfony/console/tree/v5.4.15" }, "funding": [ { @@ -822,7 +822,7 @@ "type": "tidelift" } ], - "time": "2022-10-07T08:01:20+00:00" + "time": "2022-10-26T21:41:52+00:00" }, { "name": "symfony/deprecation-contracts", @@ -2031,16 +2031,16 @@ }, { "name": "symfony/string", - "version": "v5.4.14", + "version": "v5.4.15", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "089e7237497fae7a9c404d0c3aeb8db3254733e4" + "reference": "571334ce9f687e3e6af72db4d3b2a9431e4fd9ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/089e7237497fae7a9c404d0c3aeb8db3254733e4", - "reference": "089e7237497fae7a9c404d0c3aeb8db3254733e4", + "url": "https://api.github.com/repos/symfony/string/zipball/571334ce9f687e3e6af72db4d3b2a9431e4fd9ed", + "reference": "571334ce9f687e3e6af72db4d3b2a9431e4fd9ed", "shasum": "" }, "require": { @@ -2097,7 +2097,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.14" + "source": "https://github.com/symfony/string/tree/v5.4.15" }, "funding": [ { diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php index bb1f1bb0..b187189d 100644 --- a/src/RuleSet/Php74.php +++ b/src/RuleSet/Php74.php @@ -193,6 +193,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet 'full_opening_tag' => true, 'fully_qualified_strict_types' => true, 'function_declaration' => [ + 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', 'trailing_comma_single_line' => false, ], diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php index 34eb926b..d0573d60 100644 --- a/src/RuleSet/Php80.php +++ b/src/RuleSet/Php80.php @@ -193,6 +193,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet 'full_opening_tag' => true, 'fully_qualified_strict_types' => true, 'function_declaration' => [ + 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', 'trailing_comma_single_line' => false, ], diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index ffc541bb..fb424dbe 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -193,6 +193,7 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet 'full_opening_tag' => true, 'fully_qualified_strict_types' => true, 'function_declaration' => [ + 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', 'trailing_comma_single_line' => false, ], diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php index 29b55e89..4b69835b 100644 --- a/test/Unit/RuleSet/Php74Test.php +++ b/test/Unit/RuleSet/Php74Test.php @@ -199,6 +199,7 @@ final class Php74Test extends ExplicitRuleSetTestCase 'full_opening_tag' => true, 'fully_qualified_strict_types' => true, 'function_declaration' => [ + 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', 'trailing_comma_single_line' => false, ], diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php index 9693ce08..74dfc221 100644 --- a/test/Unit/RuleSet/Php80Test.php +++ b/test/Unit/RuleSet/Php80Test.php @@ -199,6 +199,7 @@ final class Php80Test extends ExplicitRuleSetTestCase 'full_opening_tag' => true, 'fully_qualified_strict_types' => true, 'function_declaration' => [ + 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', 'trailing_comma_single_line' => false, ], diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php index 96127336..14eb5de8 100644 --- a/test/Unit/RuleSet/Php81Test.php +++ b/test/Unit/RuleSet/Php81Test.php @@ -199,6 +199,7 @@ final class Php81Test extends ExplicitRuleSetTestCase 'full_opening_tag' => true, 'fully_qualified_strict_types' => true, 'function_declaration' => [ + 'closure_fn_spacing' => 'one', 'closure_function_spacing' => 'one', 'trailing_comma_single_line' => false, ],