Update Models\PM

app/Models/PM/Delete.php

@@ -15,7 +15,7 @@ use ForkBB\Models\DataModel;
 use ForkBB\Models\PM\Cnst;
 use ForkBB\Models\PM\PPost;
 use ForkBB\Models\PM\PTopic;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use InvalidArgumentException;
 use RuntimeException;
 

app/Models/PM/PBlock.php

@@ -13,12 +13,18 @@ namespace ForkBB\Models\PM;
 use ForkBB\Core\Container;
 use ForkBB\Models\Model;
 use ForkBB\Models\PM\Cnst;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use InvalidArgumentException;
 use RuntimeException;
 
 class PBlock extends Model
 {
+    /**
+     * Ключ модели для контейнера
+     * @var string
+     */
+    protected $cKey = 'PBlock';
+
     /**
      * @var array
      */

app/Models/PM/Model.php → app/Models/PM/PM.php

@@ -12,17 +12,23 @@ namespace ForkBB\Models\PM;
 
 use ForkBB\Core\Container;
 use ForkBB\Models\DataModel;
-use ForkBB\Models\Model as ParentModel;
+use ForkBB\Models\Model;
 use ForkBB\Models\PM\Cnst;
 use ForkBB\Models\PM\PBlock;
 use ForkBB\Models\PM\PPost;
 use ForkBB\Models\PM\PTopic;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use InvalidArgumentException;
 use RuntimeException;
 
-class Model extends ParentModel
+class PM extends Model
 {
+    /**
+     * Ключ модели для контейнера
+     * @var string
+     */
+    protected $cKey = 'PMS';
+
     /**
      * @var array
      */

app/Models/PM/PPost.php

@@ -14,12 +14,18 @@ use ForkBB\Core\Container;
 use ForkBB\Models\DataModel;
 use ForkBB\Models\PM\Cnst;
 use ForkBB\Models\PM\PTopic;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use InvalidArgumentException;
 use RuntimeException;
 
 class PPost extends DataModel
 {
+    /**
+     * Ключ модели для контейнера
+     * @var string
+     */
+    protected $cKey = 'PPost';
+
     public function __construct(Container $container)
     {
         parent::__construct($container);

app/Models/PM/PTopic.php

@@ -13,12 +13,18 @@ namespace ForkBB\Models\PM;
 use ForkBB\Core\Container;
 use ForkBB\Models\DataModel;
 use ForkBB\Models\PM\Cnst;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\User\User;
 use PDO;
 use RuntimeException;
 
 class PTopic extends DataModel
 {
+    /**
+     * Ключ модели для контейнера
+     * @var string
+     */
+    protected $cKey = 'PTopic';
+
     public function __construct(Container $container)
     {
         parent::__construct($container);

app/Models/PM/UpdateUsername.php

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

app/config/main.dist.php

@@ -151,7 +151,7 @@ return [
         'search'        => \ForkBB\Models\Search\Model::class,
         'subscriptions' => \ForkBB\Models\Subscription\Model::class,
         'bbcode'        => '@BBCodeListModel:init',
-        'pms'           => \ForkBB\Models\PM\Model::class,
+        'pms'           => \ForkBB\Models\PM\PM::class,
 
         'Csrf' => [
             'class'  => \ForkBB\Core\Csrf::class,
@@ -241,12 +241,14 @@ return [
         'Online*info'           => \ForkBB\Models\Online\Info::class,
         'Online*updateUsername' => \ForkBB\Models\Online\UpdateUsername::class,
 
-        'PBlockModel'           => \ForkBB\Models\PM\PBlock::class,
-        'PMPTopicCalcStat'      => \ForkBB\Models\PM\CalcStat::class,
-        'PMModelLoad'           => \ForkBB\Models\PM\Load::class,
-        'PMModelSave'           => \ForkBB\Models\PM\Save::class,
-        'PMModelDelete'         => \ForkBB\Models\PM\Delete::class,
-        'PMModelUpdateUsername' => \ForkBB\Models\PM\UpdateUsername::class,
+        'PBlockModel' => \ForkBB\Models\PM\PBlock::class,
+
+        'PMS*delete'         => \ForkBB\Models\PM\Delete::class,
+        'PMS*load'           => \ForkBB\Models\PM\Load::class,
+        'PMS*save'           => \ForkBB\Models\PM\Save::class,
+        'PMS*updateUsername' => \ForkBB\Models\PM\UpdateUsername::class,
+
+        'PTopic*CalcStat' => \ForkBB\Models\PM\CalcStat::class,
 
         'UserManagerNormUsername' => \ForkBB\Models\User\NormUsername::class,
     ],