Merge branch '8.5' into 9.6

sebastianbergmann · Dec 20, 2023 · 4d710ad · 4d710ad
2 parents 2af97f4 + 59f3dc2
commit 4d710ad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,7 +14,7 @@
 
 # PHP-CS-Fixer
 /.php-cs-fixer.php
-/.php-cs-fixer.cache*
+/.php-cs-fixer.cache
 
 # Psalm
 /.psalm/cache

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -335,10 +335,6 @@
         'whitespace_after_comma_in_array' => true,
     ]);
 
-$branch = @trim((string) @shell_exec('git rev-parse --abbrev-ref HEAD'));
-
-if (!empty($branch)) {
-    $config->setCacheFile(__DIR__ . '/.php-cs-fixer.cache.' . $branch);
-}
+$config->setCacheFile(__DIR__ . '/.php-cs-fixer.cache/' . sha1(@trim((string) @shell_exec('git rev-parse --abbrev-ref HEAD'))));
 
 return $config;