Refactoring the Calculatable Trait

ARCANEDEV · Aug 22, 2016 · 053f5fe · 053f5fe
1 parent b8d6694
commit 053f5fe
Showing 1 changed file with 11 additions and 18 deletions.
diff --git a/src/Traits/Calculatable.php b/src/Traits/Calculatable.php
@@ -19,24 +19,17 @@ trait Calculatable
      */
     protected static function calculate($a, $operator, $b)
     {
-        switch ($operator) {
-            case '+':
-                return $a + $b;
+        $operations = $operations = [
+            '+' => function ($a, $b) { return $a + $b; },
+            '-' => function ($a, $b) { return $a - $b; },
+            'x' => function ($a, $b) { return $a * $b; },
+            '*' => function ($a, $b) { return $a * $b; },
+            '/' => function ($a, $b) { return $a / $b; },
+            '^' => function ($a, $b) { return pow($a, $b); },
+        ];
 
-            case '-':
-                return $a - $b;
-
-            case 'x':
-            case '*':
-                return $a * $b;
-
-            case '/':
-                return $a / $b;
-
-            case '^':
-                return pow($a, $b);
-        }
-
-        return $a;
+        return array_key_exists($operator, $operations)
+            ? call_user_func_array($operations[$operator], [$a, $b])
+            : $a;
     }
 }