remove line breaks from a formula

optimistex · Dec 8, 2017 · 9abeac7 · 9abeac7 · alekseysolo · Jan 18, 2018
1 parent f684fef
commit 9abeac7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "optimistex/math-expression",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "type": "library",
   "description": "Taken from http://www.phpclasses.org/browse/file/11680.html, cred to Miles Kaufmann",
   "keywords": [

diff --git a/expression.php b/expression.php
@@ -135,7 +135,7 @@ public function e($expr)
     public function evaluate($expr)
     {
         $this->last_error = null;
-        $expr = trim($expr);
+        $expr = preg_replace("/\r|\n/", '', trim($expr));
         if ($expr && $expr[strlen($expr) - 1] === ';') {
             $expr = substr($expr, 0, -1); // strip semicolons at the end
         }

diff --git a/tests/Expression.php b/tests/Expression.php
@@ -13,6 +13,7 @@ public function arrayTest(array $array)
             $this->assertEquals($result, eval('return ' . $iValue . ';'));
         }
     }
+
     /*
     public function testTest() {
         $expression = '2+2*2-2/2 >= 2*2+-2/2*2';
@@ -392,4 +393,17 @@ public function testFunctionOrderParameters()
             $this->assertEquals($e->evaluate($formula), $result);
         }
     }
+
+    public function testRowBreaking()
+    {
+        $expr = new Expression();
+        $this->assertEquals(6, $expr->evaluate('2 + 2 * 2'));
+        $this->assertEquals(6, $expr->evaluate(
+            '2 
+                  +
+                  2
+                  *
+                  2'
+        ));
+    }
 }