Optimize findBetween method to remove calling function mb_substr()

yiisoft · Nov 1, 2023 · 5ce3b4e · 5ce3b4e
1 parent 6804fbe
commit 5ce3b4e
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/framework/helpers/BaseStringHelper.php b/framework/helpers/BaseStringHelper.php
@@ -546,14 +546,13 @@ public static function findBetween($string, $start, $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);
     }
 }