Keep namespace statements at file beginning

Author: kylekatarnls

composer.json

@@ -12,8 +12,8 @@
   "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"
+    "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,16 +84,6 @@ protected function parseOutput($compiler, $output)
             $output
         );
 
-        $dependencies = $jsPhpize->compileDependencies();
-        if ($dependencies !== '') {
-            $dependencies = $compiler->getFormatter()->handleCode($dependencies);
-            $output = preg_match('/^(<\?(?:php)?\s+namespace\s\S.*)(((?:;|\n|\?>)[\s\S]*)?)$/U', $output, $matches)
-                ? $matches[1] . $dependencies . $matches[2]
-                : $dependencies . $output;
-        }
-
-        $jsPhpize->flushDependencies();
-
         return $output;
     }
 
@@ -104,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');
     }