Merge pull request #942 from ergebnis/dependabot/composer/friendsofph…

…p/php-cs-fixer-3.40.0 composer(deps): Bump friendsofphp/php-cs-fixer from 3.38.0 to 3.40.0
ergebnis · Nov 27, 2023 · dd67116 · dd67116
2 parents 86530c7 + 32f0c40
commit dd67116
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 34 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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();