Add tests for default slots

Author: kylekatarnls

src/Phug/Component/ComponentExtension.php

@@ -55,14 +55,31 @@ public static function disable(): void
     public static function slot(string $name, array $definedVariables)
     {
         $children = $definedVariables['__pug_children'] ?? null;
+        $callbackName = static::PUG_SLOT_NAME_VARIABLE.'_'.$name;
 
         if (is_object($children) && $children instanceof Closure) {
-            $children(array_merge([static::PUG_SLOT_NAME_VARIABLE => $name ?: '__main__'], $definedVariables));
+            $called = false;
+            $children(array_merge([
+                static::PUG_SLOT_NAME_VARIABLE => $name ?: '__main__',
+                $callbackName => static function () use (&$called) {
+                    $called = true;
+                }
+            ], $definedVariables));
+
+            return !$called;
+        }
+
+        if (($definedVariables[static::PUG_SLOT_NAME_VARIABLE] ?? null) === $name) {
+            $callback = $definedVariables[$callbackName] ?? null;
+
+            if ($callback && $callback instanceof Closure) {
+                $callback();
+            }
 
-            return false;
+            return true;
         }
 
-        return ($definedVariables[static::PUG_SLOT_NAME_VARIABLE] ?? null) === $name;
+        return false;
     }
 
     public function getKeywords(): array

tests/Phug/Component/ComponentExtensionTest.php

@@ -176,8 +176,60 @@ public function testSlot()
         $this->assertTrue(ComponentExtension::slot('foo', ['pug_component_slot' => 'foo']));
         $this->assertTrue(ComponentExtension::slot('__main__', ['pug_component_slot' => '__main__']));
 
+        $called = false;
+        $callback = function () use (&$called) {
+            $called = true;
+        };
+
+        $this->assertTrue(ComponentExtension::slot('foo', ['pug_component_slot' => 'foo', 'pug_component_slot_foo' => $callback]));
+        $this->assertTrue($called);
+
+        $called = false;
+        $this->assertTrue(ComponentExtension::slot('__main__', ['pug_component_slot' => '__main__', 'pug_component_slot_foo' => $callback]));
+        $this->assertFalse($called);
+
+        $called = false;
+        $this->assertTrue(ComponentExtension::slot('foo', ['pug_component_slot' => 'foo', 'pug_component_slot___main__' => $callback]));
+        $this->assertFalse($called);
+
+        $called = false;
+        $this->assertTrue(ComponentExtension::slot('__main__', ['pug_component_slot' => '__main__', 'pug_component_slot___main__' => $callback]));
+        $this->assertTrue($called);
+
+        $arguments = [];
+        $children = static function (...$args) use (&$arguments) {
+            if (isset($args[0]['pug_component_slot_foo'])) {
+                unset($args[0]['pug_component_slot_foo']);
+            }
+
+            if (isset($args[0]['pug_component_slot___main__'])) {
+                unset($args[0]['pug_component_slot___main__']);
+            }
+
+            $arguments = $args;
+        };
+
+        $this->assertTrue(ComponentExtension::slot('foo', ['pug_component_slot' => 'foo', '__pug_children' => $children]));
+        $this->assertSame([['pug_component_slot' => 'foo', '__pug_children' => $children]], $arguments);
+        $this->assertTrue(ComponentExtension::slot('__main__', ['pug_component_slot' => '__main__', '__pug_children' => $children]));
+        $this->assertSame([['pug_component_slot' => '__main__', '__pug_children' => $children]], $arguments);
+        $this->assertTrue(ComponentExtension::slot('foo', ['__pug_children' => $children]));
+        $this->assertSame([['pug_component_slot' => 'foo', '__pug_children' => $children]], $arguments);
+        $this->assertTrue(ComponentExtension::slot('__main__', ['__pug_children' => $children]));
+        $this->assertSame([['pug_component_slot' => '__main__', '__pug_children' => $children]], $arguments);
+
         $arguments = [];
         $children = static function (...$args) use (&$arguments) {
+            if (isset($args[0]['pug_component_slot_foo'])) {
+                $args[0]['pug_component_slot_foo']();
+                unset($args[0]['pug_component_slot_foo']);
+            }
+
+            if (isset($args[0]['pug_component_slot___main__'])) {
+                $args[0]['pug_component_slot___main__']();
+                unset($args[0]['pug_component_slot___main__']);
+            }
+
             $arguments = $args;
         };