Merge pull request #39 from s4msung/master

pass options to parser for include and extend
pug-php · Jul 25, 2016 · 5727d74 · 5727d74
2 parents 694d034 + 0e789c4
commit 5727d74
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 2 deletions.
diff --git a/src/Jade/Parser.php b/src/Jade/Parser.php
@@ -375,7 +375,7 @@ protected function parseExtends()
         $path = $this->getTemplatePath($this->expect('extends')->value);
 
         $string = $this->getTemplateContents($path);
-        $parser = new static($string, $path);
+        $parser = new static($string, $path, $this->options);
         // need to be a reference, or be seted after the parse loop
         $parser->blocks = &$this->blocks;
         $parser->contexts = $this->contexts;
@@ -437,7 +437,7 @@ protected function parseInclude()
 
         $string = $this->getTemplateContents($path);
 
-        $parser = new static($string, $path);
+        $parser = new static($string, $path, $this->options);
         $parser->blocks = $this->blocks;
         $parser->mixins = $this->mixins;
 

diff --git a/tests/features/settings.php b/tests/features/settings.php
@@ -541,6 +541,39 @@ public function testBaseDir()
             "<div class=\"alert alert-danger\">Page not found.</div>\n" .
             "<div class=\"alert alert-danger\">Page not found.</div>";
         $this->assertSame($expected, $actual);
+
+        $actual = $this->renderWithBaseDir(
+            __DIR__ . '/../templates/',
+            __DIR__ . '/../templates/auxiliary/include-basedir.jade'
+        );
+        $expected = "<p>World</p>\n" .
+            "<div class=\"alert alert-danger\">Page not found.</div>\n" .
+            "<p>World</p>\n" .
+            "<p>World</p>\n" .
+            "<div class=\"alert alert-danger\">Page not found.</div>\n" .
+            "<p>World</p>";
+        $this->assertSame($expected, $actual);
+
+        $actual = $this->renderWithBaseDir(
+            __DIR__ . '/../templates/',
+            __DIR__ . '/../templates/auxiliary/extends-basedir.jade'
+        );
+        $expected =
+            "<html>\n" .
+            "<head>\n" .
+            "<title>My Application</title>\n" .
+            "</head>\n" .
+            "<body>\n" .
+            "<h1>test</h1>\n" .
+            "<p>World</p>\n" .
+            "<div class=\"alert alert-danger\">Page not found.</div>\n" .
+            "<p>World</p>\n" .
+            "<p>World</p>\n" .
+            "<div class=\"alert alert-danger\">Page not found.</div>\n" .
+            "<p>World</p>\n" .
+            "</body>\n" .
+            "</html>";
+        $this->assertSame($expected, $actual);
     }
 
     public function testClassAttribute()

diff --git a/tests/templates/auxiliary/extends-basedir.jade b/tests/templates/auxiliary/extends-basedir.jade
@@ -0,0 +1,4 @@
+extends /auxiliary/extends-include-sibling
+
+block content
+  h1 test
diff --git a/tests/templates/auxiliary/extends-include-sibling.jade b/tests/templates/auxiliary/extends-include-sibling.jade
@@ -0,0 +1,6 @@
+html
+  head
+    title My Application
+  body
+    block content
+    include /auxiliary/include-sibling
diff --git a/tests/templates/auxiliary/include-basedir.jade b/tests/templates/auxiliary/include-basedir.jade
@@ -0,0 +1 @@
+include /auxiliary/include-sibling