fix some issues, expose methods to public

awssat · Jul 15, 2019 · 4e76034 · 4e76034
1 parent 74b0733
commit 4e76034
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/numberedStringOrder.php b/src/numberedStringOrder.php
@@ -151,7 +151,7 @@ protected function englishWordsToNumbers($str)
      *
      * @return int|mixed
      */
-    protected function arabicWordsToNumbers($str, $normalized)
+    public function arabicWordsToNumbers($str, $normalized)
     {
         // Normalization phase
         if (!$normalized) {
@@ -263,23 +263,23 @@ protected function arabicWordsToNumbers($str, $normalized)
 
         foreach ($complications as $complication => $by) {
             $subTotal = 0;
-            if (preg_match("/(.*)\s*{$complication}/", $str, $result) !== false && isset($result[1])) {
-                $result = " {$result[1]} ";
+            if (preg_match("/((.*)\s*{$complication})/", $str, $result) !== false && isset($result[1])) {
+                $result = " {$result[2]} ";
 
                 foreach ($spell as $word => $value) {
                     if (strpos($result, "$word ") !== false) {
-                        $str = str_replace("$word ", ' ', $str);
                         $result = str_replace("$word ", ' ', $result);
                         $subTotal += $value;
                     }
                 }
 
                 if (preg_match("/(\d+)/", $result, $numbersInResult) !== false && isset($numbersInResult[1])) {
                     $subTotal += $numbersInResult[1];
-                    $str = str_replace("{$numbersInResult[1]}", ' ', $str);
+                    $result = str_replace("{$numbersInResult[1]}", ' ', $result);
                 }
 
-                $str = str_replace(" $complication", ' ', $str);
+                $str = preg_replace("/(.*\s*{$complication})/", $result, $str);
+
                 $total += ($total == 0 && $subTotal == 0) ? $by : ($subTotal * $by);
             }
         }