diff --git a/CHANGELOG.md b/CHANGELOG.md index aa3aadb7..5c9ebd99 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.11.0...main`][6.11.0...main]. +### Changed + +- Updated `friendsofphp/php-cs-fixer` ([#942]), by [@dependabot] + ## [`6.11.0`][6.11.0] For a full diff see [`6.10.0...6.11.0`][6.10.0...6.11.0]. @@ -1368,6 +1372,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [#927]: https://github.com/ergebnis/php-cs-fixer-config/pull/927 [#928]: https://github.com/ergebnis/php-cs-fixer-config/pull/928 [#930]: https://github.com/ergebnis/php-cs-fixer-config/pull/930 +[#942]: https://github.com/ergebnis/php-cs-fixer-config/pull/942 [@dependabot]: https://github.com/apps/dependabot [@linuxjuggler]: https://github.com/linuxjuggler diff --git a/Makefile b/Makefile index cc995b5e..668abe0b 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ coding-standards: vendor ## Lints YAML files with yamllint, normalizes composer. yamllint -c .yamllint.yaml --strict . composer normalize mkdir -p .build/php-cs-fixer/ - PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --verbose + vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --verbose .PHONY: dependency-analysis dependency-analysis: phive vendor ## Runs a dependency analysis with maglnet/composer-require-checker diff --git a/composer.json b/composer.json index d12e9765..9eb31064 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.1", - "friendsofphp/php-cs-fixer": "~3.38.0", + "friendsofphp/php-cs-fixer": "~3.40.0", "kubawerlos/php-cs-fixer-custom-fixers": "~3.17.0" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 8df31d7f..a1a32388 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": "ec0713735274401044c622013fd89304", + "content-hash": "2ee070535e687b99ec0f087bbd77e15e", "packages": [ { "name": "composer/pcre", @@ -288,50 +288,50 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.38.2", + "version": "v3.40.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "d872cdd543797ade030aaa307c0a4954a712e081" + "reference": "27d2b3265b5d550ec411b4319967ae7cfddfb2e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/d872cdd543797ade030aaa307c0a4954a712e081", - "reference": "d872cdd543797ade030aaa307c0a4954a712e081", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/27d2b3265b5d550ec411b4319967ae7cfddfb2e0", + "reference": "27d2b3265b5d550ec411b4319967ae7cfddfb2e0", "shasum": "" }, "require": { - "composer/semver": "^3.3", + "composer/semver": "^3.4", "composer/xdebug-handler": "^3.0.3", "ext-json": "*", "ext-tokenizer": "*", "php": "^7.4 || ^8.0", "sebastian/diff": "^4.0 || ^5.0", - "symfony/console": "^5.4 || ^6.0", - "symfony/event-dispatcher": "^5.4 || ^6.0", - "symfony/filesystem": "^5.4 || ^6.0", - "symfony/finder": "^5.4 || ^6.0", - "symfony/options-resolver": "^5.4 || ^6.0", - "symfony/polyfill-mbstring": "^1.27", - "symfony/polyfill-php80": "^1.27", - "symfony/polyfill-php81": "^1.27", - "symfony/process": "^5.4 || ^6.0", - "symfony/stopwatch": "^5.4 || ^6.0" + "symfony/console": "^5.4 || ^6.0 || ^7.0", + "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0", + "symfony/filesystem": "^5.4 || ^6.0 || ^7.0", + "symfony/finder": "^5.4 || ^6.0 || ^7.0", + "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0", + "symfony/polyfill-mbstring": "^1.28", + "symfony/polyfill-php80": "^1.28", + "symfony/polyfill-php81": "^1.28", + "symfony/process": "^5.4 || ^6.0 || ^7.0", + "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0" }, "require-dev": { "facile-it/paraunit": "^1.3 || ^2.0", "justinrainbow/json-schema": "^5.2", - "keradus/cli-executor": "^2.0", + "keradus/cli-executor": "^2.1", "mikey179/vfsstream": "^1.6.11", - "php-coveralls/php-coveralls": "^2.5.3", + "php-coveralls/php-coveralls": "^2.7", "php-cs-fixer/accessible-object": "^1.1", - "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", - "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", - "phpspec/prophecy": "^1.16", + "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.4", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.4", + "phpspec/prophecy": "^1.17", "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.5", - "symfony/phpunit-bridge": "^6.2.3", - "symfony/yaml": "^5.4 || ^6.0" + "phpunit/phpunit": "^9.6", + "symfony/phpunit-bridge": "^6.3.8 || ^7.0", + "symfony/yaml": "^5.4 || ^6.0 || ^7.0" }, "suggest": { "ext-dom": "For handling output formats in XML", @@ -369,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.38.2" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.40.0" }, "funding": [ { @@ -377,7 +377,7 @@ "type": "github" } ], - "time": "2023-11-14T00:19:22+00:00" + "time": "2023-11-26T09:25:53+00:00" }, { "name": "kubawerlos/php-cs-fixer-custom-fixers", diff --git a/test/EndToEnd/RuleSet/AbstractRuleSetTestCase.php b/test/EndToEnd/RuleSet/AbstractRuleSetTestCase.php index 149dc9cc..09768545 100644 --- a/test/EndToEnd/RuleSet/AbstractRuleSetTestCase.php +++ b/test/EndToEnd/RuleSet/AbstractRuleSetTestCase.php @@ -50,12 +50,6 @@ final public function testConfigurationIsConsideredValid(): void self::configPath(), ], null, - [ - /** - * @see https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/v3.13.1/php-cs-fixer#L31-L44 - */ - 'PHP_CS_FIXER_IGNORE_ENV' => true, - ], ); $process->run();