Fixed PHP namespaces usage

src/HamlViewRenderer.php

@@ -20,7 +20,7 @@ public function init()
 	{
 		parent::init();
 		$haml = new MtHaml\Environment('php', $this->options, $this->getFilters());
-		$this->parser = new MtHaml\Support\Php\Executor($haml, [
+		$this->parser = new \mervick\mthaml\override\Executor($haml, [
 			'cache' => Yii::getAlias($this->cachePath),
 			'debug' => $this->debug
 		]);

src/override/Executor.php

@@ -0,0 +1,169 @@
+<?php
+
+namespace mervick\mthaml\override;
+
+use MtHaml\Environment;
+use MtHaml\Exception;
+
+/**
+ * Executor is a simple helper that can compile haml files, cache them, and execute them
+ */
+class Executor
+{
+    private $environment;
+
+    private $options = array(
+        // Cache directory to store compiled templates
+        'cache' => null,
+        // Whether to by-pass cache, useful when debugging
+        'debug' => false,
+    );
+
+    public function __construct(Environment $environment, array $options)
+    {
+        $this->environment = $environment;
+        $this->options = $options + $this->options;
+
+        if (!$this->options['cache']) {
+            throw new Exception("A 'cache' option must be defined");
+        }
+    }
+
+    /**
+     * Executes and displays the template $file, with variables $variables
+     */
+    public function display($file, array $variables)
+    {
+        $fun = $this->compileFile($file);
+        $fun($variables);
+    }
+
+    /**
+     * Executes the template $file with variables $variables, and returns its output
+     */
+    public function render($file, array $variables)
+    {
+        $level = ob_get_level();
+        ob_start();
+
+        try {
+            $this->display($file, $variables);
+        } catch (\Exception $e) {
+            while (ob_get_level() > $level) {
+                ob_end_clean();
+            }
+
+            throw $e;
+        }
+
+        return ob_get_clean();
+    }
+
+    private function compileFile($file)
+    {
+        if (!file_exists($file)) {
+            throw new Exception(sprintf(
+                "File does not exist: `%s`"
+                , $file
+            ));
+        }
+
+        $hash = hash('sha256', $file);
+        $funName = '__MtHamlTemplate_' . $hash;
+
+        if (function_exists($funName)) {
+            return $funName;
+        }
+
+        $cacheFile = $this->options['cache']
+            . '/' . 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)) {
+
+            $hamlCode = file_get_contents($file);
+
+            if (false === $hamlCode) {
+                throw new Exception(sprintf(
+                    "Failed reading file: `%s`"
+                    , $file
+                ));
+            }
+
+            $compiledCode = $this->environment->compileString($hamlCode, $file);
+            $compiledCode = $this->wrapCompiledCode($compiledCode, $funName);
+
+            $this->writeCacheFile($cacheFile, $compiledCode);
+        }
+
+        require_once $cacheFile;
+
+        return $funName;
+    }
+
+    private function wrapCompiledCode($code, $funName)
+    {
+        // Parses all used namespaces and puts them into header of the file.
+        $namespaces = array();
+        if (preg_match_all('/<\?php\s+(use\s+[^;\?]+);?(?:\s+)?\?>\n?/S', $code, $matches, PREG_OFFSET_CAPTURE)) {
+            for ($i = count($matches[0])-1; $i >= 0; $i--) {
+                $code = substr($code, 0, $matches[0][$i][1]) .
+                    substr($code, $matches[0][$i][1] + strlen($matches[0][$i][0]));
+                array_unshift($namespaces, $matches[1][$i][0].';');
+            }
+        }
+        $namespaces = implode(PHP_EOL, $namespaces);
+
+        // The code is wrapped in a function so that it can be parsed
+        // once, and executed multiple times. This is faster than repeatedly
+        // including the same PHP file.
+        return <<<PHP
+<?php
+$namespaces
+function $funName(\$__variables)
+{
+    extract(\$__variables);
+?>$code<?php
+}
+PHP;
+    }
+
+    private function writeCacheFile($cacheFile, $contents)
+    {
+        $dir = dirname($cacheFile);
+
+        if (!is_dir($dir)) {
+            if (!mkdir($dir, 0777, true)) {
+                throw new Exception(sprintf(
+                    "Failed creating cache directory: `%s`"
+                    , $dir
+                ));
+            }
+        }
+
+        if (!is_writeable($dir)) {
+            throw new Exception(sprintf(
+                "Cache directory is not writeable: `%s`"
+                , $dir
+            ));
+        }
+
+        $tmpFile = tempnam($dir, basename($cacheFile));
+
+        if (false === file_put_contents($tmpFile, $contents)) {
+            throw new Exception(sprintf(
+                "Failed writing cache file: `%s`"
+                , $tmpFile
+            ));
+        }
+
+        if (!rename($tmpFile, $cacheFile)) {
+            @unlink($tmpFile);
+            throw new Exception(sprintf(
+                "Failed writing cache file: `%s`"
+                , $cacheFile
+            ));
+        }
+    }
+
+}