Merge pull request #131 from 8fold/fix-redirect

fix: redirect

content/public/self-improvement/content.md

@@ -1,3 +1,3 @@
 ---
-redirect: /design-your-life
+redirect: 301 /design-your-life
 ---

content/public/self-improvement/motivators/content.md

@@ -1,3 +1,3 @@
 ---
-redirect: /design-your-life/motivators
----
+redirect: 301 /design-your-life/motivators
+---

src/File.php

@@ -80,6 +80,20 @@ public function moved(string $format = ''): string|int|false
         return $this->dateField('moved', $format);
     }
 
+    /* @todo: Need testing to avoid regression */
+    public function redirect(): object|false
+    {
+        if ($this->frontMatterHasMember('redirect')) {
+            $redirect = strval($this->frontMatter['redirect']);
+            list($code, $destination) = explode(' ', $redirect, 2);
+            return (object) [
+                'code'        => intval($code),
+                'destination' => strval($destination)
+            ];
+        }
+        return false;
+    }
+
     private function dateField(
         string $key,
         string $format = ''

src/HttpRequest.php

@@ -63,6 +63,17 @@ public function statusCode(): int
         } elseif ($this->isNotFound()) {
             return 404;
 
+        } elseif (
+            $redirect = File::at(
+                $this->localPath(),
+                $this->fileSystem()
+            )->redirect()
+        ) {
+            // TODO: create HttpRedirect??
+            // @phpstan-ignore-next-line
+            $code = $redirect->code;
+            return ($code >= 300 and $code <= 399) ? $code : 500;
+
         }
         return 200;
     }

src/HttpResponse.php

@@ -48,6 +48,13 @@ public function headers(): array
         } elseif ($this->statusCode() === 404) {
             $headers['Content-Type'] = 'text/html';
 
+        } elseif ($this->statusCode() > 300 and $this->statusCode() < 399) {
+            if ($redirect = $this->request()->localFile()->redirect()) {
+                // TODO: create HttpRedirect??
+                // @phpstan-ignore-next-line
+                $headers['Location'] = $redirect->destination;
+
+            }
         }
         return $headers;
     }

tests/FileSystemTest.php

@@ -11,7 +11,7 @@
        count(
            TestFileSystem::init()->publishedContentFinder()
        )
-   )->toBeInt()->toBe(3);
+   )->toBeInt()->toBe(6);
 })->group('filesystem');
 
 it('has required folders', function() {

tests/HttpTest.php

@@ -99,6 +99,52 @@
         404
     );
 
+    expect(
+        HttpResponse::from(
+            request: HttpRequest::with(
+                ServerGlobals::init()->withRequestUri('/published-redirect'),
+                TestFileSystem::init()
+            )
+        )->statusCode()
+    )->toBeInt()->toBe(
+        301
+    );
+
+    expect(
+        HttpResponse::from(
+            request: HttpRequest::with(
+                ServerGlobals::init()->withRequestUri('/published-redirect/302'),
+                TestFileSystem::init()
+            )
+        )->statusCode()
+    )->toBeInt()->toBe(
+        302
+    );
+
+    expect(
+        HttpResponse::from(
+            request: HttpRequest::with(
+                ServerGlobals::init()->withRequestUri('/published-redirect/500'),
+                TestFileSystem::init()
+            )
+        )->statusCode()
+    )->toBeInt()->toBe(
+        500
+    );
+
+    $headers = HttpResponse::from(
+        request: HttpRequest::with(
+            ServerGlobals::init()->withRequestUri('/published-redirect/302'),
+            TestFileSystem::init()
+        )
+    )->headers();
+
+    expect(
+        array_key_exists('Location', $headers)
+    )->toBeTrue();
+})->group('response', 'request');
+
+it('can handle 405 response', function() {
     expect(
         HttpResponse::from(
             request: HttpRequest::with(
@@ -109,7 +155,7 @@
     )->toBeInt()->toBe(
         405
     );
-})->group('response', 'request');
+});
 
 it('can handle 500 response', function() {
     $serverGlobals = TestServerGlobals::init()->unsetAppEnv();

tests/test-content/content/public/published-redirect/302/content.md

@@ -0,0 +1,4 @@
+---
+title: This page should redirect
+redirect: 302 /published-sub-sub
+---

tests/test-content/content/public/published-redirect/500/content.md

@@ -0,0 +1,4 @@
+---
+title: This page should redirect
+redirect: 400 /published-sub-sub
+---

tests/test-content/content/public/published-redirect/content.md

@@ -0,0 +1,4 @@
+---
+title: This page should redirect
+redirect: 301 /published-sub-sub
+---