Merge pull request #26 from phug-php/propagate-mixins

kylekatarnls · web-flow · commit 5339dad68041 · 2018-02-06T17:48:16.000+01:00
Propagate mixins to the layout
diff --git a/src/Phug/Compiler/NodeCompiler/ImportNodeCompiler.php b/src/Phug/Compiler/NodeCompiler/ImportNodeCompiler.php
@@ -8,6 +8,7 @@
 use Phug\Formatter\Element\CodeElement;
 use Phug\Formatter\Element\ExpressionElement;
 use Phug\Formatter\Element\MarkupElement;
+use Phug\Formatter\Element\MixinElement;
 use Phug\Formatter\Element\TextElement;
 use Phug\Formatter\ElementInterface;
 use Phug\Parser\Node\FilterNode;
@@ -125,6 +126,16 @@ public function compileNode(NodeInterface $node, ElementInterface $parent = null
         }
 
         if ($isIncludeImport) {
+            $parentLayout = $compiler->getLayout();
+            if ($parentLayout) {
+                $parentDocument = $parentLayout->getDocument();
+                foreach ($element->getChildren() as $child) {
+                    if ($child instanceof MixinElement) {
+                        $parentDocument->appendChild(clone $child);
+                    }
+                }
+            }
+
             return $element;
         }
 
diff --git a/tests/Phug/Compiler/NodeCompiler/ImportNodeCompilerTest.php b/tests/Phug/Compiler/NodeCompiler/ImportNodeCompilerTest.php
@@ -249,6 +249,17 @@ public function testIncludeRawText()
         );
     }
 
+    /**
+     * @covers ::<public>
+     */
+    public function testNestedIncludedMixins()
+    {
+        $this->assertRenderFile(
+            file_get_contents(__DIR__.'/../../../templates/issue26/error-test.html'),
+            __DIR__.'/../../../templates/issue26/error-test.pug'
+        );
+    }
+
     /**
      * @covers            \Phug\Compiler::compileIntoElement
      * @expectedException \Phug\CompilerException
diff --git a/tests/templates/issue26/error-test.html b/tests/templates/issue26/error-test.html
@@ -0,0 +1 @@
+<!DOCTYPE html><html><body><h1>i am mixin</h1></body></html>
diff --git a/tests/templates/issue26/error-test.pug b/tests/templates/issue26/error-test.pug
@@ -0,0 +1,5 @@
+extends ./layout.pug
+include ./test-mixin.pug
+
+block body
+    +test-mixin()
diff --git a/tests/templates/issue26/layout.pug b/tests/templates/issue26/layout.pug
@@ -0,0 +1,5 @@
+doctype html
+
+html
+    body
+        block body
diff --git a/tests/templates/issue26/test-mixin.pug b/tests/templates/issue26/test-mixin.pug
@@ -0,0 +1,2 @@
+mixin test-mixin()
+    h1 i am mixin

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+<!DOCTYPE html><html><body><h1>i am mixin</h1></body></html>`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +doctype html
++
 +html
 +    body
 +        block body
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+mixin test-mixin()`
	`2`	`+ h1 i am mixin`