FileCacheStorage - ignore concurrent save issues on Windows

ondrejmirtes · ondrejmirtes · commit 769669d4ec2a · 2020-02-12T22:18:42.000+01:00
diff --git a/src/Cache/FileCacheStorage.php b/src/Cache/FileCacheStorage.php
@@ -82,8 +82,12 @@ public function save(string $key, string $variableKey, $data): void
 		}
 
 		$renameSuccess = @rename($tmpPath, $path);
-		if ($renameSuccess === false) {
-			@unlink($tmpPath);
+		if ($renameSuccess) {
+			return;
+		}
+
+		@unlink($tmpPath);
+		if (DIRECTORY_SEPARATOR === '/' || !file_exists($path)) {
 			throw new \InvalidArgumentException(sprintf('Could not write data to cache file %s.', $path));
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,12 @@ public function save(string $key, string $variableKey, $data): void`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`$renameSuccess = @rename($tmpPath, $path);`
`85`		`- if ($renameSuccess === false) {`
`86`		`- @unlink($tmpPath);`
	`85`	`+ if ($renameSuccess) {`
	`86`	`+ return;`
	`87`	`+ }`
	`88`	`+`
	`89`	`+ @unlink($tmpPath);`
	`90`	`+ if (DIRECTORY_SEPARATOR === '/' \|\| !file_exists($path)) {`
`87`	`91`	`throw new \InvalidArgumentException(sprintf('Could not write data to cache file %s.', $path));`
`88`	`92`	`}`
`89`	`93`	`}`