Update Models\Topic

app/Models/Topic/Access.php

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

app/Models/Topic/CalcStat.php

@@ -11,7 +11,7 @@ declare(strict_types=1);
 namespace ForkBB\Models\Topic;
 
 use ForkBB\Models\Method;
-use ForkBB\Models\Topic\Model as Topic;
+use ForkBB\Models\Topic\Topic;
 use RuntimeException;
 
 class CalcStat extends Method

app/Models/Topic/Delete.php

@@ -12,9 +12,9 @@ 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;
+use ForkBB\Models\Forum\Forum;
+use ForkBB\Models\Topic\Topic;
+use ForkBB\Models\User\User;
 use PDO;
 use InvalidArgumentException;
 use RuntimeException;

app/Models/Topic/Load.php

@@ -11,8 +11,8 @@ declare(strict_types=1);
 namespace ForkBB\Models\Topic;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\Forum\Model as Forum;
-use ForkBB\Models\Topic\Model as Topic;
+use ForkBB\Models\Forum\Forum;
+use ForkBB\Models\Topic\Topic;
 use InvalidArgumentException;
 
 class Load extends Action

app/Models/Topic/Merge.php

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

app/Models/Topic/Move.php

@@ -11,8 +11,8 @@ declare(strict_types=1);
 namespace ForkBB\Models\Topic;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\Forum\Model as Forum;
-use ForkBB\Models\Topic\Model as Topic;
+use ForkBB\Models\Forum\Forum;
+use ForkBB\Models\Topic\Topic;
 
 class Move extends Action
 {

app/Models/Topic/Save.php

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

app/Models/Topic/Model.php → app/Models/Topic/Topic.php

@@ -12,13 +12,19 @@ namespace ForkBB\Models\Topic;
 
 use ForkBB\Core\Container;
 use ForkBB\Models\DataModel;
-use ForkBB\Models\Forum\Model as Forum;
-use ForkBB\Models\Poll\Model as Poll;
+use ForkBB\Models\Forum\Forum;
+use ForkBB\Models\Poll\Poll;
 use PDO;
 use RuntimeException;
 
-class Model extends DataModel
+class Topic extends DataModel
 {
+    /**
+     * Ключ модели для контейнера
+     * @var string
+     */
+    protected $cKey = 'Topic';
+
     /**
      * Получение родительского раздела
      */

app/Models/Topic/Manager.php → app/Models/Topic/Topics.php

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

app/Models/Topic/UpdateUsername.php

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

app/Models/Topic/View.php

@@ -11,9 +11,9 @@ declare(strict_types=1);
 namespace ForkBB\Models\Topic;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\Forum\Model as Forum;
-use ForkBB\Models\Search\Model as Search;
-use ForkBB\Models\Topic\Model as Topic;
+use ForkBB\Models\Forum\Forum;
+use ForkBB\Models\Search\Search;
+use ForkBB\Models\Topic\Topic;
 use PDO;
 use InvalidArgumentException;
 use RuntimeException;

app/config/main.dist.php

@@ -139,7 +139,7 @@ return [
         'dbMap'         => '@DBMapModel:init',
         'stopwords'     => '@StopwordListModel:init',
         'forums'        => '@ForumManager:init',
-        'topics'        => \ForkBB\Models\Topic\Manager::class,
+        'topics'        => \ForkBB\Models\Topic\Topics::class,
         'posts'         => \ForkBB\Models\Post\Posts::class,
         'polls'         => \ForkBB\Models\Poll\Polls::class,
         'reports'       => \ForkBB\Models\Report\Reports::class,
@@ -274,6 +274,17 @@ return [
 
         'Subscription/send' => \ForkBB\Models\Subscription\Send::class,
 
+        'Topic/calcStat' => \ForkBB\Models\Topic\CalcStat::class,
+
+        'Topics/access'         => \ForkBB\Models\Topic\Access::class,
+        'Topics/delete'         => \ForkBB\Models\Topic\Delete::class,
+        'Topics/load'           => \ForkBB\Models\Topic\Load::class,
+        'Topics/save'           => \ForkBB\Models\Topic\Save::class,
+        'Topics/merge'          => \ForkBB\Models\Topic\Merge::class,
+        'Topics/move'           => \ForkBB\Models\Topic\Move::class,
+        'Topics/updateUsername' => \ForkBB\Models\Topic\UpdateUsername::class,
+        'Topics/view'           => \ForkBB\Models\Topic\View::class,
+
         'UserManagerNormUsername' => \ForkBB\Models\User\NormUsername::class,
     ],
     'multiple'  => [
@@ -377,16 +388,7 @@ return [
         'ForumModel'   => \ForkBB\Models\Forum\Forum::class,
         'ForumManager' => \ForkBB\Models\Forum\Forums::class,
 
-        'TopicModel'         => \ForkBB\Models\Topic\Model::class,
-        'TopicModelCalcStat' => \ForkBB\Models\Topic\CalcStat::class,
-        'TopicManagerLoad'   => \ForkBB\Models\Topic\Load::class,
-        'TopicManagerSave'   => \ForkBB\Models\Topic\Save::class,
-        'TopicManagerDelete' => \ForkBB\Models\Topic\Delete::class,
-        'TopicManagerView'   => \ForkBB\Models\Topic\View::class,
-        'TopicManagerAccess' => \ForkBB\Models\Topic\Access::class,
-        'TopicManagerMerge'  => \ForkBB\Models\Topic\Merge::class,
-        'TopicManagerMove'   => \ForkBB\Models\Topic\Move::class,
-        'TopicManagerUpdateUsername' => \ForkBB\Models\Topic\UpdateUsername::class,
+        'TopicModel'         => \ForkBB\Models\Topic\Topic::class,
 
         'PostModel'               => \ForkBB\Models\Post\Post::class,