Move NewsPost class to News\Post

Author: carlbennett

src/Controllers/News.php

@@ -33,7 +33,7 @@ public function invoke(?array $args): bool
     $q = \BNETDocs\Libraries\Core\Router::query();
     $page = (isset($q['page']) ? ((int) $q['page']) - 1 : null);
     $rss = \array_shift($args);
-    $this->model->news_posts = \BNETDocs\Libraries\NewsPost::getAllNews(true);
+    $this->model->news_posts = \BNETDocs\Libraries\News\Post::getAllNews(true);
 
     // Remove news posts that are not published or are RSS exempt
     if ($this->model->news_posts)

src/Controllers/News/Create.php

@@ -6,7 +6,6 @@
 use \BNETDocs\Libraries\Core\Router;
 use \BNETDocs\Libraries\EventLog\Logger;
 use \BNETDocs\Libraries\NewsCategory;
-use \BNETDocs\Libraries\NewsPost;
 use \BNETDocs\Models\News\Create as CreateModel;
 
 class Create extends \BNETDocs\Controllers\Base
@@ -78,7 +77,7 @@ protected function handlePost(): void
     }
     else
     {
-      $this->model->news_post = new NewsPost(null);
+      $this->model->news_post = new \BNETDocs\Libraries\News\Post(null);
 
       $this->model->news_post->setCategoryId($this->model->category_id);
       $this->model->news_post->setContent($this->model->content);

src/Controllers/News/Delete.php

@@ -5,7 +5,6 @@
 use \BNETDocs\Libraries\Core\HttpCode;
 use \BNETDocs\Libraries\Core\Router;
 use \BNETDocs\Libraries\EventLog\Logger;
-use \BNETDocs\Libraries\NewsPost;
 
 class Delete extends \BNETDocs\Controllers\Base
 {
@@ -29,7 +28,7 @@ public function invoke(?array $args): bool
     $q = Router::query();
     $this->model->id = isset($q['id']) ? (int) $q['id'] : null;
 
-    try { if (!is_null($this->model->id)) $this->model->news_post = new NewsPost($this->model->id); }
+    try { if (!is_null($this->model->id)) $this->model->news_post = new \BNETDocs\Libraries\News\Post($this->model->id); }
     catch (\UnexpectedValueException) { $this->model->news_post = null; }
 
     if (!$this->model->news_post)

src/Controllers/News/Edit.php

@@ -29,7 +29,7 @@ public function invoke(?array $args): bool
     $q = Router::query();
     $this->model->news_post_id = $q['id'] ?? null;
 
-    try { $this->model->news_post = new \BNETDocs\Libraries\NewsPost($this->model->news_post_id); }
+    try { $this->model->news_post = new \BNETDocs\Libraries\News\Post($this->model->news_post_id); }
     catch (\UnexpectedValueException) { $this->model->news_post = null; }
 
     if (!$this->model->news_post)

src/Controllers/News/View.php

@@ -4,7 +4,7 @@
 
 use \BNETDocs\Libraries\Comment;
 use \BNETDocs\Libraries\Core\HttpCode;
-use \BNETDocs\Libraries\NewsPost;
+use \BNETDocs\Libraries\News\Post as NewsPost;
 use \BNETDocs\Libraries\User;
 
 class View extends \BNETDocs\Controllers\Base

src/Controllers/User/View.php

@@ -6,7 +6,6 @@
 use \BNETDocs\Libraries\Core\HttpCode;
 use \BNETDocs\Libraries\Credits;
 use \BNETDocs\Libraries\Document;
-use \BNETDocs\Libraries\NewsPost;
 use \BNETDocs\Libraries\Packet\Packet;
 use \BNETDocs\Libraries\Server;
 use \BNETDocs\Libraries\User;
@@ -63,7 +62,7 @@ public function invoke(?array $args) : bool
       Document::getDocumentsByUserId($this->model->user_id) : null
     );
     $this->model->news_posts = ($this->model->sum_news_posts ?
-      NewsPost::getNewsPostsByUserId($this->model->user_id): null
+      \BNETDocs\Libraries\News\Post::getNewsPostsByUserId($this->model->user_id): null
     );
     $this->model->packets = ($this->model->sum_packets ?
       Packet::getPacketsByUserId($this->model->user_id) : null

src/Exceptions/NewsPostNotFoundException.php

@@ -4,7 +4,7 @@
 
 class NewsPostNotFoundException extends DatabaseObjectNotFoundException
 {
-  public function __construct(\BNETDocs\Libraries\NewsPost|int $value, \Throwable $previous = null)
+  public function __construct(\BNETDocs\Libraries\News\Post|int $value, \Throwable $previous = null)
   {
     $v = is_int($value) ? $value : $value->getId();
     parent::__construct(\sprintf('News Post not found: %d', $v), 0, $previous);

src/Libraries/NewsPost.php renamed to src/Libraries/News/Post.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BNETDocs\Libraries;
+namespace BNETDocs\Libraries\News;
 
 use \BNETDocs\Libraries\Core\DateTimeImmutable;
 use \BNETDocs\Libraries\Db\MariaDb;
@@ -13,7 +13,7 @@
 use \Parsedown;
 use \StdClass;
 
-class NewsPost implements \BNETDocs\Interfaces\DatabaseObject, \JsonSerializable
+class Post implements \BNETDocs\Interfaces\DatabaseObject, \JsonSerializable
 {
   public const MAX_CATEGORY_ID = 0xFFFFFFFFFFFFFFFF;
   public const MAX_CONTENT = 0xFFFFFF;

src/Models/News/Create.php

@@ -14,7 +14,7 @@ class Create extends \BNETDocs\Models\ActiveUser implements \JsonSerializable
   public string $content = '';
   public mixed $error = 'INTERNAL_ERROR';
   public bool $markdown = false;
-  public ?\BNETDocs\Libraries\NewsPost $news_post = null;
+  public ?\BNETDocs\Libraries\News\Post $news_post = null;
   public ?array $news_categories = null;
   public bool $rss_exempt = false;
   public string $title = '';

src/Models/News/Delete.php

@@ -6,7 +6,7 @@ class Delete extends \BNETDocs\Models\ActiveUser
 {
   public bool $acl_allowed = false;
   public ?int $id = null;
-  public ?\BNETDocs\Libraries\NewsPost $news_post = null;
+  public ?\BNETDocs\Libraries\News\Post $news_post = null;
   public string $title = '';
   public ?\BNETDocs\Libraries\User $user = null;
 }