Merge pull request #4 from SamMousa/master

Update StringDistance.php

Author: tdebatty

src/webd/language/StringDistance.php

@@ -56,27 +56,15 @@ public static function JaroWinkler($string1, $string2, $PREFIXSCALE = 0.1) {
         return $JaroDistance + $prefixLength * $PREFIXSCALE * (1.0 - $JaroDistance);
     }
 
-    protected static function getCommonCharacters($string1, $string2, $allowedDistance) {
+   protected static function getCommonCharacters($string1, $string2, $allowedDistance) {
 
-        $str1_len = strlen($string1);
         $str2_len = strlen($string2);
-        $temp_string2 = $string2;
-
         $commonCharacters = '';
-
-        for ($i = 0; $i < $str1_len; $i++) {
-
-            $noMatch = True;
-
-            // compare if char does match inside given allowedDistance
-            // and if it does add it to commonCharacters
-            for ($j = max(0, $i - $allowedDistance); $noMatch && $j < min($i + $allowedDistance + 1, $str2_len); $j++) {
-                if ($temp_string2[$j] == $string1[$i]) {
-                    $noMatch = False;
-
-                    $commonCharacters .= $string1[$i];
-
-                    $temp_string2[$j] = '';
+        if (!empty($string1)) {
+            foreach (str_split($string1) as $i => $char) {
+                $search = strpos($string2, $char, $i <= $allowedDistance ? 0 : min($i - $allowedDistance, $str2_len));
+                if ($search !== false && $search <= $i + $allowedDistance + 1) {
+                    $commonCharacters .= $char;
                 }
             }
         }