Add declaration of argument types and return values 2

app/Models/BanList/Delete.php

@@ -3,7 +3,7 @@
 namespace ForkBB\Models\BanList;
 
 use ForkBB\Models\Method;
-use ForkBB\Models\BanList\Model;
+use ForkBB\Models\BanList\Model as BanList;
 
 class Delete extends Method
 {
@@ -15,7 +15,7 @@ class Delete extends Method
      *
      * @return BanList\Model
      */
-    public function delete(array $ids): Model
+    public function delete(array $ids): BanList
     {
         if (! empty($ids)) {
             $vars = [

app/Models/BanList/Insert.php

@@ -3,8 +3,8 @@
 namespace ForkBB\Models\BanList;
 
 use ForkBB\Models\Method;
+use ForkBB\Models\BanList\Model as BanList;
 use InvalidArgumentException;
-use ForkBB\Models\BanList\Model;
 
 class Insert extends Method
 {
@@ -15,7 +15,7 @@ class Insert extends Method
      *
      * @return BanList\Model
      */
-    public function insert(array $ban): Model
+    public function insert(array $ban): BanList
     {
         if (isset($ban['id'])
             || ! isset($ban['username'])

app/Models/BanList/Load.php

@@ -3,7 +3,7 @@
 namespace ForkBB\Models\BanList;
 
 use ForkBB\Models\Method;
-use ForkBB\Models\BanList\Model;
+use ForkBB\Models\BanList\Model as BanList;
 
 class Load extends Method
 {
@@ -13,7 +13,7 @@ class Load extends Method
      *
      * @return BanList\Model
      */
-    public function load(): Model
+    public function load(): BanList
     {
         $userList  = [];
         $emailList = [];

app/Models/BanList/Update.php

@@ -3,8 +3,8 @@
 namespace ForkBB\Models\BanList;
 
 use ForkBB\Models\Method;
+use ForkBB\Models\BanList\Model as BanList;
 use InvalidArgumentException;
-use ForkBB\Models\BanList\Model;
 
 class Update extends Method
 {
@@ -15,7 +15,7 @@ class Update extends Method
      *
      * @return BanList\Model
      */
-    public function update(array $ban): Model
+    public function update(array $ban): BanList
     {
         if (empty($ban['id'])
             || ! isset($ban['username'])

app/Models/Categories/Manager.php

@@ -3,10 +3,9 @@
 namespace ForkBB\Models\Categories;
 
 use ForkBB\Models\ManagerModel;
-//use ForkBB\Models\Categories\Model as Categories;
+use PDO;
 use InvalidArgumentException;
 use RuntimeException;
-use PDO;
 
 class Manager extends ManagerModel
 {

app/Models/Censorship/Refresh.php

@@ -3,7 +3,7 @@
 namespace ForkBB\Models\Censorship;
 
 use ForkBB\Models\Method;
-use ForkBB\Models\Censorship\Model;
+use ForkBB\Models\Censorship\Model as Censorship;
 
 class Refresh extends Method
 {
@@ -13,7 +13,7 @@ class Refresh extends Method
      *
      * @return Censorship
      */
-    public function refresh(): Model
+    public function refresh(): Censorship
     {
         $stmt = $this->c->DB->query('SELECT ce.id, ce.search_for, ce.replace_with FROM ::censoring AS ce');
         $search  = [];

app/Models/Censorship/Save.php

@@ -3,8 +3,8 @@
 namespace ForkBB\Models\Censorship;
 
 use ForkBB\Models\Method;
+use ForkBB\Models\Censorship\Model as Censorship;
 use PDO;
-use ForkBB\Models\Censorship\Model;
 
 class Save extends Method
 {
@@ -15,7 +15,7 @@ class Save extends Method
      *
      * @return Censorship
      */
-    public function save(array $list): Model
+    public function save(array $list): Censorship
     {
         $words  = $this->model->load();
         $forDel = [];

app/Models/Config/Install.php

@@ -3,7 +3,7 @@
 namespace ForkBB\Models\Config;
 
 use ForkBB\Models\Method;
-use ForkBB\Models\Config\Model;
+use ForkBB\Models\Config\Model as Config;
 
 class Install extends Method
 {
@@ -12,7 +12,7 @@ class Install extends Method
      *
      * @return Config
      */
-    public function install(): Model
+    public function install(): Config
     {
         $this->model->setAttrs($this->c->forConfig);
         return $this->model;

app/Models/Config/Load.php

@@ -3,8 +3,8 @@
 namespace ForkBB\Models\Config;
 
 use ForkBB\Models\Method;
+use ForkBB\Models\Config\Model as Config;
 use PDO;
-use ForkBB\Models\Config\Model;
 
 class Load extends Method
 {
@@ -14,7 +14,7 @@ class Load extends Method
      *
      * @return Config
      */
-    public function load(): Model
+    public function load(): Config
     {
         $config = $this->c->DB->query('SELECT cf.conf_name, cf.conf_value FROM ::config AS cf')->fetchAll(PDO::FETCH_KEY_PAIR);
         $this->model->setAttrs($config);

app/Models/Config/Save.php

@@ -3,7 +3,7 @@
 namespace ForkBB\Models\Config;
 
 use ForkBB\Models\Method;
-use ForkBB\Models\Config\Model;
+use ForkBB\Models\Config\Model as Config;
 
 class Save extends Method
 {
@@ -13,7 +13,7 @@ class Save extends Method
      *
      * @return Config
      */
-    public function save(): Model
+    public function save(): Config
     {
         $modified = $this->model->getModified();
         if (empty($modified)) {

app/Models/Forum/CalcStat.php

@@ -4,7 +4,7 @@ namespace ForkBB\Models\Forum;
 
 use ForkBB\Models\Method;
 use RuntimeException;
-use ForkBB\Models\Forum\Model;
+use ForkBB\Models\Forum\Model as Forum;
 
 class CalcStat extends Method
 {
@@ -15,7 +15,7 @@ class CalcStat extends Method
      *
      * @return Forum
      */
-    public function calcStat(): Model
+    public function calcStat(): Forum
     {
         if ($this->model->id < 1) {
             throw new RuntimeException('The model does not have ID');

app/Models/Forum/Delete.php

@@ -3,6 +3,7 @@
 namespace ForkBB\Models\Forum;
 
 use ForkBB\Models\Action;
+use ForkBB\Models\DataModel;
 use ForkBB\Models\Forum\Model as Forum;
 use ForkBB\Models\User\Model as User;
 use InvalidArgumentException;
@@ -13,12 +14,12 @@ class Delete extends Action
     /**
      * Удаляет раздел(ы)
      *
-     * @param mixed ...$args
+     * @param DataModel ...$args
      *
      * @throws InvalidArgumentException
      * @throws RuntimeException
      */
-    public function delete(...$args): void
+    public function delete(DataModel ...$args): void
     {
         if (empty($args)) {
             throw new InvalidArgumentException('No arguments, expected User(s) or Forum(s)');

app/Models/Forum/LoadTree.php

@@ -3,7 +3,7 @@
 namespace ForkBB\Models\Forum;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\Forum\Model;
+use ForkBB\Models\Forum\Model as Forum;
 
 class LoadTree extends Action
 {
@@ -14,7 +14,7 @@ class LoadTree extends Action
      *
      * @return null|Forum
      */
-    public function loadTree(int $rootId): ?Model
+    public function loadTree(int $rootId): ?Forum
     {
         $root = $this->manager->get($rootId);
         if (null === $root) {

app/Models/Forum/Model.php

@@ -5,9 +5,9 @@ namespace ForkBB\Models\Forum;
 use ForkBB\Models\DataModel;
 use ForkBB\Models\User\Model as User;
 use ForkBB\Models\Forum\Model as Forum;
+use PDO;
 use RuntimeException;
 use InvalidArgumentException;
-use PDO;
 
 class Model extends DataModel
 {
@@ -185,11 +185,11 @@ class Model extends DataModel
     /**
      * Добавляет указанных пользователей в список модераторов
      *
-     * @param array ...$users
+     * @param User ...$users
      *
      * @throws InvalidArgumentException
      */
-    public function modAdd(...$users): void
+    public function modAdd(User ...$users): void
     {
         $attr = $this->getAttr('moderators');
         if (empty($attr) || ! \is_array($attr)) {
@@ -209,11 +209,11 @@ class Model extends DataModel
     /**
      * Удаляет указанных пользователей из списка модераторов
      *
-     * @param array ...$users
+     * @param User ...$users
      *
      * @throws InvalidArgumentException
      */
-    public function modDelete(...$users): void
+    public function modDelete(User ...$users): void
     {
         $attr = $this->getAttr('moderators');
         if (empty($attr) || ! \is_array($attr)) {

app/Models/Pages/Post.php

@@ -20,7 +20,7 @@ class Post extends Page
      *
      * @return Page
      */
-    public function newTopic(array $args, string $method): Post
+    public function newTopic(array $args, string $method): Page
     {
         $forum = $this->c->forums->get((int) $args['id']);
 
@@ -64,7 +64,7 @@ class Post extends Page
      *
      * @return Page
      */
-    public function newReply(array $args, string $method): Post
+    public function newReply(array $args, string $method): Page
     {
         $topic = $this->c->topics->load((int) $args['id']);
 
@@ -121,7 +121,7 @@ class Post extends Page
      *
      * @return Page
      */
-    protected function endPost(Model $model, Validator $v): Post
+    protected function endPost(Model $model, Validator $v): Page
     {
         $now       = \time();
         $username  = $this->user->isGuest ? $v->username : $this->user->username;

app/Models/Post/Delete.php

@@ -3,6 +3,7 @@
 namespace ForkBB\Models\Post;
 
 use ForkBB\Models\Action;
+use ForkBB\Models\DataModel;
 use ForkBB\Models\Forum\Model as Forum;
 use ForkBB\Models\Post\Model as Post;
 use ForkBB\Models\Topic\Model as Topic;
@@ -16,12 +17,12 @@ class Delete extends Action
     /**
      * Удаляет тему(ы)
      *
-     * @param mixed ...$args
+     * @param DataModel ...$args
      *
      * @throws InvalidArgumentException
      * @throws RuntimeException
      */
-    public function delete(...$args): void
+    public function delete(DataModel ...$args): void
     {
         if (empty($args)) {
             throw new InvalidArgumentException('No arguments, expected User(s), Forum(s), Topic(s) or Post(s)');
@@ -68,7 +69,7 @@ class Delete extends Action
                 }
                 $posts[$arg->id]         = $arg->id;
                 $parents[$arg->topic_id] = $arg->parent;
-                $users[$post->poster_id] = $post->poster_id;
+                $users[$arg->poster_id]  = $arg->poster_id;
                 $isPost                  = 1;
             } else {
                 throw new InvalidArgumentException('Expected User(s), Forum(s), Topic(s) or Post(s)');

app/Models/Search/Delete.php

@@ -3,6 +3,7 @@
 namespace ForkBB\Models\Search;
 
 use ForkBB\Models\Method;
+use ForkBB\Models\DataModel;
 use ForkBB\Models\Forum\Model as Forum;
 use ForkBB\Models\Post\Model as Post;
 use ForkBB\Models\Topic\Model as Topic;
@@ -16,12 +17,12 @@ class Delete extends Method
     /**
      * Удаление индекса
      *
-     * @param mixed ...$args
+     * @param DataModel ...$args
      *
      * @throws InvalidArgumentException
      * @throws RuntimeException
      */
-    public function delete(...$args): void
+    public function delete(DataModel ...$args): void
     {
         if (empty($args)) {
             throw new InvalidArgumentException('No arguments, expected User(s), Forum(s), Topic(s) or Post(s)');

app/Models/Topic/Delete.php

@@ -3,6 +3,7 @@
 namespace ForkBB\Models\Topic;
 
 use ForkBB\Models\Action;
+use ForkBB\Models\DataModel;
 use ForkBB\Models\Forum\Model as Forum;
 use ForkBB\Models\Topic\Model as Topic;
 use ForkBB\Models\User\Model as User;
@@ -15,12 +16,12 @@ class Delete extends Action
     /**
      * Удаляет тему(ы)
      *
-     * @param mixed ...$args
+     * @param DataModel ...$args
      *
      * @throws InvalidArgumentException
      * @throws RuntimeException
      */
-    public function delete(...$args): void
+    public function delete(DataModel ...$args): void
     {
         if (empty($args)) {
             throw new InvalidArgumentException('No arguments, expected User(s), Forum(s) or Topic(s)');

app/Models/User/ChangeGroup.php

@@ -14,12 +14,12 @@ class ChangeGroup extends Action
      * Обновляет группу указанных пользователей
      *
      * @param int $newGroupId
-     * @param array ...$users
+     * @param User ...$users
      *
      * @throws InvalidArgumentException
      * @throws RuntimeException
      */
-    public function changeGroup(int $newGroupId, ...$users): void
+    public function changeGroup(int $newGroupId, User ...$users): void
     {
         $newGroup = $this->c->groups->get($newGroupId);
         if (null === $newGroup || $newGroup->groupGuest) {

app/Models/User/Delete.php

@@ -14,12 +14,12 @@ class Delete extends Action
     /**
      * Удаляет пользователя(ей)
      *
-     * @param mixed ...$users
+     * @param User ...$users
      *
      * @throws InvalidArgumentException
      * @throws RuntimeException
      */
-    public function delete(...$users): void
+    public function delete(User ...$users): void
     {
         if (empty($users)) {
             throw new InvalidArgumentException('No arguments, expected User(s)');