CsrfTokenReplacer avoid str_replace(): Passing null to parameter #1 (…

…$search) of type array|string is deprecated (#482) Co-authored-by: Herbert Maschke <[email protected]>
spatie · Dec 9, 2024 · 2604409 · 2604409
1 parent 06d97ea
commit 2604409
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/Replacers/CsrfTokenReplacer.php b/src/Replacers/CsrfTokenReplacer.php
@@ -10,27 +10,33 @@ class CsrfTokenReplacer implements Replacer
 
     public function prepareResponseToCache(Response $response): void
     {
-        if (! $response->getContent()) {
+        $csrf_token = csrf_token();
+        $content = $response->getContent();
+
+        if (! $content || ! $csrf_token) {
             return;
         }
 
         $response->setContent(str_replace(
-            csrf_token(),
+            $csrf_token,
             $this->replacementString,
-            $response->getContent()
+            $content,
         ));
     }
 
     public function replaceInCachedResponse(Response $response): void
     {
-        if (! $response->getContent()) {
+        $csrf_token = csrf_token();
+        $content = $response->getContent();
+
+        if (! $content || ! $csrf_token) {
             return;
         }
 
         $response->setContent(str_replace(
             $this->replacementString,
-            csrf_token(),
-            $response->getContent()
+            $csrf_token,
+            $content,
         ));
     }
 }