refactor findBetween method to remove calling function mb_substr()

yiisoft · Nov 1, 2023 · c544d77 · c544d77
1 parent af6886f
commit c544d77
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/StringHelper.php b/src/StringHelper.php
@@ -637,15 +637,14 @@ public static function findBetween(string $string, string $start, string $end):
             return null;
         }
 
-        // Cut the string from the start position
-        $subString = mb_substr($string, $startPos + mb_strlen($start));
-        $endPos = mb_strrpos($subString, $end);
+        $startPos += mb_strlen($start);
+        $endPos = mb_strrpos($string, $end, $startPos);
 
         if ($endPos === false) {
             return null;
         }
 
-        return mb_substr($subString, 0, $endPos);
+        return mb_substr($string, $startPos, $endPos - $startPos);
     }
 
     /**