Move some pages to Core namespace

Author: carlbennett

src/Controllers/Legacy.php renamed to src/Controllers/Core/Legacy.php

@@ -1,19 +1,19 @@
 <?php
 
-namespace BNETDocs\Controllers;
+namespace BNETDocs\Controllers\Core;
 
 use \BNETDocs\Libraries\Core\HttpCode;
 use \BNETDocs\Libraries\Core\Router;
 use \CarlBennett\MVC\Libraries\Common;
 
-class Legacy extends Base
+class Legacy extends \BNETDocs\Controllers\Base
 {
   /**
    * Constructs a Controller, typically to initialize properties.
    */
   public function __construct()
   {
-    $this->model = new \BNETDocs\Models\Legacy();
+    $this->model = new \BNETDocs\Models\Core\Legacy();
   }
 
   /**

src/Controllers/Maintenance.php renamed to src/Controllers/Core/Maintenance.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace BNETDocs\Controllers;
+namespace BNETDocs\Controllers\Core;
 
-class Maintenance extends Base
+class Maintenance extends \BNETDocs\Controllers\Base
 {
   /**
    * Constructs a Controller, typically to initialize properties.
    */
   public function __construct()
   {
-    $this->model = new \BNETDocs\Models\Maintenance();
+    $this->model = new \BNETDocs\Models\Core\Maintenance();
   }
 
   /**

src/Controllers/PageNotFound.php renamed to src/Controllers/Core/NotFound.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace BNETDocs\Controllers;
+namespace BNETDocs\Controllers\Core;
 
-class PageNotFound extends Base
+class NotFound extends \BNETDocs\Controllers\Base
 {
   /**
    * Constructs a Controller, typically to initialize properties.
    */
   public function __construct()
   {
-    $this->model = new \BNETDocs\Models\PageNotFound();
+    $this->model = new \BNETDocs\Models\Core\NotFound();
   }
 
   /**

src/Controllers/PhpInfo.php renamed to src/Controllers/Core/PhpInfo.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace BNETDocs\Controllers;
+namespace BNETDocs\Controllers\Core;
 
 use \BNETDocs\Libraries\Core\HttpCode;
 
-class PhpInfo extends Base
+class PhpInfo extends \BNETDocs\Controllers\Base
 {
   /**
    * Constructs a Controller, typically to initialize properties.
    */
   public function __construct()
   {
-    $this->model = new \BNETDocs\Models\PhpInfo();
+    $this->model = new \BNETDocs\Models\Core\PhpInfo();
   }
 
   /**

src/Controllers/RedirectSoft.php renamed to src/Controllers/Core/RedirectSoft.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace BNETDocs\Controllers;
+namespace BNETDocs\Controllers\Core;
 
-class RedirectSoft extends Base
+class RedirectSoft extends \BNETDocs\Controllers\Base
 {
   /**
    * Constructs a Controller, typically to initialize properties.
    */
   public function __construct()
   {
-    $this->model = new \BNETDocs\Models\RedirectSoft();
+    $this->model = new \BNETDocs\Models\Core\RedirectSoft();
   }
 
   /**

src/Controllers/Robotstxt.php renamed to src/Controllers/Core/Robotstxt.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace BNETDocs\Controllers;
+namespace BNETDocs\Controllers\Core;
 
-class Robotstxt extends Base
+class Robotstxt extends \BNETDocs\Controllers\Base
 {
   /**
    * Constructs a Controller, typically to initialize properties.
    */
   public function __construct()
   {
-    $this->model = new \BNETDocs\Models\Robotstxt();
+    $this->model = new \BNETDocs\Models\Core\Robotstxt();
   }
 
   /**

src/Controllers/Status.php renamed to src/Controllers/Core/Status.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace BNETDocs\Controllers;
+namespace BNETDocs\Controllers\Core;
 
 use \BNETDocs\Libraries\Core\HttpCode;
-use \BNETDocs\Models\Status as StatusModel;
+use \BNETDocs\Models\Core\Status as StatusModel;
 use \CarlBennett\MVC\Libraries\Common;
 
-class Status extends Base
+class Status extends \BNETDocs\Controllers\Base
 {
   public const MAX_USER_AGENT = 255; // database varchar(255)
 

src/Libraries/Core/ExceptionHandler.php

@@ -139,7 +139,7 @@ private static function gracefulExit(StdClass &$context): void
     $display_errors = \ini_get('display_errors');
     if (!$display_errors || \strtolower($display_errors) == 'off')
     {
-      (new \BNETDocs\Libraries\Core\Template(null, 'ExceptionHandler'))->invoke();
+      (new \BNETDocs\Libraries\Core\Template(null, 'Core/ExceptionHandler'))->invoke();
     }
     else
     {

src/Models/Core/Legacy.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace BNETDocs\Models\Core;
+
+class Legacy extends \BNETDocs\Models\ActiveUser implements \JsonSerializable
+{
+    public ?string $did = null;
+    public ?bool $is_legacy = null;
+    public ?string $lang = null;
+    public ?string $nid = null;
+    public ?string $op = null;
+    public ?string $pid = null;
+    public ?string $url = null;
+
+    public function jsonSerialize(): mixed
+    {
+        return \array_merge(parent::jsonSerialize(), [
+            'did' => $this->did,
+            'is_legacy' => $this->is_legacy,
+            'lang' => $this->lang,
+            'nid' => $this->nid,
+            'op' => $this->op,
+            'pid' => $this->pid,
+            'url' => $this->url,
+        ]);
+    }
+}

src/Models/Core/Maintenance.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace BNETDocs\Models\Core;
+
+class Maintenance extends \BNETDocs\Models\ActiveUser implements \JsonSerializable
+{
+    public ?string $message = null;
+
+    public function jsonSerialize(): mixed
+    {
+        return \array_merge(parent::jsonSerialize(), ['message' => $this->message]);
+    }
+}