revert parts of #5742

sebastianbergmann · Mar 21, 2024 · 876ba67 · 876ba67
1 parent 4119fba
commit 876ba67
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/Runner/ResultCache/DefaultResultCache.php b/src/Runner/ResultCache/DefaultResultCache.php
@@ -88,7 +88,6 @@ public function load(): void
         if (!is_file($this->cacheFilename)) {
             return;
         }
-
         $contents = file_get_contents($this->cacheFilename);
 
         if ($contents === false) {

diff --git a/src/TextUI/Application.php b/src/TextUI/Application.php
@@ -516,7 +516,9 @@ private function writeRandomSeedInformation(Printer $printer, Configuration $con
     private function registerLogfileWriters(Configuration $configuration): void
     {
         if ($configuration->hasLogEventsText()) {
-            @unlink($configuration->logEventsText());
+            if (is_file($configuration->logEventsText())) {
+                unlink($configuration->logEventsText());
+            }
 
             EventFacade::instance()->registerTracer(
                 new EventLogger(
@@ -527,7 +529,9 @@ private function registerLogfileWriters(Configuration $configuration): void
         }
 
         if ($configuration->hasLogEventsVerboseText()) {
-            @unlink($configuration->logEventsVerboseText());
+            if (is_file($configuration->logEventsVerboseText())) {
+                unlink($configuration->logEventsVerboseText());
+            }
 
             EventFacade::instance()->registerTracer(
                 new EventLogger(

diff --git a/src/Util/PHP/AbstractPhpProcess.php b/src/Util/PHP/AbstractPhpProcess.php
@@ -138,13 +138,11 @@ public function runTestJob(string $job, Test $test, string $processResultFile):
     {
         $_result = $this->runJob($job);
 
-        $processResult = @file_get_contents($processResultFile);
-
-        if ($processResult !== false) {
+        $processResult = '';
 
+        if (file_exists($processResultFile)) {
+            $processResult = file_get_contents($processResultFile);
             @unlink($processResultFile);
-        } else {
-            $processResult = '';
         }
 
         $this->processChildResult(