fix: robots and sitemap served at /storage path

accessibility-exchange · Nov 22, 2023 · 74cc74b · 74cc74b
1 parent 22914fe
commit 74cc74b
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 74 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,8 @@
 /node_modules
 /public/hot
 /public/storage
+/public/robots.txt
+/public/sitemap.xml
 /storage/*.key
 /vendor
 .DS_Store

diff --git a/app/Console/Commands/ClearRobots.php b/app/Console/Commands/ClearRobots.php
@@ -26,6 +26,6 @@ class ClearRobots extends Command
      */
     public function handle()
     {
-        Storage::disk('public')->delete('robots.txt');
+        Storage::disk('public_root')->delete('robots.txt');
     }
 }
diff --git a/app/Console/Commands/ClearSitemap.php b/app/Console/Commands/ClearSitemap.php
@@ -26,6 +26,6 @@ class ClearSitemap extends Command
      */
     public function handle()
     {
-        Storage::disk('public')->delete('sitemap.xml');
+        Storage::disk('public_root')->delete('sitemap.xml');
     }
 }
diff --git a/app/Console/Commands/GenerateRobots.php b/app/Console/Commands/GenerateRobots.php
@@ -26,6 +26,6 @@ class GenerateRobots extends Command
      */
     public function handle()
     {
-        Storage::disk('public')->put('robots.txt', view('robots')->render());
+        Storage::disk('public_root')->put('robots.txt', view('robots')->render());
     }
 }
diff --git a/app/Console/Commands/GenerateSitemap.php b/app/Console/Commands/GenerateSitemap.php
@@ -57,6 +57,6 @@ public function handle()
             }
         }
 
-        Storage::disk('public')->put('sitemap.xml', view('sitemap', ['routes' => $routes, 'lastmod' => $lastmod])->render());
+        Storage::disk('public_root')->put('sitemap.xml', view('sitemap', ['routes' => $routes, 'lastmod' => $lastmod])->render());
     }
 }
diff --git a/config/filesystems.php b/config/filesystems.php
@@ -42,6 +42,11 @@
             'visibility' => 'public',
         ],
 
