Do 3 Round substitution to avoid infinite loops

savannabits · Oct 24, 2023 · e1cc149 · e1cc149
1 parent 5b407c9
commit e1cc149
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/Helpers/Framework.php b/src/Helpers/Framework.php
@@ -76,9 +76,16 @@ public function substitute(string $expression, array $substitutions = [], string
         $values = collect($substitutions)->values();
 
         $replacement = Str::of($expression)->replace($keys->toArray(), $values->toArray())->toString();
-        while (Str::of($replacement)->contains($keys)) {
-            $replacement = $this->substitute($replacement,$substitutions,$substitutionIdentifier);
+        // ROUND 2
+        if (Str::of($replacement)->contains($keys)) {
+            $replacement = Str::of($replacement)->replace($keys->toArray(), $values->toArray())->toString();
         }
+
+        // ROUND 3
+        if (Str::of($replacement)->contains($keys)) {
+            $replacement = Str::of($replacement)->replace($keys->toArray(), $values->toArray())->toString();
+        }
+
         return $replacement;
     }