Move User class to User\User

BNETDocs · Dec 1, 2024 · 1dd440d · 1dd440d
1 parent 0f4109e
commit 1dd440d
Show file tree

Hide file tree

Showing 59 changed files with 90 additions and 89 deletions.
diff --git a/src/Controllers/Comment/Create.php b/src/Controllers/Comment/Create.php
@@ -20,7 +20,7 @@ public function __construct()
   public function invoke(?array $args): bool
   {
     $this->model->acl_allowed = $this->model->active_user
-      && $this->model->active_user->getOption(\BNETDocs\Libraries\User::OPTION_ACL_COMMENT_CREATE);
+      && $this->model->active_user->getOption(\BNETDocs\Libraries\User\User::OPTION_ACL_COMMENT_CREATE);
 
     if (!$this->model->acl_allowed)
     {

diff --git a/src/Controllers/Comment/Delete.php b/src/Controllers/Comment/Delete.php
@@ -25,7 +25,7 @@ public function invoke(?array $args): bool
     catch (\UnexpectedValueException) { $this->model->comment = null; }
 
     $this->model->acl_allowed = ($this->model->active_user && (
-      $this->model->active_user->getOption(\BNETDocs\Libraries\User::OPTION_ACL_COMMENT_DELETE) ||
+      $this->model->active_user->getOption(\BNETDocs\Libraries\User\User::OPTION_ACL_COMMENT_DELETE) ||
       ($this->model->comment && $this->model->active_user->getId() == $this->model->comment->getUserId())
     ));
 

diff --git a/src/Controllers/Comment/Edit.php b/src/Controllers/Comment/Edit.php
@@ -28,7 +28,7 @@ public function invoke(?array $args): bool
     catch (\UnexpectedValueException) { $this->model->comment = null; }
 
     $this->model->acl_allowed = $this->model->active_user && (
-      $this->model->active_user->getOption(\BNETDocs\Libraries\User::OPTION_ACL_COMMENT_MODIFY) ||
+      $this->model->active_user->getOption(\BNETDocs\Libraries\User\User::OPTION_ACL_COMMENT_MODIFY) ||
       ($this->model->comment && $this->model->active_user->getId() === $this->model->comment->getUserId())
     );
 

diff --git a/src/Controllers/Document/Create.php b/src/Controllers/Document/Create.php
@@ -20,7 +20,7 @@ public function __construct()
   public function invoke(?array $args): bool
   {
     $this->model->acl_allowed = $this->model->active_user
-      && $this->model->active_user->getOption(\BNETDocs\Libraries\User::OPTION_ACL_DOCUMENT_CREATE);
+      && $this->model->active_user->getOption(\BNETDocs\Libraries\User\User::OPTION_ACL_DOCUMENT_CREATE);
 
     if (!$this->model->acl_allowed)
     {

diff --git a/src/Controllers/Document/Delete.php b/src/Controllers/Document/Delete.php
@@ -17,7 +17,7 @@ public function __construct()
   public function invoke(?array $args): bool
   {
     $this->model->acl_allowed = $this->model->active_user
-      && $this->model->active_user->getOption(\BNETDocs\Libraries\User::OPTION_ACL_DOCUMENT_DELETE);
+      && $this->model->active_user->getOption(\BNETDocs\Libraries\User\User::OPTION_ACL_DOCUMENT_DELETE);
 
     if (!$this->model->acl_allowed)
     {

diff --git a/src/Controllers/Document/Edit.php b/src/Controllers/Document/Edit.php
@@ -16,7 +16,7 @@ public function __construct()
   public function invoke(?array $args): bool
   {
     $this->model->acl_allowed = $this->model->active_user
-      && $this->model->active_user->getOption(\BNETDocs\Libraries\User::OPTION_ACL_DOCUMENT_MODIFY);
+      && $this->model->active_user->getOption(\BNETDocs\Libraries\User\User::OPTION_ACL_DOCUMENT_MODIFY);
 
     if (!$this->model->acl_allowed)
     {

diff --git a/src/Controllers/EventLog/Index.php b/src/Controllers/EventLog/Index.php
@@ -19,7 +19,7 @@ public function __construct()
   public function invoke(?array $args): bool
   {
     $this->model->acl_allowed = $this->model->active_user
-      && $this->model->active_user->getOption(\BNETDocs\Libraries\User::OPTION_ACL_EVENT_LOG_VIEW);
+      && $this->model->active_user->getOption(\BNETDocs\Libraries\User\User::OPTION_ACL_EVENT_LOG_VIEW);
 
     if (!$this->model->acl_allowed)
     {

diff --git a/src/Controllers/EventLog/View.php b/src/Controllers/EventLog/View.php
@@ -14,7 +14,7 @@ public function __construct()
   public function invoke(?array $args): bool
   {
     $this->model->acl_allowed = $this->model->active_user
-    && $this->model->active_user->getOption(\BNETDocs\Libraries\User::OPTION_ACL_EVENT_LOG_VIEW);
+    && $this->model->active_user->getOption(\BNETDocs\Libraries\User\User::OPTION_ACL_EVENT_LOG_VIEW);
 
     if (!$this->model->acl_allowed)
     {

diff --git a/src/Controllers/News.php b/src/Controllers/News.php
@@ -2,7 +2,7 @@
 
 namespace BNETDocs\Controllers;
 
-use \BNETDocs\Libraries\User;
+use \BNETDocs\Libraries\User\User;
 
 class News extends Base
 {

diff --git a/src/Controllers/News/Create.php b/src/Controllers/News/Create.php
@@ -23,7 +23,7 @@ public function __construct()
   public function invoke(?array $args): bool
   {
     $this->model->acl_allowed = $this->model->active_user
-      && $this->model->active_user->getOption(\BNETDocs\Libraries\User::OPTION_ACL_NEWS_CREATE);
+      && $this->model->active_user->getOption(\BNETDocs\Libraries\User\User::OPTION_ACL_NEWS_CREATE);
 
     if (!$this->model->acl_allowed)
     {

diff --git a/src/Controllers/News/Delete.php b/src/Controllers/News/Delete.php
@@ -16,7 +16,7 @@ public function __construct()
   public function invoke(?array $args): bool
   {
     $this->model->acl_allowed = $this->model->active_user
-      && $this->model->active_user->getOption(\BNETDocs\Libraries\User::OPTION_ACL_NEWS_DELETE);
+      && $this->model->active_user->getOption(\BNETDocs\Libraries\User\User::OPTION_ACL_NEWS_DELETE);
 
     if (!$this->model->acl_allowed)
     {

diff --git a/src/Controllers/News/Edit.php b/src/Controllers/News/Edit.php
@@ -17,7 +17,7 @@ public function __construct()
   public function invoke(?array $args): bool
   {
     $this->model->acl_allowed = $this->model->active_user
-      && $this->model->active_user->getOption(\BNETDocs\Libraries\User::OPTION_ACL_NEWS_MODIFY);
+      && $this->model->active_user->getOption(\BNETDocs\Libraries\User\User::OPTION_ACL_NEWS_MODIFY);
 
     if (!$this->model->acl_allowed)
     {

diff --git a/src/Controllers/News/View.php b/src/Controllers/News/View.php
@@ -5,7 +5,7 @@
 use \BNETDocs\Libraries\Comment;
 use \BNETDocs\Libraries\Core\HttpCode;
 use \BNETDocs\Libraries\News\Post as NewsPost;
-use \BNETDocs\Libraries\User;
+use \BNETDocs\Libraries\User\User;
 
 class View extends \BNETDocs\Controllers\Base
 {

diff --git a/src/Controllers/Packet/Create.php b/src/Controllers/Packet/Create.php
@@ -19,7 +19,7 @@ public function __construct()
 
   public function invoke(?array $args): bool
   {
-    if (!$this->model->active_user || !$this->model->active_user->getOption(\BNETDocs\Libraries\User::OPTION_ACL_PACKET_CREATE))
+    if (!$this->model->active_user || !$this->model->active_user->getOption(\BNETDocs\Libraries\User\User::OPTION_ACL_PACKET_CREATE))
     {
       $this->model->_responseCode = HttpCode::HTTP_UNAUTHORIZED;
       $this->model->error = FormModel::ERROR_ACL_DENIED;

diff --git a/src/Controllers/Packet/Delete.php b/src/Controllers/Packet/Delete.php
@@ -17,7 +17,7 @@ public function __construct()
   public function invoke(?array $args): bool
   {
     $this->model->acl_allowed = $this->model->active_user
-      && $this->model->active_user->getOption(\BNETDocs\Libraries\User::OPTION_ACL_PACKET_DELETE);
+      && $this->model->active_user->getOption(\BNETDocs\Libraries\User\User::OPTION_ACL_PACKET_DELETE);
 
     if (!$this->model->acl_allowed)
     {

diff --git a/src/Controllers/Packet/Edit.php b/src/Controllers/Packet/Edit.php
@@ -21,7 +21,7 @@ public function __construct()
 
   public function invoke(?array $args): bool
   {
-    if (!$this->model->active_user || !$this->model->active_user->getOption(\BNETDocs\Libraries\User::OPTION_ACL_PACKET_MODIFY))
+    if (!$this->model->active_user || !$this->model->active_user->getOption(\BNETDocs\Libraries\User\User::OPTION_ACL_PACKET_MODIFY))
     {
       $this->model->error = FormModel::ERROR_ACL_DENIED;
       $this->model->_responseCode = HttpCode::HTTP_UNAUTHORIZED;

diff --git a/src/Controllers/PhpInfo.php b/src/Controllers/PhpInfo.php
@@ -22,7 +22,7 @@ public function __construct()
    */
   public function invoke(?array $args): bool
   {
-    if (!($this->model->active_user && $this->model->active_user->getOption(\BNETDocs\Libraries\User::OPTION_ACL_PHPINFO)))
+    if (!($this->model->active_user && $this->model->active_user->getOption(\BNETDocs\Libraries\User\User::OPTION_ACL_PHPINFO)))
     {
       $this->model->phpinfo = null;
       $this->model->_responseCode = HttpCode::HTTP_UNAUTHORIZED;

diff --git a/src/Controllers/Server/Create.php b/src/Controllers/Server/Create.php
@@ -23,7 +23,7 @@ public function invoke(?array $args): bool
   {
     $this->model->server_edit = false;
 
-    if (!($this->model->active_user && $this->model->active_user->getOption(\BNETDocs\Libraries\User::OPTION_ACL_SERVER_CREATE)))
+    if (!($this->model->active_user && $this->model->active_user->getOption(\BNETDocs\Libraries\User\User::OPTION_ACL_SERVER_CREATE)))
     {
       $this->model->_responseCode = HttpCode::HTTP_FORBIDDEN;
       $this->model->error = FormModel::ERROR_ACCESS_DENIED;

diff --git a/src/Controllers/Server/Delete.php b/src/Controllers/Server/Delete.php
@@ -20,7 +20,7 @@ public function __construct()
 
   public function invoke(?array $args): bool
   {
-    if (!($this->model->active_user && $this->model->active_user->getOption(\BNETDocs\Libraries\User::OPTION_ACL_SERVER_DELETE)))
+    if (!($this->model->active_user && $this->model->active_user->getOption(\BNETDocs\Libraries\User\User::OPTION_ACL_SERVER_DELETE)))
     {
       $this->model->_responseCode = HttpCode::HTTP_FORBIDDEN;
       $this->model->error = DeleteModel::ERROR_ACCESS_DENIED;

diff --git a/src/Controllers/Server/Edit.php b/src/Controllers/Server/Edit.php
@@ -23,7 +23,7 @@ public function invoke(?array $args): bool
   {
     $this->model->server_edit = true;
 
-    if (!($this->model->active_user && $this->model->active_user->getOption(\BNETDocs\Libraries\User::OPTION_ACL_SERVER_MODIFY)))
+    if (!($this->model->active_user && $this->model->active_user->getOption(\BNETDocs\Libraries\User\User::OPTION_ACL_SERVER_MODIFY)))
     {
       $this->model->_responseCode = HttpCode::HTTP_FORBIDDEN;
       $this->model->error = FormModel::ERROR_ACCESS_DENIED;

diff --git a/src/Controllers/User/CreatePassword.php b/src/Controllers/User/CreatePassword.php
@@ -14,7 +14,7 @@ public function invoke(?array $args): bool
     $q = \BNETDocs\Libraries\Core\Router::query();
     $this->model->_responseCode = \BNETDocs\Libraries\Core\HttpCode::HTTP_OK;
     $this->model->input = $q['input'] ?? null;
-    $this->model->output = empty($this->model->input) ? null : \BNETDocs\Libraries\User::createPassword($this->model->input);
+    $this->model->output = empty($this->model->input) ? null : \BNETDocs\Libraries\User\User::createPassword($this->model->input);
     return true;
   }
 }
diff --git a/src/Controllers/User/Index.php b/src/Controllers/User/Index.php
@@ -1,7 +1,8 @@
 <?php
+
 namespace BNETDocs\Controllers\User;
 
-use \BNETDocs\Libraries\User;
+use \BNETDocs\Libraries\User\User;
 
 class Index extends \BNETDocs\Controllers\Base
 {

diff --git a/src/Controllers/User/Login.php b/src/Controllers/User/Login.php
@@ -5,7 +5,7 @@
 use \BNETDocs\Libraries\Core\HttpCode;
 use \BNETDocs\Libraries\Core\Router;
 use \BNETDocs\Libraries\EventLog\Logger;
-use \BNETDocs\Libraries\User;
+use \BNETDocs\Libraries\User\User;
 use \BNETDocs\Models\User\Login as LoginModel;
 use \CarlBennett\MVC\Libraries\Common;
 

diff --git a/src/Controllers/User/Register.php b/src/Controllers/User/Register.php
@@ -8,7 +8,7 @@
 use \BNETDocs\Libraries\Core\Template;
 use \BNETDocs\Libraries\EventLog\EventTypes;
 use \BNETDocs\Libraries\EventLog\Logger;
-use \BNETDocs\Libraries\User;
+use \BNETDocs\Libraries\User\User;
 use \CarlBennett\MVC\Libraries\Common;
 use \PHPMailer\PHPMailer\PHPMailer;
 

diff --git a/src/Controllers/User/ResetPassword.php b/src/Controllers/User/ResetPassword.php
@@ -5,7 +5,7 @@
 use \BNETDocs\Libraries\Core\Template;
 use \BNETDocs\Libraries\EventLog\EventTypes;
 use \BNETDocs\Libraries\EventLog\Logger;
-use \BNETDocs\Libraries\User;
+use \BNETDocs\Libraries\User\User;
 use \BNETDocs\Models\User\ResetPassword as ResetPasswordModel;
 use \CarlBennett\MVC\Libraries\Common;
 use \PHPMailer\PHPMailer\PHPMailer;

diff --git a/src/Controllers/User/Update.php b/src/Controllers/User/Update.php
@@ -4,7 +4,7 @@
 
 use \BNETDocs\Libraries\Core\Router;
 use \BNETDocs\Libraries\EventLog\Logger;
-use \BNETDocs\Libraries\User;
+use \BNETDocs\Libraries\User\User;
 use \CarlBennett\MVC\Libraries\Common;
 use \Throwable;
 use \UnexpectedValueException;

diff --git a/src/Controllers/User/Verify.php b/src/Controllers/User/Verify.php
@@ -29,7 +29,7 @@ public function invoke(?array $args): bool
 
     if (is_numeric($this->model->user_id))
     {
-      try { $this->model->user = new \BNETDocs\Libraries\User((int) $this->model->user_id); }
+      try { $this->model->user = new \BNETDocs\Libraries\User\User((int) $this->model->user_id); }
       catch (\UnexpectedValueException) { $this->model->user = null; }
     }
 

diff --git a/src/Controllers/User/View.php b/src/Controllers/User/View.php
@@ -8,7 +8,7 @@
 use \BNETDocs\Libraries\Document;
 use \BNETDocs\Libraries\Packet\Packet;
 use \BNETDocs\Libraries\Server\Server;
-use \BNETDocs\Libraries\User;
+use \BNETDocs\Libraries\User\User;
 
 class View extends \BNETDocs\Controllers\Base
 {

diff --git a/src/Exceptions/UserNotFoundException.php b/src/Exceptions/UserNotFoundException.php
@@ -4,7 +4,7 @@
 
 class UserNotFoundException extends DatabaseObjectNotFoundException
 {
-  public function __construct(\BNETDocs\Libraries\User|int $value, \Throwable $previous = null)
+  public function __construct(\BNETDocs\Libraries\User\User|int $value, \Throwable $previous = null)
   {
     $v = is_int($value) ? $value : $value->getId();
     parent::__construct(\sprintf('User not found: %d', $v), 0, $previous);

diff --git a/src/Libraries/Comment.php b/src/Libraries/Comment.php
@@ -5,7 +5,7 @@
 use \BNETDocs\Libraries\Core\DateTimeImmutable;
 use \BNETDocs\Libraries\Db\MariaDb;
 use \BNETDocs\Libraries\EventLog\EventTypes;
-use \BNETDocs\Libraries\User;
+use \BNETDocs\Libraries\User\User;
 use \CarlBennett\MVC\Libraries\Common;
 use \DateTimeInterface;
 use \DateTimeZone;

diff --git a/src/Libraries/Document.php b/src/Libraries/Document.php
@@ -4,7 +4,7 @@
 
 use \BNETDocs\Libraries\Core\DateTimeImmutable;
 use \BNETDocs\Libraries\Db\MariaDb;
-use \BNETDocs\Libraries\User;
+use \BNETDocs\Libraries\User\User;
 use \CarlBennett\MVC\Libraries\Common;
 use \DateTimeInterface;
 use \DateTimeZone;

diff --git a/src/Libraries/EventLog/Event.php b/src/Libraries/EventLog/Event.php
@@ -5,7 +5,7 @@
 use \BNETDocs\Libraries\Core\DateTimeImmutable;
 use \BNETDocs\Libraries\Db\MariaDb;
 use \BNETDocs\Libraries\EventLog\EventTypes;
-use \BNETDocs\Libraries\User;
+use \BNETDocs\Libraries\User\User;
 use \DateTimeInterface;
 use \DateTimeZone;
 use \LengthException;

diff --git a/src/Libraries/EventLog/Logger.php b/src/Libraries/EventLog/Logger.php
@@ -5,7 +5,7 @@
 use \BNETDocs\Libraries\Discord\Embed as DiscordEmbed;
 use \BNETDocs\Libraries\Discord\Webhook as DiscordWebhook;
 use \BNETDocs\Libraries\EventLog\Event;
-use \BNETDocs\Libraries\User;
+use \BNETDocs\Libraries\User\User;
 use \CarlBennett\MVC\Libraries\Common;
 
 class Logger

diff --git a/src/Libraries/News/Post.php b/src/Libraries/News/Post.php
@@ -5,7 +5,7 @@
 use \BNETDocs\Libraries\Core\DateTimeImmutable;
 use \BNETDocs\Libraries\Db\MariaDb;
 use \BNETDocs\Libraries\News\Category as NewsCategory;
-use \BNETDocs\Libraries\User;
+use \BNETDocs\Libraries\User\User;
 use \CarlBennett\MVC\Libraries\Common;
 use \DateTimeInterface;
 use \DateTimeZone;

diff --git a/src/Libraries/Packet/Packet.php b/src/Libraries/Packet/Packet.php
@@ -7,7 +7,7 @@
 use \BNETDocs\Libraries\Packet\Application as ApplicationLayer;
 use \BNETDocs\Libraries\Packet\Transport as TransportLayer;
 use \BNETDocs\Libraries\Product;
-use \BNETDocs\Libraries\User;
+use \BNETDocs\Libraries\User\User;
 use \CarlBennett\MVC\Libraries\Common;
 use \DateTimeInterface;
 use \DateTimeZone;

diff --git a/src/Libraries/Server/Server.php b/src/Libraries/Server/Server.php
@@ -5,7 +5,7 @@
 use \BNETDocs\Libraries\Core\DateTimeImmutable;
 use \BNETDocs\Libraries\Db\MariaDb;
 use \BNETDocs\Libraries\Server\Type as ServerType;
-use \BNETDocs\Libraries\User;
+use \BNETDocs\Libraries\User\User;
 use \CarlBennett\MVC\Libraries\Common;
 use \DateTimeInterface;
 use \DateTimeZone;

diff --git a/src/Libraries/User/Authentication.php b/src/Libraries/User/Authentication.php
@@ -5,7 +5,7 @@
 use \BNETDocs\Interfaces\DatabaseObject;
 use \BNETDocs\Libraries\Core\DateTimeImmutable;
 use \BNETDocs\Libraries\Db\MariaDb;
-use \BNETDocs\Libraries\User;
+use \BNETDocs\Libraries\User\User;
 use \CarlBennett\MVC\Libraries\Common;
 use \DateTimeZone;
 use \InvalidArgumentException;

diff --git a/src/Libraries/User/Profile.php b/src/Libraries/User/Profile.php
@@ -3,7 +3,7 @@
 namespace BNETDocs\Libraries\User;
 
 use \BNETDocs\Libraries\Db\MariaDb;
-use \BNETDocs\Libraries\User;
+use \BNETDocs\Libraries\User\User;
 use \StdClass;
 use \UnexpectedValueException;
 

diff --git a/src/Libraries/User.php → src/Libraries/User/User.php b/src/Libraries/User.php → src/Libraries/User/User.php
@@ -1,6 +1,6 @@
 <?php /* vim: set colorcolumn= expandtab shiftwidth=2 softtabstop=2 tabstop=4 smarttab: */
 
-namespace BNETDocs\Libraries;
+namespace BNETDocs\Libraries\User;
 
 use \BNETDocs\Libraries\Core\DateTimeImmutable;
 use \BNETDocs\Libraries\Db\MariaDb;

diff --git a/src/Models/ActiveUser.php b/src/Models/ActiveUser.php
@@ -9,7 +9,7 @@ class ActiveUser extends Errorable implements \JsonSerializable
    *
    * @var \BNETDocs\Libraries\User|null
    */
-  public ?\BNETDocs\Libraries\User $active_user = null;
+  public ?\BNETDocs\Libraries\User\User $active_user = null;
 
   /**
    * When constructed, sets the $active_user to that of the Authentication::$user value.

diff --git a/src/Models/Email/Base.php b/src/Models/Email/Base.php
@@ -4,6 +4,6 @@
 
 abstract class Base implements \BNETDocs\Interfaces\Model
 {
-  public ?\BNETDocs\Libraries\User $active_user;
-  public $mail;
+    public ?\BNETDocs\Libraries\User\User $active_user;
+    public $mail;
 }
diff --git a/src/Models/News/Delete.php b/src/Models/News/Delete.php
@@ -4,9 +4,9 @@
 
 class Delete extends \BNETDocs\Models\ActiveUser
 {
-  public bool $acl_allowed = false;
-  public ?int $id = null;
-  public ?\BNETDocs\Libraries\News\Post $news_post = null;
-  public string $title = '';
-  public ?\BNETDocs\Libraries\User $user = null;
+    public bool $acl_allowed = false;
+    public ?int $id = null;
+    public ?\BNETDocs\Libraries\News\Post $news_post = null;
+    public string $title = '';
+    public ?\BNETDocs\Libraries\User\User $user = null;
 }