code style / cleanup

lib/MathParser/Expression.php

@@ -42,9 +42,9 @@ public static function factory($value)
             return new Parenthesis($value);
         } elseif ($value == '^') {
             return new Power($value);
-        }elseif ($value == '%') {
+        } elseif ($value == '%') {
             return new Modulo($value);
-        }elseif (strlen($value) >= 2 && $value[0] == '$') {
+        } elseif (strlen($value) >= 2 && $value[0] == '$') {
             return new Variable(substr($value, 1));
         }
         throw new \RuntimeException('Undefined Value ' . $value);

lib/MathParser/Expressions/Addition.php

@@ -2,18 +2,16 @@
 
 namespace MathParser\Expressions;
 
-use MathParser\Stack;
-
 class Addition extends Operator
 {
     protected $precedence = 4;
-
+    
     public function operate(array &$stack)
     {
         $left = array_pop($stack)->operate($stack);
         $right = array_pop($stack)->operate($stack);
-
-        if($left === null || $right === null){
+        
+        if ($left === null || $right === null) {
             return null;
         }
 

lib/MathParser/Expressions/Division.php

@@ -2,22 +2,20 @@
 
 namespace MathParser\Expressions;
 
-use MathParser\Stack;
-
 class Division extends Operator
 {
     protected $precedence = 5;
-
+    
     public function operate(array &$stack)
     {
         $left = array_pop($stack)->operate($stack);
         $right = array_pop($stack)->operate($stack);
-
-        if($left === null || $right === null){
+        
+        if ($left === null || $right === null) {
             return null;
         }
 
-        if($left === 0){
+        if ($left === 0) {
             return null;
         }
 

lib/MathParser/Expressions/Modulo.php

@@ -2,24 +2,22 @@
 
 namespace MathParser\Expressions;
 
-use MathParser\Stack;
-
 class Modulo extends Operator
 {
     protected $precedence = 5;
-
+    
     public function operate(array &$stack)
     {
         $left = array_pop($stack)->operate($stack);
         $right = array_pop($stack)->operate($stack);
-
-        if($left === null || $right === null){
+        
+        if ($left === null || $right === null) {
             return null;
         }
 
-        if($left===0){
+        if ($left === 0) {
             return null;
-        }else{
+        } else {
             return $right % $left;
         }
     }

lib/MathParser/Expressions/Multiplication.php

@@ -2,8 +2,6 @@
 
 namespace MathParser\Expressions;
 
-use MathParser\Stack;
-
 class Multiplication extends Operator
 {
     protected $precedence = 5;
@@ -12,7 +10,7 @@ public function operate(array &$stack)
     {
         $left = array_pop($stack)->operate($stack);
         $right = array_pop($stack)->operate($stack);
-        if($left === null || $right === null){
+        if ($left === null || $right === null) {
             return null;
         }
         return $left * $right;

lib/MathParser/Expressions/Number.php

@@ -2,7 +2,6 @@
 
 namespace MathParser\Expressions;
 
-use MathParser\Stack;
 use MathParser\Expression;
 
 class Number extends Expression

lib/MathParser/Expressions/Parenthesis.php

@@ -2,7 +2,6 @@
 
 namespace MathParser\Expressions;
 
-use MathParser\Stack;
 use MathParser\Expression;
 
 class Parenthesis extends Expression

lib/MathParser/Expressions/Power.php

@@ -2,18 +2,16 @@
 
 namespace MathParser\Expressions;
 
-use MathParser\Stack;
-
 class Power extends Operator
 {
     protected $precedence = 6;
-
+    
     public function operate(array &$stack)
     {
         $right = array_pop($stack)->operate($stack);
         $left = array_pop($stack)->operate($stack);
 
-        if($left === null || $right === null){
+        if ($left === null || $right === null) {
             return null;
         }
         return pow($left, $right);

lib/MathParser/Expressions/Subtraction.php

@@ -2,8 +2,6 @@
 
 namespace MathParser\Expressions;
 
-use MathParser\Stack;
-
 class Subtraction extends Operator
 {
     protected $precedence = 4;
@@ -13,7 +11,7 @@ public function operate(array &$stack)
         $left = array_pop($stack)->operate($stack);
         $right = array_pop($stack)->operate($stack);
 
-        if($left === null || $right === null){
+        if ($left === null || $right === null) {
             return null;
         }
 

lib/MathParser/Expressions/Unary.php

@@ -2,26 +2,24 @@
 
 namespace MathParser\Expressions;
 
-use MathParser\Stack;
-
 class Unary extends Operator
 {
     protected $precedence = 7;
-
+    
     public function isUnary()
     {
         return true;
     }
-
+    
     public function operate(array &$stack)
     {
         //the operate here should always be returning a value alone
         $next = array_pop($stack)->operate($stack);
 
-        if($next === null){
+        if ($next === null) {
             return null;
         }
-
+        
         return -$next;
     }
 }

lib/MathParser/Math.php

@@ -14,7 +14,7 @@ class Math
      */
     public function evaluate($string)
     {
-        if(!is_string($string)){
+        if (!is_string($string)) {
             throw new \RuntimeException('not a string provided as formula');
         }
         $stack = $this->parse($string);
@@ -107,7 +107,6 @@ private function render(array &$stack)
             return $output;
         }
         return null;
-
     }
 
     private function parseParenthesis(Expression $expression, array &$output, array &$operators)

test/MathParserTest.php

@@ -24,7 +24,6 @@ public static function provideValidData()
             ['1-1/6', 5 / 6],
             ['(1-7)/6', -1],
             ['-0 + 0', 0],
-            // should fail..? https://floating-point-gui.de/
             ['8 - 6.4', 1.6],
             ['1 / 2', 0.5],
             ['10 * 10', 100],