Merge pull request #22 from pug-php/refactor

Refactor

Author: kylekatarnls

.codeclimate.yml

@@ -12,6 +12,8 @@ engines:
   phpmd:
     enabled: true
     checks:
+      Naming/ShortMethodName:
+        enabled: false
       Design/CouplingBetweenObjects:
         enabled: false
       Design/EvalExpression:

src/JsPhpize/Compiler/Compiler.php

@@ -19,6 +19,15 @@
 
 class Compiler
 {
+    /**
+     * @const string
+     */
+    const STATIC_CALL_FUNCTIONS = 'array,echo,print,printf,exit,__halt_compiler,abstract,and,array,as,break,
+        callable,case,catch,class,clone,const,continue,declare,default,die,do,echo,else,elseif,empty,enddeclare,
+        endfor,endforeach,endif,endswitch,endwhile,eval,exit,extends,final,for,foreach,function,global,goto,if,
+        implements,include,include_once,instanceof,insteadof,interface,isset,list,namespace,new,or,print,private,
+        protected,public,require,require_once,return,static,switch,throw,trait,try,unset,use,var,while,xor';
+
     /**
      * @var JsPhpize
      */
@@ -236,87 +245,8 @@ protected function visitFunctionCall(FunctionCall $functionCall, $indent)
             $name = $function->name;
             $staticCall = $name . '(' . $arguments . ')';
 
-            if ($applicant === 'new') {
-                return $staticCall;
-            }
-
-            if (in_array($name, array(
-                'array',
-                'echo',
-                'print',
-                'printf',
-                'exit',
-            ))) {
-                return $staticCall;
-            }
-
-            if (in_array($name, array(
-                '__halt_compiler',
-                'abstract',
-                'and',
-                'array',
-                'as',
-                'break',
-                'callable',
-                'case',
-                'catch',
-                'class',
-                'clone',
-                'const',
-                'continue',
-                'declare',
-                'default',
-                'die',
-                'do',
-                'echo',
-                'else',
-                'elseif',
-                'empty',
-                'enddeclare',
-                'endfor',
-                'endforeach',
-                'endif',
-                'endswitch',
-                'endwhile',
-                'eval',
-                'exit',
-                'extends',
-                'final',
-                'for',
-                'foreach',
-                'function',
-                'global',
-                'goto',
-                'if',
-                'implements',
-                'include',
-                'include_once',
-                'instanceof',
-                'insteadof',
-                'interface',
-                'isset',
-                'list',
-                'namespace',
-                'new',
-                'or',
-                'print',
-                'private',
-                'protected',
-                'public',
-                'require',
-                'require_once',
-                'return',
-                'static',
-                'switch',
-                'throw',
-                'trait',
-                'try',
-                'unset',
-                'use',
-                'var',
-                'while',
-                'xor',
-            ))) {
+            $functions = str_replace(array("\n", "\t", "\r", ' '), '', static::STATIC_CALL_FUNCTIONS);
+            if ($applicant === 'new' || in_array($name, explode(',', $functions))) {
                 return $staticCall;
             }
 

src/JsPhpize/JsPhpizeOptions.php

@@ -150,7 +150,7 @@ public function hasFlag($flag)
      * @param int  $flag    flag to set
      * @param bool $enabled flag state
      */
-    public function setFlag($flag, $enabled = true)
+    public function setFlag($flag, $enabled)
     {
         if ($enabled) {
             $this->flags |= $flag;

src/JsPhpize/Parser/Parser.php

@@ -102,7 +102,7 @@ protected function parseParentheses()
         }
 
         if ($this->engine->getOption('allowTruncatedParentheses')) {
-            $this->engine->setFlag(JsPhpize::FLAG_TRUNCATED_PARENTHESES);
+            $this->engine->setFlag(JsPhpize::FLAG_TRUNCATED_PARENTHESES, true);
 
             return $parentheses;
         }
@@ -357,44 +357,53 @@ protected function parseLet()
         return $letVariable->value;
     }
 
-    protected function parseInstructions($block)
+    protected function parseInstruction($block, $token, &$initNext)
     {
-        $initNext = false;
+        if ($token->type === 'keyword') {
+            if ($token->isIn('var', 'const')) {
+                $initNext = true;
 
-        while ($token = $this->next()) {
-            if ($token->is($block->multipleInstructions ? '}' : ';')) {
-                break;
+                return true;
             }
 
-            if ($token->type === 'keyword') {
-                if ($token->isIn('var', 'const')) {
-                    $initNext = true;
-
-                    continue;
-                }
+            if ($token->value === 'let') {
+                $initNext = true;
+                $block->let($this->parseLet($token));
 
-                if ($token->value === 'let') {
-                    $initNext = true;
-                    $block->let($this->parseLet($token));
+                return true;
+            }
+        }
 
-                    continue;
-                }
+        if ($instruction = $this->getInstructionFromToken($token)) {
+            if ($initNext && $instruction instanceof Variable) {
+                $instruction = new Assignation('=', $instruction, new Constant('constant', 'null'));
             }
+            $initNext = false;
+            $block->addInstruction($instruction);
 
-            if ($instruction = $this->getInstructionFromToken($token)) {
-                if ($initNext && $instruction instanceof Variable) {
-                    $instruction = new Assignation('=', $instruction, new Constant('constant', 'null'));
-                }
-                $initNext = false;
-                $block->addInstruction($instruction);
+            return true;
+        }
 
-                continue;
-            }
+        if ($token->is(';') || !$this->engine->getOption('strict')) {
+            $initNext = false;
+            $block->endInstruction();
+
+            return true;
+        }
+
+        return false;
+    }
+
+    protected function parseInstructions($block)
+    {
+        $initNext = false;
 
-            if ($token->is(';') || !$this->engine->getOption('strict')) {
-                $initNext = false;
-                $block->endInstruction();
+        while ($token = $this->next()) {
+            if ($token->is($block->multipleInstructions ? '}' : ';')) {
+                break;
+            }
 
+            if ($this->parseInstruction($block, $token, $initNext)) {
                 continue;
             }