From 2a1db41880b1b27b8068e52df57dce7dd9df9c94 Mon Sep 17 00:00:00 2001 From: Nuno Maduro Date: Mon, 20 Feb 2023 22:38:03 +0000 Subject: [PATCH] fix: cache being mixed with phpunit --- .../Runner/ResultCache/DefaultResultCache.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/overrides/Runner/ResultCache/DefaultResultCache.php b/overrides/Runner/ResultCache/DefaultResultCache.php index 3fafc486..f02a06c7 100644 --- a/overrides/Runner/ResultCache/DefaultResultCache.php +++ b/overrides/Runner/ResultCache/DefaultResultCache.php @@ -47,6 +47,7 @@ namespace PHPUnit\Runner\ResultCache; use function array_keys; use function assert; +use function Pest\version; use const DIRECTORY_SEPARATOR; use function dirname; use function file_get_contents; @@ -66,11 +67,6 @@ use PHPUnit\Util\Filesystem; */ final class DefaultResultCache implements ResultCache { - /** - * @var int - */ - private const VERSION = 1; - /** * @var string */ @@ -138,7 +134,7 @@ final class DefaultResultCache implements ResultCache return; } - if ($data['version'] !== self::VERSION) { + if ($data['version'] !== $this->cacheVersion()) { return; } @@ -163,7 +159,7 @@ final class DefaultResultCache implements ResultCache } $data = [ - 'version' => self::VERSION, + 'version' => $this->cacheVersion(), 'defects' => [], 'times' => $this->times, ]; @@ -178,4 +174,12 @@ final class DefaultResultCache implements ResultCache LOCK_EX ); } + + /** + * Returns the cache version. + */ + private function cacheVersion(): string + { + return 'pest_' . version(); + } }