Merge pull request #9 from pug-php/namespace-statement

Keep namespace statements at file beginning

Author: kylekatarnls

composer.json

@@ -11,9 +11,9 @@
   ],
   "require": {
     "php": ">=7.0",
-    "js-phpize/js-phpize": "^2.0.0",
-    "phug/compiler": "^0.5.0 || ^1.0@dev",
-    "phug/formatter": "^0.5.43 || ^1.0@dev"
+    "js-phpize/js-phpize": "^2.8.3",
+    "phug/compiler": "^1.7.2",
+    "phug/formatter": "^1.7.2"
   },
   "require-dev": {
     "phpunit/phpunit": ">=4.8.35 <6.0",

src/JsPhpize/Traits/Compilation.php

@@ -65,14 +65,12 @@ public function compile(JsPhpize $jsPhpize, $code, $fileName)
     }
 
     /**
-     * @param CompilerInterface $compiler
-     * @param string            $output
+     * @param string $output
      *
      * @return string
      */
-    protected function parseOutput($compiler, $output)
+    protected function parseOutput($output)
     {
-        $jsPhpize = $this->getJsPhpizeEngine($compiler);
         $output = preg_replace(
             '/\{\s*\?><\?(?:php)?\s*\}/',
             '{}',
@@ -86,13 +84,6 @@ protected function parseOutput($compiler, $output)
             $output
         );
 
-        $dependencies = $jsPhpize->compileDependencies();
-        if ($dependencies !== '') {
-            $output = $compiler->getFormatter()->handleCode($dependencies) . $output;
-        }
-
-        $jsPhpize->flushDependencies();
-
         return $output;
     }
 
@@ -101,8 +92,17 @@ public function handleOutputEvent(Compiler\Event\OutputEvent $event)
         /** @var CompilerInterface $compiler */
         $compiler = $event->getTarget();
 
-        $event->setOutput($this->parseOutput($compiler, $event->getOutput()));
+        $event->setOutput($this->parseOutput($event->getOutput()));
 
+        $jsPhpize = $this->getJsPhpizeEngine($compiler);
+        $dependencies = $jsPhpize->compileDependencies();
+
+        if ($dependencies !== '') {
+            $dependencies = $compiler->getFormatter()->handleCode($dependencies);
+            $event->prependOutput($dependencies);
+        }
+
+        $jsPhpize->flushDependencies();
         $compiler->unsetOption('jsphpize_engine');
     }
 

tests/JsPhpize/Example/Example.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Tests\JsPhpize\Example;
+
+class Example
+{
+    public static function foo()
+    {
+        return 'bar';
+    }
+}

tests/JsPhpize/JsPhpizePhugTest.php

@@ -6,6 +6,7 @@
 use JsPhpize\JsPhpizePhug;
 use PHPUnit\Framework\TestCase;
 use Phug\Compiler;
+use Phug\CompilerEvent;
 use Phug\Renderer;
 use Tests\Thrower;
 
@@ -102,6 +103,33 @@ public function testPlug()
         );
     }
 
+    public function testNamespaceInsertion()
+    {
+        include_once __DIR__ . '/Example/Example.php';
+
+        $compiler = new Compiler([
+            'compiler_modules' => [JsPhpizePhug::class],
+        ]);
+        $compiler->attach(CompilerEvent::OUTPUT, function (Compiler\Event\OutputEvent $outputEvent) {
+            $outputEvent->prependCode('namespace Tests\JsPhpize\Example;');
+        });
+
+        $user = [
+            'name' => 'Bob',
+        ];
+
+        ob_start();
+        $php = $compiler->compile('a(title=user.name foo=Example::foo())');
+        eval('?>' . $php);
+        $html = ob_get_contents();
+        ob_end_clean();
+
+        self::assertSame(
+            '<a title="Bob" foo="bar"></a>',
+            $html
+        );
+    }
+
     public function testTruncatedCode()
     {
         $compiler = new Compiler([
@@ -123,6 +151,7 @@ public function testTruncatedCode()
         $php5Syntax = 'call_user_func(call_user_func($GLOBALS[\'__jpv_dotWithArrayPrototype\'], $items, ' .
             '\'forEach\'), function ($item) {';
         $actual = $jsPhpize('items.forEach(function (item) {');
+
         self::assertContains(
             $jsPhpize('items.forEach(function (item) {'),
             [$php5Syntax, $php7Syntax],