Update Models\User

app/Models/User/ChangeGroup.php

@@ -11,8 +11,8 @@ declare(strict_types=1);
 namespace ForkBB\Models\User;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\Forum\Model as Forum;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\Forum\Forum;
+use ForkBB\Models\User\User;
 use InvalidArgumentException;
 use RuntimeException;
 

app/Models/User/Current.php

@@ -11,7 +11,7 @@ declare(strict_types=1);
 namespace ForkBB\Models\User;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use RuntimeException;
 
 class Current extends Action

app/Models/User/Delete.php

@@ -11,8 +11,8 @@ declare(strict_types=1);
 namespace ForkBB\Models\User;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\User\Model as User;
-use ForkBB\Models\Forum\Model as Forum;
+use ForkBB\Models\User\User;
+use ForkBB\Models\Forum\Forum;
 use InvalidArgumentException;
 use RuntimeException;
 

app/Models/User/IsUniqueName.php

@@ -11,7 +11,7 @@ declare(strict_types=1);
 namespace ForkBB\Models\User;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 
 class IsUniqueName extends Action
 {

app/Models/User/Load.php

@@ -11,7 +11,7 @@ declare(strict_types=1);
 namespace ForkBB\Models\User;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use InvalidArgumentException;
 use ForkBB\Core\Exceptions\ForkException;
 

app/Models/User/Promote.php

@@ -11,7 +11,7 @@ declare(strict_types=1);
 namespace ForkBB\Models\User;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\Group\Model as Group;
+use ForkBB\Models\Group\Group;
 use RuntimeException;
 
 class Promote extends Action

app/Models/User/Save.php

@@ -11,7 +11,7 @@ declare(strict_types=1);
 namespace ForkBB\Models\User;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use RuntimeException;
 
 class Save extends Action

app/Models/User/UpdateCountPosts.php

@@ -11,7 +11,7 @@ declare(strict_types=1);
 namespace ForkBB\Models\User;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use InvalidArgumentException;
 
 class UpdateCountPosts extends Action

app/Models/User/UpdateCountTopics.php

@@ -11,7 +11,7 @@ declare(strict_types=1);
 namespace ForkBB\Models\User;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use InvalidArgumentException;
 
 class UpdateCountTopics extends Action

app/Models/User/UpdateLastVisit.php

@@ -11,7 +11,7 @@ declare(strict_types=1);
 namespace ForkBB\Models\User;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use RuntimeException;
 
 class UpdateLastVisit extends Action

app/Models/User/UpdateLoginIpCache.php

@@ -11,7 +11,7 @@ declare(strict_types=1);
 namespace ForkBB\Models\User;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use InvalidArgumentException;
 use RuntimeException;
 

app/Models/User/Model.php → app/Models/User/User.php

@@ -12,14 +12,20 @@ namespace ForkBB\Models\User;
 
 use ForkBB\Core\Container;
 use ForkBB\Models\DataModel;
-use ForkBB\Models\Model as BaseModel;
-use ForkBB\Models\Forum\Model as Forum;
-use ForkBB\Models\Post\Model as Post;
+use ForkBB\Models\Model;
+use ForkBB\Models\Forum\Forum;
+use ForkBB\Models\Post\Post;
 use RuntimeException;
 use function \ForkBB\__;
 
-class Model extends DataModel
+class User extends DataModel
 {
+    /**
+     * Ключ модели для контейнера
+     * @var string
+     */
+    protected $cKey = 'User';
+
     public function __construct(Container $container)
     {
         parent::__construct($container);
@@ -83,7 +89,7 @@ class Model extends DataModel
     /**
      * Статус модератора для указанной модели
      */
-    public function isModerator(BaseModel $model): bool
+    public function isModerator(Model $model): bool
     {
         if (1 != $this->g_moderator) {
             return false;
@@ -91,7 +97,7 @@ class Model extends DataModel
 
         while (! $model instanceof Forum) {
             $model = $model->parent;
-            if (! $model instanceof BaseModel) {
+            if (! $model instanceof Model) {
                 throw new RuntimeException('Moderator\'s rights can not be found');
             }
         }

app/Models/User/Manager.php → app/Models/User/Users.php

@@ -10,11 +10,17 @@ declare(strict_types=1);
 
 namespace ForkBB\Models\User;
 
-use ForkBB\Models\ManagerModel;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\Manager;
+use ForkBB\Models\User\User;
 
-class Manager extends ManagerModel
+class Users extends Manager
 {
+    /**
+     * Ключ модели для контейнера
+     * @var string
+     */
+    protected $cKey = 'Users';
+
     /**
      * Создает новую модель пользователя
      */

app/Models/User/UsersNumber.php

@@ -11,7 +11,7 @@ declare(strict_types=1);
 namespace ForkBB\Models\User;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\Group\Model as Group;
+use ForkBB\Models\Group\Group;
 
 class UsersNumber extends Action
 {

app/config/install.php

@@ -105,12 +105,12 @@ return [
         ],
 
         'config'     => '@ConfigModel:install',
-        'users'      => \ForkBB\Models\User\Manager::class,
+        'users'      => \ForkBB\Models\User\Users::class,
 
         'VLemail'    => \ForkBB\Models\Validators\Email::class,
         'VLhtml'     => \ForkBB\Models\Validators\Html::class,
 
-        'UserManagerNormUsername' => \ForkBB\Models\User\NormUsername::class,
+        'Users/normUsername' => \ForkBB\Models\User\NormUsername::class,
     ],
     'multiple'  => [
         'PrimaryController' => \ForkBB\Controllers\Install::class,
@@ -123,6 +123,6 @@ return [
         'UserModel' => \ForkBB\Models\User\User::class,
 
         'ConfigModel'    => \ForkBB\Models\Config\Config::class,
-        'Config*install' => \ForkBB\Models\Config\Install::class,
+        'Config/install' => \ForkBB\Models\Config\Install::class,
     ],
 ];

app/config/main.dist.php

@@ -285,7 +285,22 @@ return [
         'Topics/updateUsername' => \ForkBB\Models\Topic\UpdateUsername::class,
         'Topics/view'           => \ForkBB\Models\Topic\View::class,
 
-        'UserManagerNormUsername' => \ForkBB\Models\User\NormUsername::class,
+        'Users/adminsIds'          => \ForkBB\Models\User\AdminsIds::class,
+        'Users/changeGroup'        => \ForkBB\Models\User\ChangeGroup::class,
+        'Users/current'            => \ForkBB\Models\User\Current::class,
+        'Users/delete'             => \ForkBB\Models\User\Delete::class,
+        'Users/filter'             => \ForkBB\Models\User\Filter::class,
+        'Users/isUniqueName'       => \ForkBB\Models\User\IsUniqueName::class,
+        'Users/load'               => \ForkBB\Models\User\Load::class,
+        'Users/normUsername'       => \ForkBB\Models\User\NormUsername::class,
+        'Users/promote'            => \ForkBB\Models\User\Promote::class,
+        'Users/save'               => \ForkBB\Models\User\Save::class,
+        'Users/stats'              => \ForkBB\Models\User\Stats::class,
+        'Users/updateCountPosts'   => \ForkBB\Models\User\UpdateCountPosts::class,
+        'Users/updateCountTopics'  => \ForkBB\Models\User\UpdateCountTopics::class,
+        'Users/updateLastVisit'    => \ForkBB\Models\User\UpdateLastVisit::class,
+        'Users/updateLoginIpCache' => \ForkBB\Models\User\UpdateLoginIpCache::class,
+        'Users/usersNumber'        => \ForkBB\Models\User\UsersNumber::class,
     ],
     'multiple'  => [
         'CtrlPrimary' => \ForkBB\Controllers\Primary::class,
@@ -368,22 +383,7 @@ return [
 
         'StopwordListModel'      => \ForkBB\Models\StopwordList\StopwordList::class,
 
-        'UserModel'                   => \ForkBB\Models\User\Model::class,
-        'UserManagerLoad'             => \ForkBB\Models\User\Load::class,
-        'UserManagerSave'             => \ForkBB\Models\User\Save::class,
-        'UserManagerCurrent'          => \ForkBB\Models\User\Current::class,
-        'UserManagerUpdateLastVisit'  => \ForkBB\Models\User\UpdateLastVisit::class,
-        'UserManagerUpdateCountPosts' => \ForkBB\Models\User\UpdateCountPosts::class,
-        'UserManagerUpdateCountTopics' => \ForkBB\Models\User\UpdateCountTopics::class,
-        'UserManagerUpdateLoginIpCache' => \ForkBB\Models\User\UpdateLoginIpCache::class,
-        'UserManagerIsUniqueName'     => \ForkBB\Models\User\IsUniqueName::class,
-        'UserManagerUsersNumber'      => \ForkBB\Models\User\UsersNumber::class,
-        'UserManagerPromote'          => \ForkBB\Models\User\Promote::class,
-        'UserManagerFilter'           => \ForkBB\Models\User\Filter::class,
-        'UserManagerDelete'           => \ForkBB\Models\User\Delete::class,
-        'UserManagerChangeGroup'      => \ForkBB\Models\User\ChangeGroup::class,
-        'UserManagerAdminsIds'        => \ForkBB\Models\User\AdminsIds::class,
-        'UserManagerStats'            => \ForkBB\Models\User\Stats::class,
+        'UserModel'                   => \ForkBB\Models\User\User::class,
 
         'ForumModel'   => \ForkBB\Models\Forum\Forum::class,
         'ForumManager' => \ForkBB\Models\Forum\Forums::class,