Fix mixin js-phpize unneeded call

pug-php · Feb 15, 2017 · feb835c · feb835c
1 parent ee240d4
commit feb835c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/Jade/Compiler/ExpressionCompiler.php b/src/Jade/Compiler/ExpressionCompiler.php
@@ -50,7 +50,11 @@ protected function getPhpCodeFromJs($arguments)
     {
         if (
             preg_match('/^\s*array\s*' . Scanner::PARENTHESES . '\s*$/i', $arguments[0]) ||
-            preg_match('/^\(*isset\(\$/i', $arguments[0])
+            preg_match('/^\(*isset\(\$/i', $arguments[0]) ||
+            (
+                preg_match('/^\s*array_merge\s*' . Scanner::PARENTHESES . '/i', $arguments[0]) &&
+                preg_match('/\s*array\s*' . Scanner::PARENTHESES . '\s*/i', $arguments[0])
+            )
         ) {
             return $arguments[0];
         }

diff --git a/tests/features/expressionLanguage.php b/tests/features/expressionLanguage.php
@@ -36,6 +36,9 @@ public function testJsExpression()
         $this->assertSame('array(1)', $actual);
         $actual = trim($compiler->callPhpizeExpression('addDollarIfNeeded', 'a'));
         $this->assertSame('$a', $actual);
+
+        $actual = trim($jade->render("mixin test\n  div&attributes(attributes)\nbody\n  +test()(class='test')"));
+        $this->assertSame('<body><div class="test "></div></body>', $actual);
     }
 
     public function testPhpExpression()