Move Servers class to Server/Index

Author: carlbennett

src/Controllers/Servers.php renamed to src/Controllers/Server/Index.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace BNETDocs\Controllers;
+namespace BNETDocs\Controllers\Server;
 
 use \BNETDocs\Libraries\Server\Server as ServerLib;
 
-class Servers extends Base
+class Index extends \BNETDocs\Controllers\Base
 {
   /**
    * Constructs a Controller, typically to initialize properties.
    */
   public function __construct()
   {
-    $this->model = new \BNETDocs\Models\Servers();
+    $this->model = new \BNETDocs\Models\Server\Index();
   }
 
   /**
@@ -24,7 +24,7 @@ public function invoke(?array $args): bool
   {
     $q = \BNETDocs\Libraries\Core\Router::query();
 
-    $this->model->server_types    = array();
+    $this->model->server_types    = [];
     $this->model->servers         = ServerLib::getAllServers();
     $this->model->status_bitmasks = [
       [

src/Models/Server/Index.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace BNETDocs\Models\Server;
+
+class Index extends \BNETDocs\Models\ActiveUser
+{
+    public ?array $server_types = null;
+    public ?array $servers = null;
+    public ?array $status_bitmasks = null;
+}

src/Models/Servers.php

@@ -1,5 +1,5 @@
 <?php /* vim: set colorcolumn= expandtab shiftwidth=2 softtabstop=2 tabstop=4 smarttab: */
-namespace BNETDocs\Templates;
+namespace BNETDocs\Templates\Server;
 use \BNETDocs\Libraries\User\User;
 use \CarlBennett\MVC\Libraries\Common;
 use \CarlBennett\MVC\Libraries\Pair;

src/Templates/Servers.phtml renamed to src/Templates/Server/Index.phtml

@@ -0,0 +1,17 @@
+<?php
+
+namespace BNETDocs\Views\Server;
+
+class IndexHtml extends \BNETDocs\Views\Base\Html
+{
+    public static function invoke(\BNETDocs\Interfaces\Model $model): void
+    {
+        if (!$model instanceof \BNETDocs\Models\Server\Index)
+        {
+            throw new \BNETDocs\Exceptions\InvalidModelException($model);
+        }
+
+        (new \BNETDocs\Libraries\Core\Template($model, 'Server/Index'))->invoke();
+        $model->_responseHeaders['Content-Type'] = self::mimeType();
+    }
+}

src/Views/Server/IndexHtml.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace BNETDocs\Views\Server;
+
+class IndexJson extends \BNETDocs\Views\Base\Json
+{
+    public static function invoke(\BNETDocs\Interfaces\Model $model): void
+    {
+        if (!$model instanceof \BNETDocs\Models\Server\Index)
+        {
+            throw new \BNETDocs\Exceptions\InvalidModelException($model);
+        }
+
+        $content = [];
+
+        foreach ($model->server_types as $server_type)
+        {
+            $content['server_types'][] = [
+                'id'    => (int) $server_type->getId(),
+                'label' =>       $server_type->getLabel()
+            ];
+        }
+
+        foreach ($model->servers as $server)
+        {
+            $content['servers'][] = $server;
+        }
+
+        $content['status_bitmasks'] = $model->status_bitmasks;
+
+        echo json_encode($content, self::jsonFlags());
+        $model->_responseHeaders['Content-Type'] = self::mimeType();
+    }
+}

src/Views/Server/IndexJson.php

@@ -107,9 +107,9 @@ function main(): void
       ['#^/server/delete/?$#', 'Server\\Delete', ['Server\\DeleteHtml']],
       ['#^/server/edit/?$#', 'Server\\Edit', ['Server\\EditHtml']],
       ['#^/server/updatejob\.json$#', 'Server\\UpdateJob', ['Server\\UpdateJobJson']],
-      ['#^/servers\.html?$#', 'Servers', ['ServersHtml']],
-      ['#^/servers\.json$#', 'Servers', ['ServersJson']],
-      ['#^/servers/?$#', 'Servers', ['ServersHtml', 'ServersJson']],
+      ['#^/servers\.html?$#', 'Server\\Index', ['Server\\IndexHtml']],
+      ['#^/servers\.json$#', 'Server\\Index', ['Server\\IndexJson']],
+      ['#^/servers/?$#', 'Server\\Index', ['Server\\IndexHtml', 'Server\\IndexJson']],
       ['#^/status\.json$#', 'Core\\Status', ['Core\\StatusJson']],
       ['#^/status\.txt$#', 'Core\\Status', ['Core\\StatusPlain']],
       ['#^/status/?$#', 'Core\\Status', ['Core\\StatusJson', 'Core\\StatusPlain']],