Move ServerType class to Server\Type

Author: carlbennett

src/Controllers/Server/Create.php

@@ -33,7 +33,7 @@ public function invoke(?array $args): bool
     $this->model->_responseCode = HttpCode::HTTP_OK;
     $this->model->form = Router::query();
     $this->model->server = new \BNETDocs\Libraries\Server(null);
-    $this->model->server_types = \BNETDocs\Libraries\ServerType::getAllServerTypes();
+    $this->model->server_types = \BNETDocs\Libraries\Server\Type::getAllServerTypes();
     if (Router::requestMethod() == Router::METHOD_POST) $this->handlePost();
     return true;
   }

src/Controllers/Server/Edit.php

@@ -50,7 +50,7 @@ public function invoke(?array $args): bool
     }
 
     $this->model->_responseCode = HttpCode::HTTP_OK;
-    $this->model->server_types = \BNETDocs\Libraries\ServerType::getAllServerTypes();
+    $this->model->server_types = \BNETDocs\Libraries\Server\Type::getAllServerTypes();
     if (Router::requestMethod() == Router::METHOD_POST) $this->handlePost();
     return true;
   }

src/Controllers/Servers.php

@@ -113,7 +113,7 @@ public function invoke(?array $args): bool
 
     $this->model->server_types = [];
     foreach ($server_types as $id)
-      $this->model->server_types[] = new \BNETDocs\Libraries\ServerType($id);
+      $this->model->server_types[] = new \BNETDocs\Libraries\Server\Type($id);
 
     $this->model->_responseCode = \BNETDocs\Libraries\Core\HttpCode::HTTP_OK;
     return true;

src/Libraries/Server.php

@@ -4,7 +4,7 @@
 
 use \BNETDocs\Libraries\Core\DateTimeImmutable;
 use \BNETDocs\Libraries\Db\MariaDb;
-use \BNETDocs\Libraries\ServerType;
+use \BNETDocs\Libraries\Server\Type as ServerType;
 use \BNETDocs\Libraries\User;
 use \CarlBennett\MVC\Libraries\Common;
 use \DateTimeInterface;

src/Libraries/ServerType.php renamed to src/Libraries/Server/Type.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace BNETDocs\Libraries;
+namespace BNETDocs\Libraries\Server;
 
 use \BNETDocs\Libraries\Db\MariaDb;
 use \OutOfBoundsException;
 use \StdClass;
 
-class ServerType implements \BNETDocs\Interfaces\DatabaseObject, \JsonSerializable
+class Type implements \BNETDocs\Interfaces\DatabaseObject, \JsonSerializable
 {
   public const MAX_ID = 0xFFFFFFFFFFFFFFFF; // bigint(20) unsigned
   public const MAX_LABEL = 0xFF; // varchar(255)

src/Templates/Servers.phtml

@@ -1,6 +1,5 @@
 <?php /* vim: set colorcolumn= expandtab shiftwidth=2 softtabstop=2 tabstop=4 smarttab: */
 namespace BNETDocs\Templates;
-use \BNETDocs\Libraries\ServerType;
 use \BNETDocs\Libraries\User;
 use \CarlBennett\MVC\Libraries\Common;
 use \CarlBennett\MVC\Libraries\Pair;
@@ -36,7 +35,7 @@ require('./header.inc.phtml'); ?>
       <thead><tr><th scope="col">Status</th><th scope="col">Label</th><th scope="col">Address</th><th scope="col"></th></tr></thead><tbody>
 <?    foreach ($servers_by_type as $type_id => $servers)
       {
-        $server_type = new ServerType($type_id);
+        $server_type = new \BNETDocs\Libraries\Server\Type($type_id);
         $server_type_label = filter_var($server_type->getLabel(), FILTER_SANITIZE_FULL_SPECIAL_CHARS);
         printf('<tr><th scope="row" colspan="4">%s</th></tr>', $server_type_label);
         foreach ($servers as $server)