fix(expr): replace literals case insensitive

adhocore · adhocore · commit a5c179fdb0e6 · 2019-12-28T06:39:33.000+07:00
diff --git a/src/Expression.php b/src/Expression.php
@@ -171,7 +171,7 @@ protected function normalizeExpr(string $expr): string
             return static::$expressions[$expr];
         }
 
-        $expr  = \preg_replace('~\s+~', ' ', \strtr($expr, static::$literals));
+        $expr  = \preg_replace('~\s+~', ' ', $expr);
         $count = \substr_count($expr, ' ');
 
         if ($count < 4 || $count > 5) {
@@ -180,6 +180,6 @@ protected function normalizeExpr(string $expr): string
             );
         }
 
-        return $expr;
+        return \str_ireplace(\array_keys(static::$literals), \array_values(static::$literals), $expr);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ protected function normalizeExpr(string $expr): string`
`171`	`171`	`return static::$expressions[$expr];`
`172`	`172`	`}`
`173`	`173`
`174`		`- $expr = \preg_replace('~\s+~', ' ', \strtr($expr, static::$literals));`
	`174`	`+ $expr = \preg_replace('~\s+~', ' ', $expr);`
`175`	`175`	`$count = \substr_count($expr, ' ');`
`176`	`176`
`177`	`177`	`if ($count < 4 \|\| $count > 5) {`
`@@ -180,6 +180,6 @@ protected function normalizeExpr(string $expr): string`
`180`	`180`	`);`
`181`	`181`	`}`
`182`	`182`
`183`		`- return $expr;`
	`183`	`+ return \str_ireplace(\array_keys(static::$literals), \array_values(static::$literals), $expr);`
`184`	`184`	`}`
`185`	`185`	`}`