fixed --force which should also remove Twig template cache dir

kpocha · Sep 15, 2015 · 99062cf · 99062cf
1 parent 006223c
commit 99062cf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Sami/Project.php b/Sami/Project.php
@@ -490,7 +490,7 @@ protected function renderVersion(Version $version, $previous, $callback = null,
             $this->seedCache($previous, $this->getBuildDir());
         }
 
-        $diff = $this->renderer->render($this, $callback);
+        $diff = $this->renderer->render($this, $callback, $force);
 
         if (null !== $callback) {
             call_user_func($callback, Message::RENDER_VERSION_FINISHED, $diff);

diff --git a/Sami/Renderer/Renderer.php b/Sami/Renderer/Renderer.php
@@ -45,9 +45,13 @@ public function isRendered(Project $project)
         return $this->getDiff($project)->isAlreadyRendered();
     }
 
-    public function render(Project $project, $callback = null)
+    public function render(Project $project, $callback = null, $force = false)
     {
-        $this->twig->setCache($project->getCacheDir().'/twig');
+        $this->twig->setCache($cacheDir = $project->getCacheDir().'/twig');
+
+        if ($force) {
+            $project->flushDir($cacheDir);
+        }
 
         $diff = $this->getDiff($project);