Merge pull request #36 from fvsch/bugfix-29-composer

Normalize path slashes for Windows (fixes #29)

Author: Florens Verschelde

CHANGELOG.md

@@ -1,8 +1,16 @@
 Kirby Twig Plugin: Change log
 =============================
 
-v3.0.0
-------
+## v3.0.2
+
+- #29 Fix loading some templates on Windows
+
+## v3.0.1
+
+- #25 Can't register namespaces, functions & filters in plugins
+- #26 Somehow allow adding safe functions
+
+## v3.0.0
 
 **Breaking changes:**
 
@@ -18,8 +26,7 @@ Deprecated (still working):
 - `twig.env.filters` in favor of `twig.filter.myFilter`;
 - `twig.env.namespace.xyz` in favor of `twig.namespace.xyz`.
 
-v2.x
-----
+## v2.x
 
 See on GitHub:
 
@@ -30,8 +37,7 @@ See on GitHub:
 - [v2.0.1](https://github.com/fvsch/kirby-twig/releases/tag/v2.0.1)
 - [v2.0.0](https://github.com/fvsch/kirby-twig/releases/tag/v2.0.0)
 
-v1.x
-----
+## v1.x
 
 - [v1.3.0](https://github.com/fvsch/kirby-twig/releases/tag/v1.3.0)
 - [v1.2.0](https://github.com/fvsch/kirby-twig/releases/tag/v1.2.0)

src/TwigEnv.php

@@ -116,7 +116,7 @@ public function __construct()
     {
         $kirby = Kirby::instance();
         $this->debug = $kirby->get('option', 'debug');
-        $this->templateDir = $kirby->roots()->templates();
+        $this->templateDir = $this->normalizePath($kirby->roots()->templates());
 
         // Get environment & user config
         $options = [
@@ -128,9 +128,9 @@ public function __construct()
             ],
             'namespace' => [
                 'templates' => $this->templateDir,
-                'snippets' => $kirby->roots->snippets(),
-                'plugins' => $kirby->roots->plugins(),
-                'assets' => $kirby->roots->assets()
+                'snippets' => $this->normalizePath($kirby->roots->snippets()),
+                'plugins' => $this->normalizePath($kirby->roots->plugins()),
+                'assets' => $this->normalizePath($kirby->roots->assets())
             ],
             'function' => $this->cleanNames(array_merge(
                 $this->defaultFunctions,
@@ -205,8 +205,11 @@ public function renderPath($filePath='', $tplData=[], $return=true, $isPage=fals
     {
         // Remove the start of the templates path, since Twig asks
         // for a path starting from one of the registered directories.
-        $path = ltrim(str_replace($this->templateDir, '',
-            preg_replace('#[\\\/]+#', '/', $filePath)), '/');
+        $path = $this->normalizePath($filePath);
+        $prefix = $this->templateDir . '/';
+        if (strpos($path, $prefix) === 0) {
+            $path = substr($path, strlen($prefix));
+        }
 
         try {
             $content = $this->twig->render($path, $tplData);
@@ -348,6 +351,15 @@ private function getSourceExcerpt($source='', $line=1, $plus=1, $format=false)
         return implode("\n", $excerpt);
     }
 
+    /**
+     * Normalize file paths, especially for Windows slashes
+     */
+    private function normalizePath($path)
+    {
+        $clean = trim(preg_replace('#[\\\/]+#', '/', $path));
+        return rtrim($clean, '/');
+    }
+
     /**
      * Clean up function names for use in Twig templates
      * Returns ['twig name' => 'callable name']