+        'public_root' => [
+            'driver' => 'local',
+            'root' => public_path(),
+        ],
+
         'snapshots' => [
             'driver' => 'local',
             'root' => database_path('snapshots'),

diff --git a/tests/Feature/Console/ClearRobotsTest.php b/tests/Feature/Console/ClearRobotsTest.php
@@ -5,22 +5,22 @@
 use function Pest\Laravel\artisan;
 
 beforeEach(function () {
-    $this->disk = Storage::disk('public');
+    $this->disk = Storage::disk('public_root');
     $this->robots = 'robots.txt';
     $this->original = 'robots.original.txt';
 
     if ($this->disk->fileExists($this->robots)) {
-        Storage::disk('public')->move($this->robots, $this->original);
+        Storage::disk('public_root')->move($this->robots, $this->original);
     }
 
-    Storage::disk('public')->put($this->robots, 'test');
+    Storage::disk('public_root')->put($this->robots, 'test');
 });
 
 afterEach(function () {
-    Storage::disk('public')->delete($this->robots);
+    Storage::disk('public_root')->delete($this->robots);
 
     if ($this->disk->fileExists($this->original)) {
-        Storage::disk('public')->move($this->original, $this->robots);
+        Storage::disk('public_root')->move($this->original, $this->robots);
     }
 });
 
@@ -33,7 +33,7 @@
 });
 
 test('Clear robots.txt completes even if file did not exist', function () {
-    Storage::disk('public')->delete($this->robots);
+    Storage::disk('public_root')->delete($this->robots);
     $this->disk->assertMissing($this->robots);
 
     artisan('seo:clear-robots')->assertSuccessful();

diff --git a/tests/Feature/Console/ClearSeoTest.php b/tests/Feature/Console/ClearSeoTest.php
@@ -5,34 +5,34 @@
 use function Pest\Laravel\artisan;
 
 beforeEach(function () {
-    $this->disk = Storage::disk('public');
+    $this->disk = Storage::disk('public_root');
     $this->robots = 'robots.txt';
     $this->robotsOriginal = 'robots.original.txt';
     $this->sitemap = 'sitemap.xml';
     $this->sitemapOriginal = 'sitemap.original.xml';
 
     if ($this->disk->fileExists($this->robots)) {
-        Storage::disk('public')->move($this->robots, $this->robotsOriginal);
+        Storage::disk('public_root')->move($this->robots, $this->robotsOriginal);
     }
 
     if ($this->disk->fileExists($this->sitemap)) {
-        Storage::disk('public')->move($this->sitemap, $this->sitemapOriginal);
+        Storage::disk('public_root')->move($this->sitemap, $this->sitemapOriginal);
     }
 
-    Storage::disk('public')->put($this->robots, 'test');
-    Storage::disk('public')->put($this->sitemap, '<test></test>');
+    Storage::disk('public_root')->put($this->robots, 'test');
+    Storage::disk('public_root')->put($this->sitemap, '<test></test>');
 });
 
 afterEach(function () {
-    Storage::disk('public')->delete($this->robots);
-    Storage::disk('public')->delete($this->sitemap);
+    Storage::disk('public_root')->delete($this->robots);
+    Storage::disk('public_root')->delete($this->sitemap);
 
     if ($this->disk->fileExists($this->robotsOriginal)) {
-        Storage::disk('public')->move($this->robotsOriginal, $this->robots);
+        Storage::disk('public_root')->move($this->robotsOriginal, $this->robots);
     }
 
     if ($this->disk->fileExists($this->sitemapOriginal)) {
-        Storage::disk('public')->move($this->sitemapOriginal, $this->sitemap);
+        Storage::disk('public_root')->move($this->sitemapOriginal, $this->sitemap);
     }
 });
 
@@ -47,8 +47,8 @@
 });
 
 test('Clear seo completes even if files did not exist', function () {
-    Storage::disk('public')->delete($this->robots);
-    Storage::disk('public')->delete($this->sitemap);
+    Storage::disk('public_root')->delete($this->robots);
+    Storage::disk('public_root')->delete($this->sitemap);
 
     $this->disk->assertMissing($this->robots);
     $this->disk->assertMissing($this->sitemap);

diff --git a/tests/Feature/Console/ClearSitemapTest.php b/tests/Feature/Console/ClearSitemapTest.php
@@ -5,22 +5,22 @@
 use function Pest\Laravel\artisan;
 
 beforeEach(function () {
-    $this->disk = Storage::disk('public');
+    $this->disk = Storage::disk('public_root');
     $this->sitemap = 'sitemap.xml';
     $this->original = 'sitemap.original.xml';
 
     if ($this->disk->fileExists($this->sitemap)) {
-        Storage::disk('public')->move($this->sitemap, $this->original);
+        Storage::disk('public_root')->move($this->sitemap, $this->original);
     }
 
-    Storage::disk('public')->put($this->sitemap, '<test></test>');
+    Storage::disk('public_root')->put($this->sitemap, '<test></test>');
 });
 
 afterEach(function () {
-    Storage::disk('public')->delete($this->sitemap);
+    Storage::disk('public_root')->delete($this->sitemap);
 
     if ($this->disk->fileExists($this->original)) {
-        Storage::disk('public')->move($this->original, $this->sitemap);
+        Storage::disk('public_root')->move($this->original, $this->sitemap);
     }
 });
 
@@ -33,7 +33,7 @@
 });
 
 test('Clear sitemap completes even if file did not exist', function () {
-    Storage::disk('public')->delete($this->sitemap);
+    Storage::disk('public_root')->delete($this->sitemap);
     $this->disk->assertMissing($this->sitemap);
 
     artisan('seo:clear-sitemap')->assertSuccessful();

diff --git a/tests/Feature/Console/DeployLocalTest.php b/tests/Feature/Console/DeployLocalTest.php
@@ -2,37 +2,10 @@
 
 use function Pest\Laravel\artisan;
 
-beforeEach(function () {
-    $this->disk = Storage::disk('public');
-    $this->robots = 'robots.txt';
-    $this->robotsOriginal = 'robots.original.txt';
-    $this->sitemap = 'sitemap.xml';
-    $this->sitemapOriginal = 'sitemap.original.xml';
-
-    if ($this->disk->fileExists($this->robots)) {
-        Storage::disk('public')->move($this->robots, $this->robotsOriginal);
-    }
-
-    if ($this->disk->fileExists($this->sitemap)) {
-        Storage::disk('public')->move($this->sitemap, $this->sitemapOriginal);
-    }
-});
-
 afterEach(function () {
     artisan('optimize:clear');
     artisan('icons:clear');
     artisan('event:clear');
-
-    Storage::disk('public')->delete($this->robots);
-    Storage::disk('public')->delete($this->sitemap);
-
-    if ($this->disk->fileExists($this->robotsOriginal)) {
-        Storage::disk('public')->move($this->robotsOriginal, $this->robots);
-    }
-
-    if ($this->disk->fileExists($this->sitemapOriginal)) {
-        Storage::disk('public')->move($this->sitemapOriginal, $this->sitemap);
-    }
 });
 
 test('Completes successfully', function () {

diff --git a/tests/Feature/Console/GenerateRobotsTest.php b/tests/Feature/Console/GenerateRobotsTest.php
@@ -5,20 +5,20 @@
 use function Pest\Laravel\artisan;
 
 beforeEach(function () {
-    $this->disk = Storage::disk('public');
+    $this->disk = Storage::disk('public_root');
     $this->robots = 'robots.txt';
     $this->original = 'robots.original.txt';
 
     if ($this->disk->fileExists($this->robots)) {
-        Storage::disk('public')->move($this->robots, $this->original);
+        Storage::disk('public_root')->move($this->robots, $this->original);
     }
 });
 
 afterEach(function () {
-    Storage::disk('public')->delete($this->robots);
+    Storage::disk('public_root')->delete($this->robots);
 
     if ($this->disk->fileExists($this->original)) {
-        Storage::disk('public')->move($this->original, $this->robots);
+        Storage::disk('public_root')->move($this->original, $this->robots);
     }
 });
 
@@ -31,7 +31,7 @@
 });
 
 test('Generate robots completes even if file already exists', function () {
-    Storage::disk('public')->put($this->robots, 'test');
+    Storage::disk('public_root')->put($this->robots, 'test');
 
     $this->disk->assertExists($this->robots);
 

diff --git a/tests/Feature/Console/GenerateSeoTest.php b/tests/Feature/Console/GenerateSeoTest.php
@@ -5,31 +5,31 @@
 use function Pest\Laravel\artisan;
 
 beforeEach(function () {
-    $this->disk = Storage::disk('public');
+    $this->disk = Storage::disk('public_root');
     $this->robots = 'robots.txt';
     $this->robotsOriginal = 'robots.original.txt';
     $this->sitemap = 'sitemap.xml';
     $this->sitemapOriginal = 'sitemap.original.xml';
 
     if ($this->disk->fileExists($this->robots)) {
-        Storage::disk('public')->move($this->robots, $this->robotsOriginal);
+        Storage::disk('public_root')->move($this->robots, $this->robotsOriginal);
     }
 
     if ($this->disk->fileExists($this->sitemap)) {
-        Storage::disk('public')->move($this->sitemap, $this->sitemapOriginal);
+        Storage::disk('public_root')->move($this->sitemap, $this->sitemapOriginal);
     }
 });
 
 afterEach(function () {
-    Storage::disk('public')->delete($this->robots);
-    Storage::disk('public')->delete($this->sitemap);
+    Storage::disk('public_root')->delete($this->robots);
+    Storage::disk('public_root')->delete($this->sitemap);
 
     if ($this->disk->fileExists($this->robotsOriginal)) {
-        Storage::disk('public')->move($this->robotsOriginal, $this->robots);
+        Storage::disk('public_root')->move($this->robotsOriginal, $this->robots);
     }
 
     if ($this->disk->fileExists($this->sitemapOriginal)) {
-        Storage::disk('public')->move($this->sitemapOriginal, $this->sitemap);
+        Storage::disk('public_root')->move($this->sitemapOriginal, $this->sitemap);
     }
 });
 
@@ -44,8 +44,8 @@
 });
 
 test('Generate seo completes even if files already exist', function () {
-    Storage::disk('public')->put($this->robots, 'test');
-    Storage::disk('public')->put($this->sitemap, '<test></test>');
+    Storage::disk('public_root')->put($this->robots, 'test');
+    Storage::disk('public_root')->put($this->sitemap, '<test></test>');
 
     $this->disk->assertExists($this->robots);
     $this->disk->assertExists($this->sitemap);

diff --git a/tests/Feature/Console/GenerateSitemapTest.php b/tests/Feature/Console/GenerateSitemapTest.php
@@ -5,20 +5,20 @@
 use function Pest\Laravel\artisan;
 
 beforeEach(function () {
-    $this->disk = Storage::disk('public');
+    $this->disk = Storage::disk('public_root');
     $this->sitemap = 'sitemap.xml';
     $this->original = 'sitemap.original.xml';
 
     if ($this->disk->fileExists($this->sitemap)) {
-        Storage::disk('public')->move($this->sitemap, $this->original);
+        Storage::disk('public_root')->move($this->sitemap, $this->original);
     }
 });
 
 afterEach(function () {
-    Storage::disk('public')->delete($this->sitemap);
+    Storage::disk('public_root')->delete($this->sitemap);
 
     if ($this->disk->fileExists($this->original)) {
-        Storage::disk('public')->move($this->original, $this->sitemap);
+        Storage::disk('public_root')->move($this->original, $this->sitemap);
     }
 });
 
@@ -31,11 +31,11 @@
 });
 
 test('Generate sitemaps completes even if file already exists', function () {
-    Storage::disk('public')->put($this->sitemap, '<test></test>');
+    Storage::disk('public_root')->put($this->sitemap, '<test></test>');
 
     $this->disk->assertExists($this->sitemap);
 
-    artisan('seo:generate')->assertSuccessful();
+    artisan('seo:generate-sitemap')->assertSuccessful();
 
     $this->disk->assertExists($this->sitemap);
 });