Merge branch '8.5' into 9.6

sebastianbergmann · May 16, 2024 · 0826901 · 0826901
2 parents 2a98285 + de0deae
commit 0826901
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
   <phar name="phpab" version="^1.29" installed="1.29.1" location="./tools/phpab" copy="true"/>
-  <phar name="php-cs-fixer" version="^3.53" installed="3.56.1" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.53" installed="3.57.1" location="./tools/php-cs-fixer" copy="true"/>
   <phar name="psalm" version="^5.23" installed="5.24.0" location="./tools/psalm" copy="true"/>
   <phar name="humbug/php-scoper" version="^0.18" installed="0.18.11" location="./tools/php-scoper" copy="true"/>
   <phar name="composer" version="^2.7" installed="2.7.6" location="./tools/composer" copy="true"/>

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -338,4 +338,6 @@
 
 $config->setCacheFile(__DIR__ . '/.php-cs-fixer.cache/' . json_decode((string) @file_get_contents('composer.json'), true)["extra"]["branch-alias"]["dev-master"] ?? 'unknown');
 
+$config->setParallelConfig(\PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect());
+
 return $config;
diff --git a/tools/php-cs-fixer b/tools/php-cs-fixer
Original file line number	Diff line number	Diff line change
Expand Up		@@ -338,4 +338,6 @@

		$config->setCacheFile(__DIR__ . '/.php-cs-fixer.cache/' . json_decode((string) @file_get_contents('composer.json'), true)["extra"]["branch-alias"]["dev-master"] ?? 'unknown');

		$config->setParallelConfig(\PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect());

		return $config;