Merge pull request #84 from mendelk/master

arnaud-lb · arnaud-lb · commit 7f81cacc672f · 2015-07-28T08:57:45.000+02:00
Touch new cacheFile with original file's timestamp. Fixes #83.
diff --git a/lib/MtHaml/Support/Php/Executor.php b/lib/MtHaml/Support/Php/Executor.php
@@ -79,7 +79,9 @@ private function compileFile($file)
             . '/' . substr($hash, 0, 2) . '/' . substr($hash, 2, 2) . '/'
             . substr($hash, 4) . '_' . basename($file) . '.php';
 
-        if ($this->options['debug'] || !file_exists($cacheFile) || filemtime($cacheFile) !== filemtime($file)) {
+        $fileMtime = filemtime($file);
+
+        if ($this->options['debug'] || !file_exists($cacheFile) || filemtime($cacheFile) !== $fileMtime) {
 
             $hamlCode = file_get_contents($file);
 
@@ -93,7 +95,7 @@ private function compileFile($file)
             $compiledCode = $this->environment->compileString($hamlCode, $file);
             $compiledCode = $this->wrapCompiledCode($compiledCode, $funName);
 
-            $this->writeCacheFile($cacheFile, $compiledCode);
+            $this->writeCacheFile($cacheFile, $compiledCode, $fileMtime);
         }
 
         require_once $cacheFile;
@@ -117,8 +119,9 @@ function $funName(\$__variables)
 PHP;
     }
 
-    private function writeCacheFile($cacheFile, $contents)
+    private function writeCacheFile($cacheFile, $contents, $timestamp)
     {
+
         $dir = dirname($cacheFile);
 
         if (!is_dir($dir)) {
@@ -153,5 +156,13 @@ private function writeCacheFile($cacheFile, $contents)
                 , $cacheFile
             ));
         }
+
+        if (!touch($cacheFile, $timestamp)) {
+            throw new Exception(sprintf(
+                "Failed writing cache file: `%s`"
+                , $cacheFile
+            ));
+        }
+
     }
 }
