From 16ca848d5df44ef1283548454ddbf855cf97936a Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Thu, 11 Jan 2024 13:47:13 +0100
Subject: [PATCH 1/2] [4.x] Static caching file path fallback

---
 src/StaticCaching/Cachers/FileCacher.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/StaticCaching/Cachers/FileCacher.php b/src/StaticCaching/Cachers/FileCacher.php
index 11a9d3afa5..27bd017d61 100644
--- a/src/StaticCaching/Cachers/FileCacher.php
+++ b/src/StaticCaching/Cachers/FileCacher.php
@@ -163,7 +163,7 @@ public function getCachePath($site = null)
     public function getFilePath($url, $site = null)
     {
         $urlParts = parse_url($url);
-        $pathParts = pathinfo($urlParts['path']);
+        $pathParts = pathinfo($urlParts['path'] ?? $url);
         $slug = $pathParts['basename'];
         $query = $this->config('ignore_query_strings') ? '' : Arr::get($urlParts, 'query', '');
 

From 2420c0d3222dd6ad431010e2e271a05844aef3f4 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 28 May 2024 16:08:03 -0400
Subject: [PATCH 2/2] pass the domain instead as its expecting full urls

---
 src/StaticCaching/Cachers/FileCacher.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/StaticCaching/Cachers/FileCacher.php b/src/StaticCaching/Cachers/FileCacher.php
index d47528da5a..c0e372b547 100644
--- a/src/StaticCaching/Cachers/FileCacher.php
+++ b/src/StaticCaching/Cachers/FileCacher.php
@@ -121,7 +121,7 @@ public function invalidateUrl($url, $domain = null)
             ->getUrls($domain)
             ->filter(fn ($value) => $value === $url || str_starts_with($value, $url.'?'))
             ->each(function ($value, $key) use ($site, $domain) {
-                $this->writer->delete($this->getFilePath($value, $site));
+                $this->writer->delete($this->getFilePath($domain.$value, $site));
                 $this->forgetUrl($key, $domain);
             });
 
@@ -164,7 +164,7 @@ public function getCachePath($site = null)
     public function getFilePath($url, $site = null)
     {
         $urlParts = parse_url($url);
-        $pathParts = pathinfo($urlParts['path'] ?? $url);
+        $pathParts = pathinfo($urlParts['path']);
         $slug = $pathParts['basename'];
         $query = $this->config('ignore_query_strings') ? '' : Arr::get($urlParts, 'query', '');