Union types

app/Models/Forum/Delete.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 namespace ForkBB\Models\Forum;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\DataModel;
 use ForkBB\Models\Forum\Forum;
 use ForkBB\Models\User\User;
 use InvalidArgumentException;
@@ -22,7 +21,7 @@ class Delete extends Action
     /**
      * Удаляет раздел(ы)
      */
-    public function delete(DataModel ...$args): void
+    public function delete(Forum|User ...$args): void
     {
         if (empty($args)) {
             throw new InvalidArgumentException('No arguments, expected User(s) or Forum(s)');
@@ -54,8 +53,6 @@ class Delete extends Action
                 foreach (\array_keys($arg->descendants) as $id) { //???? а если не админ?
                     $all[$id] = true;
                 }
-            } else {
-                throw new InvalidArgumentException('Expected User(s) or Forum(s)');
             }
         }
 

app/Models/PM/Delete.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 namespace ForkBB\Models\PM;
 
 use ForkBB\Models\Method;
-use ForkBB\Models\DataModel;
 use ForkBB\Models\PM\Cnst;
 use ForkBB\Models\PM\PPost;
 use ForkBB\Models\PM\PTopic;
@@ -41,7 +40,7 @@ class Delete extends Method
         }
     }
 
-    public function delete(DataModel ...$args): void
+    public function delete(PPost|PTopic|User ...$args): void
     {
         if (empty($args)) {
             throw new InvalidArgumentException('No arguments, expected User(s), PPost(s) or PTopic(s)');
@@ -77,8 +76,6 @@ class Delete extends Method
 
                 $topics[$arg->id] = $arg;
                 $isTopic          = 1;
-            } else {
-                throw new InvalidArgumentException('Expected User(s), PPost(s) or PTopic(s)');
             }
         }
 

app/Models/PM/Save.php

@@ -11,17 +11,15 @@ declare(strict_types=1);
 namespace ForkBB\Models\PM;
 
 use ForkBB\Models\Method;
-use ForkBB\Models\DataModel;
 use ForkBB\Models\PM\Cnst;
 use ForkBB\Models\PM\PPost;
 use ForkBB\Models\PM\PTopic;
 use ForkBB\Models\PM\PRnd;
