Allow standard mixins to works without slot

Author: kylekatarnls

src/Phug/Component/ComponentExtension.php

@@ -9,6 +9,7 @@
 use Phug\CompilerEvent;
 use Phug\Formatter\Element\KeywordElement;
 use Phug\Formatter\Element\MixinElement;
+use Phug\Parser\NodeInterface as ParserNodeInterface;
 use Phug\Parser\Node\CodeNode;
 use Phug\Parser\Node\KeywordNode;
 use Phug\Parser\Node\MixinCallNode;
@@ -84,20 +85,32 @@ public function getKeywords(): array
         ];
     }
 
+    protected function getCodeNode(NodeInterface $linkedNode, ParserNodeInterface $parentNode = null, $value = null, array $children = null)
+    {
+        $code = new CodeNode($linkedNode->getToken(), null, $linkedNode->getLevel(), $parentNode, $children);
+
+        if ($value !== null) {
+            $code->setValue($value);
+        }
+
+        return $code;
+    }
+
     public function handleNodeEvent(NodeEvent $event): void
     {
         $call = $event->getNode();
 
         if ($call instanceof MixinCallNode) {
             $call->setChildren(array_merge(
-                [(new CodeNode($call->getToken(), null, $call->getLevel(), $call))->setValue('$'.static::PUG_SLOT_NAME_VARIABLE.' = null')],
-                array_map(static function (NodeInterface $node) use ($call) {
+                [$this->getCodeNode($call, $call, '$'.static::PUG_SLOT_NAME_VARIABLE.' = null')],
+                array_map(function (NodeInterface $node) use ($call) {
                     if ($node instanceof KeywordNode && $node->getName() === 'slot') {
                         return $node;
                     }
 
-                    return new CodeNode($node->getToken(), null, $node->getLevel(), $call, [
-                        (new TextNode($node->getToken(), null, $node->getLevel()))->setValue('if ($'.static::PUG_SLOT_NAME_VARIABLE.' === "__main__")'),
+                    return $this->getCodeNode($node, $call, null, [
+                        (new TextNode($node->getToken(), null, $node->getLevel()))->setValue('if (!isset($'.static::PUG_SLOT_NAME_VARIABLE.') || $'.static::PUG_SLOT_NAME_VARIABLE.' === "__main__")'),
+                        $this->getCodeNode($node, null, '// main slot'),
                         $node,
                     ]);
                 }, $call->getChildren())

tests/Phug/Component/ComponentExtensionTest.php

@@ -233,6 +233,7 @@ protected function getValue($object)
 
     /**
      * @covers ::handleNodeEvent
+     * @covers ::getCodeNode
      */
     public function testHandleNodeEvent()
     {
@@ -252,10 +253,20 @@ public function testHandleNodeEvent()
 
         $this->assertCount(5, $call->getChildren());
         $this->assertSame('$pug_component_slot = null', $this->getValue($call->getChildAt(0)));
-        $this->assertSame('if ($pug_component_slot === "__main__")', $this->getValue($call->getChildAt(1)->getChildAt(0)));
-        $this->assertSame($children[0], $call->getChildAt(1)->getChildAt(1));
+        $this->assertSame('if (!isset($pug_component_slot) || $pug_component_slot === "__main__")', $this->getValue($call->getChildAt(1)->getChildAt(0)));
+        $this->assertSame($children[0], $call->getChildAt(1)->getChildAt(2));
         $this->assertSame($children[1], $call->getChildAt(2));
-        $this->assertSame('if ($pug_component_slot === "__main__")', $this->getValue($call->getChildAt(3)->getChildAt(0)));
-        $this->assertSame($children[2], $call->getChildAt(3)->getChildAt(1));
+        $this->assertSame('if (!isset($pug_component_slot) || $pug_component_slot === "__main__")', $this->getValue($call->getChildAt(3)->getChildAt(0)));
+        $this->assertSame($children[2], $call->getChildAt(3)->getChildAt(2));
+    }
+
+    public function testBasicMixinAreStillFine()
+    {
+        $this->assertSame('Hello', $this->renderAndFormat(implode("\n", [
+            'mixin foo',
+            '  block',
+            '+foo',
+            '  | Hello',
+        ])));
     }
 }