Merge pull request #10 from savannabits/development

New Feature: Loop in Substitution until all keys are substituted.
savannabits · Oct 24, 2023 · 0a43d63 · 0a43d63
2 parents ddac0a8 + 5b407c9
commit 0a43d63
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Helpers/Framework.php b/src/Helpers/Framework.php
@@ -75,7 +75,11 @@ public function substitute(string $expression, array $substitutions = [], string
         $keys = collect($substitutions)->keys()->map(fn ($key) => "{$substitutionIdentifier}{$key}");
         $values = collect($substitutions)->values();
 
-        return Str::of($expression)->replace($keys->toArray(), $values->toArray())->toString();
+        $replacement = Str::of($expression)->replace($keys->toArray(), $values->toArray())->toString();
+        while (Str::of($replacement)->contains($keys)) {
+            $replacement = $this->substitute($replacement,$substitutions,$substitutionIdentifier);
+        }
+        return $replacement;
     }
 
     public function getByCode(Model | string $model, string|array $code)