[Refactoring] Split BinaryOp\BooleanOr

src/Visitor/Expression.php

@@ -64,6 +64,8 @@ protected function factory($expr)
                 return new Expression\BinaryOp\Mul();
             case 'PhpParser\Node\Expr\BinaryOp\BitwiseXor':
                 return new Expression\BinaryOp\BitwiseXor();
+            case 'PhpParser\Node\Expr\BinaryOp\BooleanOr':
+                return new Expression\BinaryOp\BooleanOr();
         }
 
         return false;
@@ -85,11 +87,6 @@ public function compile($expr)
                 return $this->passSymbol($expr);
             case 'PhpParser\Node\Expr\Variable':
                 return $this->passExprVariable($expr);
-            /**
-             * Operators
-             */
-            case 'PhpParser\Node\Expr\BinaryOp\BooleanOr':
-                return $this->passBinaryOpBooleanOr($expr);
             /**
              * Another
              */
@@ -430,40 +427,6 @@ protected function passUnaryMinus(Node\Expr\UnaryMinus $expr)
         return new CompiledExpression();
     }
 
-    /**
-     * {expr} || {expr}
-     *
-     * @param Node\Expr\BinaryOp\BooleanOr $expr
-     * @return CompiledExpression
-     */
-    protected function passBinaryOpBooleanOr(Node\Expr\BinaryOp\BooleanOr $expr)
-    {
-        $expression = new Expression($this->context);
-        $left = $expression->compile($expr->left);
-
-        $expression = new Expression($this->context);
-        $right = $expression->compile($expr->right);
-
-        switch ($left->getType()) {
-            case CompiledExpression::LNUMBER:
-            case CompiledExpression::DNUMBER:
-            case CompiledExpression::STRING:
-            case CompiledExpression::BOOLEAN:
-            case CompiledExpression::NULL:
-                switch ($right->getType()) {
-                    case CompiledExpression::LNUMBER:
-                    case CompiledExpression::DNUMBER:
-                    case CompiledExpression::STRING:
-                    case CompiledExpression::BOOLEAN:
-                    case CompiledExpression::NULL:
-                        return CompiledExpression::fromZvalValue($left->getValue() || $right->getValue());
-                }
-                break;
-        }
-
-        return new CompiledExpression(CompiledExpression::UNKNOWN);
-    }
-
     /**
      * Convert lnumber scalar expr to CompiledExpression
      *

src/Visitor/Expression/BinaryOp/BooleanOr.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace PHPSA\Visitor\Expression\BinaryOp;
+
+use PHPSA\CompiledExpression;
+use PHPSA\Context;
+use PHPSA\Visitor\Expression;
+use PHPSA\Visitor\Expression\AbstractExpressionCompiler;
+
+class BooleanOr extends AbstractExpressionCompiler
+{
+    protected $name = '\PhpParser\Node\Expr\BinaryOp\BooleanOr';
+
+    /**
+     * {expr} || {expr}
+     *
+     * @param \PhpParser\Node\Expr\BinaryOp\BooleanOr $expr
+     * @param Context $context
+     * @return CompiledExpression
+     */
+    public function compile($expr, Context $context)
+    {
+        $expression = new Expression($context);
+        $left = $expression->compile($expr->left);
+
+        $expression = new Expression($context);
+        $right = $expression->compile($expr->right);
+
+        switch ($left->getType()) {
+            case CompiledExpression::LNUMBER:
+            case CompiledExpression::DNUMBER:
+            case CompiledExpression::STRING:
+            case CompiledExpression::BOOLEAN:
+            case CompiledExpression::NULL:
+                switch ($right->getType()) {
+                    case CompiledExpression::LNUMBER:
+                    case CompiledExpression::DNUMBER:
+                    case CompiledExpression::STRING:
+                    case CompiledExpression::BOOLEAN:
+                    case CompiledExpression::NULL:
+                        return CompiledExpression::fromZvalValue($left->getValue() || $right->getValue());
+                }
+                break;
+        }
+
+        return new CompiledExpression(CompiledExpression::UNKNOWN);
+    }
+}