Don't normalize negative numbers. Fixed #68.

cloudinary · Mar 12, 2017 · cb1164a · cb1164a
1 parent 95a1e1d
commit cb1164a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Cloudinary.php b/src/Cloudinary.php
@@ -494,7 +494,7 @@ private static function normalize_expression($exp) {
         return $exp;
       } else {
         if (empty(self::$IF_REPLACE_RE)) {
-          self::$IF_REPLACE_RE = '/(\|\||>=|<=|&&|!=|>|=|<|\/|\-|\+|\*|' . implode('|', array_keys(self::$PREDEFINED_VARS)) . ')/';
+          self::$IF_REPLACE_RE = '/((\|\||>=|<=|&&|!=|>|=|<|\/|\-|\+|\*)(?=[ _])|' . implode('|', array_keys(self::$PREDEFINED_VARS)) . ')/';
         }
         if (isset($exp)) {
           $exp = preg_replace('/[ _]+/', '_', $exp);

diff --git a/tests/CloudinaryTest.php b/tests/CloudinaryTest.php
@@ -281,8 +281,8 @@ public function test_effect() {
 
   public function test_effect_with_array() {
     // should support effect with array
-    $options = array("effect" => array("sepia", 10));
-    $this->cloudinary_url_assertion("test", $options, CloudinaryTest::DEFAULT_UPLOAD_PATH . "e_sepia:10/test");
+    $options = array("effect" => array("sepia", -10));
+    $this->cloudinary_url_assertion("test", $options, CloudinaryTest::DEFAULT_UPLOAD_PATH . "e_sepia:-10/test");
   }
 
   public function test_density() {