bug #21996 [Cache] Enhance error reporting for FilesystemAdapter (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 6315c1d5aaa7 · 2017-03-17T12:53:30.000+01:00
This PR was merged into the 3.2 branch. Discussion ---------- [Cache] Enhance error reporting for FilesystemAdapter | Q | A | ------------- | --- | Branch? | 3.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes/no | Fixed tickets | - | License | MIT | Doc PR | - So that we can provide feedback for cases like #21995 Commits ------- ebb316d [Cache] Enhance error reporting for FilesystemAdapter
diff --git a/src/Symfony/Component/Cache/Adapter/FilesystemAdapterTrait.php b/src/Symfony/Component/Cache/Adapter/FilesystemAdapterTrait.php
@@ -47,7 +47,6 @@ private function init($namespace, $directory)
         }
 
         $this->directory = $dir;
-        $this->tmp = $this->directory.uniqid('', true);
     }
 
     /**
@@ -81,19 +80,21 @@ protected function doDelete(array $ids)
 
     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 @@ private function getFile($id, $mkdir = false)
 
         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);
+        }
+    }
 }
