Merge pull request #4 from phug-php/feature/issue-3-namespace-statement

Handle usage in namespaced templates

Author: kylekatarnls

composer.json

@@ -22,7 +22,7 @@
     "prefer-stable": true,
     "require": {
         "php": ">=7.2",
-        "phug/phug": "^1.6"
+        "phug/phug": "^1.7.2"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.5",

src/Phug/Component/ComponentExtension.php

@@ -76,7 +76,7 @@ public function getKeywords(): array
         return [
             'slot' => static function (string $name): array {
                 return [
-                    'begin' => '<?php if ('.static::class.'::slot('.var_export($name, true).', get_defined_vars())) { ?>',
+                    'begin' => '<?php if (\\'.static::class.'::slot('.var_export($name, true).', get_defined_vars())) { ?>',
                     'end' => '<?php } ?>',
                 ];
             },
@@ -120,7 +120,17 @@ public function handleNodeEvent(NodeEvent $event): void
 
     public function handleOutputEvent(OutputEvent $event): void
     {
-        $event->setOutput($this->parseOutput($event->getOutput()));
+        $event->prependCode(implode("\n", [
+            '$firstMixin = function (string ...$names) use (&$__pug_mixins) {',
+            '  foreach ($names as $name) {',
+            '    if (isset($__pug_mixins[$name])) {',
+            '      return $name;',
+            '    }',
+            '  }',
+            '  throw new \\InvalidArgumentException("No defined mixin/component in [".implode(", ", $names)."]");',
+            '};',
+            '$firstComponent = $firstMixin;',
+        ]));
     }
 
     public function attachEvents(): void
@@ -136,27 +146,4 @@ public function detachEvents(): void
         $compiler->detach(CompilerEvent::NODE, [$this, 'handleNodeEvent']);
         $compiler->detach(CompilerEvent::OUTPUT, [$this, 'handleOutputEvent']);
     }
-
-    private function parseOutput(string $output): string
-    {
-        $mixinFunctionsCode = implode("\n", [
-            '',
-            '$firstMixin = function (string ...$names) use (&$__pug_mixins) {',
-            '  foreach ($names as $name) {',
-            '    if (isset($__pug_mixins[$name])) {',
-            '      return $name;',
-            '    }',
-            '  }',
-            '  throw new \\InvalidArgumentException("No defined mixin/component in [".implode(", ", $names)."]");',
-            '};',
-            '$firstComponent = $firstMixin;',
-            '',
-        ]);
-
-        if (preg_match('/^(<\?(?:php)?\s+namespace\s\S.*)((\n[\s\S]*)?)$/U', $output, $matches)) {
-            return $matches[1].$mixinFunctionsCode.$matches[2];
-        }
-
-        return "<?php$mixinFunctionsCode?>$output";
-    }
 }

tests/Phug/Component/ComponentExtensionTest.php

@@ -5,6 +5,7 @@
 use Exception;
 use PHPUnit\Framework\TestCase;
 use Phug\Compiler\Event\NodeEvent;
+use Phug\Compiler\Event\OutputEvent;
 use Phug\CompilerEvent;
 use Phug\Component\ComponentExtension;
 use Phug\Formatter\Element\KeywordElement;
@@ -261,7 +262,7 @@ public function testSlotKeyword()
         $keyword = new KeywordElement('slot', '', null, null, [(new TextElement)->setValue('Hello')]);
 
         $this->assertSame([
-            'begin' => '<?php if (Phug\Component\ComponentExtension::slot(\'foobar\', get_defined_vars())) { ?>',
+            'begin' => '<?php if (\Phug\Component\ComponentExtension::slot(\'foobar\', get_defined_vars())) { ?>',
             'end' => '<?php } ?>',
         ], $slot('foobar', $keyword));
     }
@@ -370,6 +371,35 @@ public function testWithPug()
         ]))));
     }
 
+    /**
+     * @throws PhugException
+     */
+    public function testNamespace()
+    {
+        $pug = new Pug([
+            'on_output' => function (OutputEvent $event) {
+                $event->prependCode('namespace pug;');
+            },
+        ]);
+        ComponentExtension::enable($pug);
+
+        $this->assertSame(implode("\n", [
+            'Title',
+            '<article data-attr="5">',
+            '  Content',
+            '</article>',
+        ]), $this->format($pug->render(implode("\n", [
+            'mixin foobar(obj)',
+            '  slot title',
+            '  article(data-attr=obj.a): slot',
+            '+foobar({a: 5})',
+            '  slot title',
+            '    | Title',
+            '  slot __main__',
+            '    | Content',
+        ]))));
+    }
+
     public function getPugPhpTestsTemplates(): array
     {
         return array_map(function ($file) {