[Cache] Fix success interpretation when pruning cache

staabm · staabm · commit 76a2e6254531 · 2023-04-21T14:30:32.000+02:00
diff --git a/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
@@ -82,7 +82,7 @@ public function prune()
                 }
 
                 if ($time >= $expiresAt) {
-                    $pruned = $this->doUnlink($file) && !file_exists($file) && $pruned;
+                    $pruned = ($this->doUnlink($file) || !file_exists($file)) && $pruned;
                 }
             }
         } finally {
diff --git a/src/Symfony/Component/Cache/Traits/FilesystemTrait.php b/src/Symfony/Component/Cache/Traits/FilesystemTrait.php
@@ -40,7 +40,7 @@ public function prune()
 
             if (($expiresAt = (int) fgets($h)) && $time >= $expiresAt) {
                 fclose($h);
-                $pruned = @unlink($file) && !file_exists($file) && $pruned;
+                $pruned = (@unlink($file) || !file_exists($file)) && $pruned;
             } else {
                 fclose($h);
             }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public function prune()`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`if ($time >= $expiresAt) {`
`85`		`- $pruned = $this->doUnlink($file) && !file_exists($file) && $pruned;`
	`85`	`+ $pruned = ($this->doUnlink($file) \|\| !file_exists($file)) && $pruned;`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`	`} finally {`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function prune()`
`40`	`40`
`41`	`41`	`if (($expiresAt = (int) fgets($h)) && $time >= $expiresAt) {`
`42`	`42`	`fclose($h);`
`43`		`- $pruned = @unlink($file) && !file_exists($file) && $pruned;`
	`43`	`+ $pruned = (@unlink($file) \|\| !file_exists($file)) && $pruned;`
`44`	`44`	`} else {`
`45`	`45`	`fclose($h);`
`46`	`46`	`}`