Merge pull request #2 from o-p/op/arithmetic

Add math operators, rename existing comparison operators.

Author: o-p

src/OperatorManager.php

@@ -37,10 +37,10 @@ protected function buildins(): array
             'missing_some' => null,
             // Logic and Boolean Operations
             'if' => null,
-            '==' => Operators\Equals::class,
-            '===' => Operators\Same::class,
-            '!=' => Operators\NotEquals::class,
-            '!==' => Operators\NotSame::class,
+            '==' => Operators\Equal::class,
+            '===' => Operators\Identical::class,
+            '!=' => Operators\NotEqual::class,
+            '!==' => Operators\NotIdentical::class,
             '!' => Operators\Not::class,
             '!!' => Operators\Booleanify::class,
             'or' => Operators\OrOperator::class,
@@ -52,11 +52,11 @@ protected function buildins(): array
             '<=' => Operators\LessThanOrEqual::class,
             'max' => null,
             'min' => null,
-            '+' => null,
-            '-' => null,
-            '*' => null,
-            '/' => null,
-            '%' => null,
+            '+' => Operators\Plus::class,
+            '-' => Operators\Minus::class,
+            '*' => Operators\Multiply::class,
+            '/' => Operators\Divide::class,
+            '%' => Operators\Modulo::class,
             // Array Operations
             'map' => null,
             'reduce' => null,

src/Operators/Divide.php

@@ -0,0 +1,25 @@
+<?php
+namespace JsonLogic\Operators;
+
+use Closure;
+use JsonLogic\Parameters;
+
+/**
+ * @operator /
+ */
+class Divide extends Operator
+{
+    protected $alias = '/';
+
+    public function params($param): Closure
+    {
+        $this->autoValidateParams($param);
+        $prepared = Parameters::from($param);
+
+        return function (&$data) use (&$prepared) {
+            return $prepared->reduce(function ($a, $b) {
+                return $a / $b;
+            }, $data);
+        };
+    }
+}

src/Operators/Equals.php renamed to src/Operators/Equal.php

@@ -7,7 +7,7 @@
 /**
  * @operator ==
  */
-class Equals extends Operator
+class Equal extends Operator
 {
     protected $alias = '==';
     protected $minParamCounts = 2;

src/Operators/Same.php renamed to src/Operators/Identical.php

@@ -7,7 +7,7 @@
 /**
  * @operator ===
  */
-class Same extends Operator
+class Identical extends Operator
 {
     protected $alias = '===';
     protected $minParamCounts = 2;

src/Operators/Minus.php

@@ -0,0 +1,25 @@
+<?php
+namespace JsonLogic\Operators;
+
+use Closure;
+use JsonLogic\Parameters;
+
+/**
+ * @operator -
+ */
+class Minus extends Operator
+{
+    protected $alias = '-';
+
+    public function params($param): Closure
+    {
+        $this->autoValidateParams($param);
+        $prepared = Parameters::from($param);
+
+        return function (&$data) use (&$prepared) {
+            return $prepared->reduce(function ($a, $b) {
+                return $a - $b;
+            }, $data);
+        };
+    }
+}

src/Operators/Modulo.php

@@ -0,0 +1,25 @@
+<?php
+namespace JsonLogic\Operators;
+
+use Closure;
+use JsonLogic\Parameters;
+
+/**
+ * @operator %
+ */
+class Modulo extends Operator
+{
+    protected $alias = '%';
+
+    public function params($param): Closure
+    {
+        $this->autoValidateParams($param);
+        $prepared = Parameters::from($param);
+
+        return function (&$data) use (&$prepared) {
+            return $prepared->reduce(function ($a, $b) {
+                return $a % $b;
+            }, $data);
+        };
+    }
+}

src/Operators/Multiply.php

@@ -0,0 +1,23 @@
+<?php
+namespace JsonLogic\Operators;
+
+use Closure;
+use JsonLogic\Parameters;
+
+/**
+ * @operator *
+ */
+class Multiply extends Operator
+{
+    protected $alias = '*';
+
+    public function params($param): Closure
+    {
+        $this->autoValidateParams($param);
+        $prepared = Parameters::from($param);
+
+        return function (&$data) use (&$prepared) {
+            return array_product($prepared->values($data));
+        };
+    }
+}

src/Operators/NotEquals.php renamed to src/Operators/NotEqual.php

@@ -7,7 +7,7 @@
 /**
  * @operator !=
  */
-class NotEquals extends Operator
+class NotEqual extends Operator
 {
     protected $alias = '!=';
     protected $minParamCounts = 2;

src/Operators/NotSame.php renamed to src/Operators/NotIdentical.php

@@ -7,7 +7,7 @@
 /**
  * @operator !==
  */
-class NotSame extends Operator
+class NotIdentical extends Operator
 {
     protected $alias = '!==';
     protected $minParamCounts = 2;

src/Operators/Plus.php

@@ -0,0 +1,23 @@
+<?php
+namespace JsonLogic\Operators;
+
+use Closure;
+use JsonLogic\Parameters;
+
+/**
+ * @operator +
+ */
+class Plus extends Operator
+{
+    protected $alias = '+';
+
+    public function params($param): Closure
+    {
+        $this->autoValidateParams($param);
+        $prepared = Parameters::from($param);
+
+        return function (&$data) use (&$prepared) {
+            return array_sum($prepared->values($data));
+        };
+    }
+}