diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Cache] Enhance error reporting for FilesystemAdapter

Browse Source
This commit is contained in:
Nicolas Grekas 2017-03-14 13:26:05 +01:00
parent efa74c5eab
commit ebb316d616
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/Symfony/Component/Cache/Adapter/FilesystemAdapterTrait.php
View File

@ -47,7 +47,6 @@ trait FilesystemAdapterTrait
}
$this->directory = $dir;
$this->tmp = $this->directory.uniqid('', true);
}
/**
@ -81,19 +80,21 @@ trait FilesystemAdapterTrait
private function write($file, $data, $expiresAt = null)
{
if (false === @file_put_contents($this->tmp, $data)) {
return false;
}
if (null !== $expiresAt) {
@touch($this->tmp, $expiresAt);
}
set_error_handler(__CLASS__.'::throwError');
try {
if (null === $this->tmp) {
$this->tmp = $this->directory.uniqid('', true);
}
file_put_contents($this->tmp, $data);
if (@rename($this->tmp, $file)) {
return true;
}
@unlink($this->tmp);
if (null !== $expiresAt) {
touch($this->tmp, $expiresAt);
}
return false;
return rename($this->tmp, $file);
} finally {
restore_error_handler();
}
}
private function getFile($id, $mkdir = false)
@ -107,4 +108,20 @@ trait FilesystemAdapterTrait
return $dir.substr($hash, 2, 20);
}
/**
* @internal
*/
public static function throwError($type, $message, $file, $line)
{
throw new \ErrorException($message, 0, $type, $file, $line);
}
public function __destruct()
{
parent::__destruct();
if (null !== $this->tmp && file_exists($this->tmp)) {
unlink($this->tmp);
}
}
}