Skip to content

Commit

Permalink
Merge branch '8.5' into 9.6
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastianbergmann committed May 16, 2024
2 parents 2a98285 + de0deae commit 0826901
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .phive/phars.xml
Original file line number Diff line number Diff line change
@@ -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"/>
Expand Down
2 changes: 2 additions & 0 deletions .php-cs-fixer.dist.php
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;
Binary file modified tools/php-cs-fixer
Binary file not shown.

0 comments on commit 0826901

Please sign in to comment.