Procházet zdrojové kódy

Update Models\Report

Visman před 3 roky
rodič
revize
81c7ebee12

+ 1 - 1
app/Models/Report/Load.php

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

+ 9 - 3
app/Models/Report/Model.php → app/Models/Report/Report.php

@@ -11,12 +11,18 @@ declare(strict_types=1);
 namespace ForkBB\Models\Report;
 
 use ForkBB\Models\DataModel;
-use ForkBB\Models\Post\Model as Post;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\Post\Post;
+use ForkBB\Models\User\User;
 use RuntimeException;
 
-class Model extends DataModel
+class Report extends DataModel
 {
+    /**
+     * Ключ модели для контейнера
+     * @var string
+     */
+    protected $cKey = 'Report';
+
     /**
      * Устанавливает автора
      */

+ 10 - 4
app/Models/Report/Manager.php → app/Models/Report/Reports.php

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

+ 1 - 1
app/Models/Report/Save.php

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

+ 5 - 4
app/config/main.dist.php

@@ -142,7 +142,7 @@ return [
         'topics'        => \ForkBB\Models\Topic\Manager::class,
         'posts'         => \ForkBB\Models\Post\Posts::class,
         'polls'         => \ForkBB\Models\Poll\Polls::class,
-        'reports'       => \ForkBB\Models\Report\Manager::class,
+        'reports'       => \ForkBB\Models\Report\Reports::class,
         'user'          => '@users:current',
         'userRules'     => '@UsersRules:init',
         'users'         => \ForkBB\Models\User\Manager::class,
@@ -262,6 +262,9 @@ return [
         'Posts/userStat'       => \ForkBB\Models\Post\UserStat::class,
         'Posts/view'           => \ForkBB\Models\Post\View::class,
 
+        'Reports/load' => \ForkBB\Models\Report\Load::class,
+        'Reports/save' => \ForkBB\Models\Report\Save::class,
+
         'UserManagerNormUsername' => \ForkBB\Models\User\NormUsername::class,
     ],
     'multiple'  => [
@@ -380,9 +383,7 @@ return [
 
         'PollModel' => \ForkBB\Models\Poll\Poll::class,
 
-        'ReportModel'             => \ForkBB\Models\Report\Model::class,
-        'ReportManagerSave'       => \ForkBB\Models\Report\Save::class,
-        'ReportManagerLoad'       => \ForkBB\Models\Report\Load::class,
+        'ReportModel'             => \ForkBB\Models\Report\Report::class,
 
         'GroupModel'   => \ForkBB\Models\Group\Group::class,
         'GroupManager' => \ForkBB\Models\Group\Groups::class,