Rename RedirectSoft to Redirect

Author: carlbennett

src/Controllers/Core/Redirect.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace BNETDocs\Controllers\Core;
+
+class Redirect extends \BNETDocs\Controllers\Base
+{
+    /**
+     * Constructs a Controller, typically to initialize properties.
+     */
+    public function __construct()
+    {
+        $this->model = new \BNETDocs\Models\Core\Redirect();
+    }
+
+    /**
+     * Invoked by the Router class to handle the request.
+     *
+     * @param array|null $args The optional route arguments and any captured URI arguments.
+     * @return boolean Whether the Router should invoke the configured View.
+     */
+    public function invoke(?array $args): bool
+    {
+        $this->model->location = \BNETDocs\Libraries\Core\UrlFormatter::format(
+            !empty($args) && \is_string($args[0]) ? \array_shift($args) : null
+        );
+        $this->model->_responseCode = !empty($args) && \is_int($args[0]) ?
+            \array_shift($args) : \BNETDocs\Libraries\Core\HttpCode::HTTP_FOUND;
+        $this->model->_responseHeaders['Location'] = $this->model->location;
+        return true;
+    }
+}

src/Controllers/Core/RedirectSoft.php

@@ -2,7 +2,7 @@
 
 namespace BNETDocs\Models\Core;
 
-class RedirectSoft extends \BNETDocs\Models\ActiveUser implements \JsonSerializable
+class Redirect extends \BNETDocs\Models\ActiveUser implements \JsonSerializable
 {
     public ?string $location = null;
 

src/Models/Core/RedirectSoft.php renamed to src/Models/Core/Redirect.php

@@ -1,6 +1,6 @@
 <?php /* vim: set colorcolumn= expandtab shiftwidth=2 softtabstop=2 tabstop=4 smarttab: */
 namespace BNETDocs\Templates\Core;
-$title = 'Soft Redirect';
+$title = 'Redirect';
 require('./Includes/header.inc.phtml'); ?>
 <div class="container">
   <h1><?=$title?></h1>

src/Templates/Core/RedirectSoft.phtml renamed to src/Templates/Core/Redirect.phtml

@@ -2,16 +2,16 @@
 
 namespace BNETDocs\Views\Core;
 
-class RedirectSoftHtml extends \BNETDocs\Views\Base\Html
+class RedirectHtml extends \BNETDocs\Views\Base\Html
 {
   public static function invoke(\BNETDocs\Interfaces\Model $model): void
   {
-    if (!$model instanceof \BNETDocs\Models\Core\RedirectSoft)
+    if (!$model instanceof \BNETDocs\Models\Core\Redirect)
     {
       throw new \BNETDocs\Exceptions\InvalidModelException($model);
     }
 
-    (new \BNETDocs\Libraries\Core\Template($model, 'Core/RedirectSoft'))->invoke();
+    (new \BNETDocs\Libraries\Core\Template($model, 'Core/Redirect'))->invoke();
     $model->_responseHeaders['Content-Type'] = self::mimeType();
   }
 }

src/Views/Core/RedirectSoftHtml.php renamed to src/Views/Core/RedirectHtml.php

@@ -2,11 +2,11 @@
 
 namespace BNETDocs\Views\Core;
 
-class RedirectSoftJson extends \BNETDocs\Views\Base\Json
+class RedirectJson extends \BNETDocs\Views\Base\Json
 {
   public static function invoke(\BNETDocs\Interfaces\Model $model): void
   {
-    if (!$model instanceof \BNETDocs\Models\Core\RedirectSoft)
+    if (!$model instanceof \BNETDocs\Models\Core\Redirect)
     {
       throw new \BNETDocs\Exceptions\InvalidModelException($model);
     }

src/Views/Core/RedirectSoftJson.php renamed to src/Views/Core/RedirectJson.php

@@ -2,11 +2,11 @@
 
 namespace BNETDocs\Views\Core;
 
-class RedirectSoftPlain extends \BNETDocs\Views\Base\Plain
+class RedirectPlain extends \BNETDocs\Views\Base\Plain
 {
   public static function invoke(\BNETDocs\Interfaces\Model $model): void
   {
-    if (!$model instanceof \BNETDocs\Models\Core\RedirectSoft)
+    if (!$model instanceof \BNETDocs\Models\Core\Redirect)
     {
       throw new \BNETDocs\Exceptions\InvalidModelException($model);
     }

src/Views/Core/RedirectSoftPlain.php renamed to src/Views/Core/RedirectPlain.php

@@ -56,7 +56,7 @@ public static function main(int $argc, array $argv): int
     else
     {
       Router::$routes = [
-        ['#^/\.well-known/change-password$#', 'Core\\RedirectSoft', ['Core\\RedirectSoftHtml', 'Core\\RedirectSoftJson', 'Core\\RedirectSoftPlain'], '/user/changepassword'],
+        ['#^/\.well-known/change-password$#', 'Core\\Redirect', ['Core\\RedirectHtml', 'Core\\RedirectJson', 'Core\\RedirectPlain'], '/user/changepassword'],
         ['#^/$#', 'Core\\Legacy', ['Core\\LegacyHtml']],
         ['#^/comment/create/?$#', 'Comment\\Create', ['Comment\\CreateJson']],
         ['#^/comment/delete/?$#', 'Comment\\Delete', ['Comment\\DeleteHtml']],