-use InvalidArgumentException;
 use RuntimeException;
 
 class Save extends Method
 {
-    public function update(DataModel $model): DataModel
+    public function update(PPost|PTopic $model): PPost|PTopic
     {
         if ($model->id < 1) {
             throw new RuntimeException('The model does not have ID');
@@ -31,8 +29,6 @@ class Save extends Method
             $table  = 'pm_posts';
         } elseif ($model instanceof PTopic) {
             $table  = 'pm_topics';
-        } else {
-            throw new InvalidArgumentException('Bad model');
         }
 
         $modified = $model->getModified();
@@ -69,7 +65,7 @@ class Save extends Method
         return $model;
     }
 
-    public function insert(DataModel $model): int
+    public function insert(PPost|PTopic $model): int
     {
         if (null !== $model->id) {
             throw new RuntimeException('The model has ID');
@@ -79,8 +75,6 @@ class Save extends Method
             $table  = 'pm_posts';
         } elseif ($model instanceof PTopic) {
             $table  = 'pm_topics';
-        } else {
-            throw new InvalidArgumentException('Bad model');
         }
 
         $attrs  = $model->getModelAttrs();

app/Models/Poll/Delete.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 namespace ForkBB\Models\Poll;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\DataModel;
 use ForkBB\Models\Forum\Forum;
 use ForkBB\Models\Poll\Poll;
 use ForkBB\Models\Topic\Topic;
@@ -23,7 +22,7 @@ class Delete extends Action
     /**
      * Удаление индекса
      */
-    public function delete(DataModel ...$args): void
+    public function delete(Poll|Topic ...$args): void
     {
         if (empty($args)) {
             throw new InvalidArgumentException('No arguments, expected Poll(s) or Topic(s)');
@@ -46,8 +45,6 @@ class Delete extends Action
 
                 $tids[$arg->id] = $arg->id;
                 $isTopic        = 1;
-            } else {
-                throw new InvalidArgumentException('Expected Poll(s) or Topic(s)');
             }
         }
 

app/Models/Post/Delete.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 namespace ForkBB\Models\Post;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\DataModel;
 use ForkBB\Models\Forum\Forum;
 use ForkBB\Models\Post\Post;
 use ForkBB\Models\Topic\Topic;
@@ -25,7 +24,7 @@ class Delete extends Action
     /**
      * Удаляет сообщение(я)
      */
-    public function delete(DataModel ...$args): void
+    public function delete(Forum|Post|Topic|User ...$args): void
     {
         if (empty($args)) {
             throw new InvalidArgumentException('No arguments, expected User(s), Forum(s), Topic(s) or Post(s)');
@@ -85,8 +84,6 @@ class Delete extends Action
                 if ($arg->poster_id > 0) {
                     $uidsUpdate[$arg->poster_id] = $arg->poster_id;
                 }
-            } else {
-                throw new InvalidArgumentException('Expected User(s), Forum(s), Topic(s) or Post(s)');
             }
         }
 

app/Models/Post/Feed.php

@@ -11,19 +11,15 @@ declare(strict_types=1);
 namespace ForkBB\Models\Post;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\DataModel;
 use ForkBB\Models\Topic\Topic;
 use ForkBB\Models\Forum\Forum;
 
-use InvalidArgumentException;
-use RuntimeException;
-
 class Feed extends Action
 {
     /**
      * Загружает данные для feed
      */
-    public function Feed(DataModel $model): array
+    public function Feed(Forum|Topic $model): array
     {
         if ($model instanceof Topic) {
             if (0 !== $model->moved_to) {
@@ -61,9 +57,6 @@ class Feed extends Action
                 WHERE t.forum_id IN (?ai:forums)
                 ORDER BY p.id DESC
                 LIMIT 50';
-
-        } else {
-            throw new InvalidArgumentException('Expected Topic or Forum');
         }
 
         return $this->c->DB->query($query, $vars)->fetchAll();

app/Models/Post/View.php

@@ -11,12 +11,10 @@ declare(strict_types=1);
 namespace ForkBB\Models\Post;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\Model;
 use ForkBB\Models\Post\Post;
 use ForkBB\Models\Search\Search;
 use ForkBB\Models\Topic\Topic;
 use PDO;
-use InvalidArgumentException;
 use RuntimeException;
 
 class View extends Action
@@ -24,15 +22,8 @@ class View extends Action
     /**
      * Возвращает список сообщений
      */
-    public function view(Model $arg, bool $review = false): array
+    public function view(Search|Topic $arg, bool $review = false): array
     {
-        if (
-            ! $arg instanceof Topic
-            && ! $arg instanceof Search
-        ) {
-            throw new InvalidArgumentException('Expected Topic or Search');
-        }
-
         if (
             empty($arg->idsList)
             || ! \is_array($arg->idsList)

app/Models/Search/Delete.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 namespace ForkBB\Models\Search;
 
 use ForkBB\Models\Method;
-use ForkBB\Models\DataModel;
 use ForkBB\Models\Forum\Forum;
 use ForkBB\Models\Post\Post;
 use ForkBB\Models\Topic\Topic;
@@ -24,7 +23,7 @@ class Delete extends Method
     /**
      * Удаление индекса
      */
-    public function delete(DataModel ...$args): void
+    public function delete(Forum|Post|Topic|User ...$args): void
     {
         if (empty($args)) {
             throw new InvalidArgumentException('No arguments, expected User(s), Forum(s), Topic(s) or Post(s)');
@@ -74,8 +73,6 @@ class Delete extends Method
 
                 $pids[$arg->id] = $arg->id;
                 $isPost         = 1;
-            } else {
-                throw new InvalidArgumentException('Expected User(s), Forum(s), Topic(s) or Post(s)');
             }
         }
 

app/Models/Topic/Delete.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 namespace ForkBB\Models\Topic;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\DataModel;
 use ForkBB\Models\Forum\Forum;
 use ForkBB\Models\Topic\Topic;
 use ForkBB\Models\User\User;
@@ -24,7 +23,7 @@ class Delete extends Action
     /**
      * Удаляет тему(ы)
      */
-    public function delete(DataModel ...$args): void
+    public function delete(Forum|Topic|User ...$args): void
     {
         if (empty($args)) {
             throw new InvalidArgumentException('No arguments, expected User(s), Forum(s) or Topic(s)');
@@ -69,8 +68,6 @@ class Delete extends Action
                 $topics[$arg->id]          = $arg;
                 $parents[$arg->parent->id] = $arg->parent;
                 $isTopic                   = 1;
-            } else {
-                throw new InvalidArgumentException('Expected User(s), Forum(s) or Topic(s)');
             }
         }
 

app/Models/Topic/View.php

@@ -11,12 +11,10 @@ declare(strict_types=1);
 namespace ForkBB\Models\Topic;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\Model;
 use ForkBB\Models\Forum\Forum;
 use ForkBB\Models\Search\Search;
 use ForkBB\Models\Topic\Topic;
 use PDO;
-use InvalidArgumentException;
 use RuntimeException;
 
 class View extends Action
@@ -24,14 +22,12 @@ class View extends Action
     /**
      * Возвращает список тем
      */
-    public function view(Model $arg): array
+    public function view(Forum|Search $arg): array
     {
         if ($arg instanceof Forum) {
             $full = false;
         } elseif ($arg instanceof Search) {
             $full = true;
-        } else {
-            throw new InvalidArgumentException('Expected Forum or Search');
         }
 
         if (