Improve function rank

iranianpep · Jul 18, 2017 · 34f4745 · 34f4745
1 parent c6a9871
commit 34f4745
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/Botonomous/utility/MessageUtility.php b/src/Botonomous/utility/MessageUtility.php
@@ -184,10 +184,8 @@ private function isPositionTaken(array $tokensPositions, $newPosition)
 
         foreach ($tokensPositions as $token => $positions) {
             $tokenLength = strlen($token);
-            foreach ($positions as $position) {
-                if ($this->isPositionIn($newPosition, $position, $tokenLength) === true) {
-                    return true;
-                }
+            if ($this->isPositionIn($newPosition, $positions, $tokenLength) === true) {
+                return true;
             }
         }
 
@@ -196,13 +194,19 @@ private function isPositionTaken(array $tokensPositions, $newPosition)
 
     /**
      * @param $newPosition
-     * @param $position
+     * @param $positions
      * @param $tokenLength
      *
      * @return bool
      */
-    private function isPositionIn($newPosition, $position, $tokenLength)
+    private function isPositionIn($newPosition, array $positions, $tokenLength)
     {
-        return $newPosition >= $position && $newPosition < $position + $tokenLength;
+        foreach ($positions as $position) {
+            if ($newPosition >= $position && $newPosition < $position + $tokenLength) {
+                return true;
+            }
+        }
+
+        return false;
     }
 }