Update Models\Post

app/Models/Post/Delete.php

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

app/Models/Post/Feed.php

@@ -12,8 +12,8 @@ namespace ForkBB\Models\Post;
 
 use ForkBB\Models\Action;
 use ForkBB\Models\DataModel;
-use ForkBB\Models\Topic\Model as Topic;
-use ForkBB\Models\Forum\Model as Forum;
+use ForkBB\Models\Topic\Topic;
+use ForkBB\Models\Forum\Forum;
 
 use InvalidArgumentException;
 use RuntimeException;

app/Models/Post/Load.php

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

app/Models/Post/Move.php

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

app/Models/Post/Model.php → app/Models/Post/Post.php

@@ -11,13 +11,19 @@ declare(strict_types=1);
 namespace ForkBB\Models\Post;
 
 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 RuntimeException;
 
-class Model extends DataModel
+class Post extends DataModel
 {
+    /**
+     * Ключ модели для контейнера
+     * @var string
+     */
+    protected $cKey = 'Post';
+
     /**
      * Получение родительской темы
      */

app/Models/Post/Manager.php → app/Models/Post/Posts.php

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

app/Models/Post/PreviousPost.php

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

app/Models/Post/RebuildIndex.php

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

app/Models/Post/Save.php

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

app/Models/Post/UpdateUsername.php

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

app/Models/Post/UserInfoFromIP.php

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

app/Models/Post/UserStat.php

@@ -11,7 +11,7 @@ declare(strict_types=1);
 namespace ForkBB\Models\Post;
 
 use ForkBB\Models\Action;
-use ForkBB\Models\Post\Model as Post;
+use ForkBB\Models\Post\Post;
 use PDO;
 
 class UserStat extends Action

app/Models/Post/View.php

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