Update Models\Subscription

app/Models/Subscription/Send.php

@@ -11,9 +11,9 @@ declare(strict_types=1);
 namespace ForkBB\Models\Subscription;
 
 use ForkBB\Models\Method;
-use ForkBB\Models\Forum\Model as Forum;
-use ForkBB\Models\Post\Model as Post;
-use ForkBB\Models\Topic\Model as Topic;
+use ForkBB\Models\Forum\Forum;
+use ForkBB\Models\Post\Post;
+use ForkBB\Models\Topic\Topic;
 use ForkBB\Core\Exceptions\MailException;
 use function \ForkBB\__;
 

app/Models/Subscription/Model.php → app/Models/Subscription/Subscription.php

@@ -10,16 +10,22 @@ declare(strict_types=1);
 
 namespace ForkBB\Models\Subscription;
 
-use ForkBB\Models\Model as ParentModel;
+use ForkBB\Models\Model;
 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;
 
-class Model extends ParentModel
+class Subscription extends Model
 {
+    /**
+     * Ключ модели для контейнера
+     * @var string
+     */
+    protected $cKey = 'Subscription';
+
     /**
      * @var array
      */

app/config/main.dist.php

@@ -149,7 +149,7 @@ return [
         'groups'        => '@GroupManager:init',
         'categories'    => '@CategoriesManager:init',
         'search'        => \ForkBB\Models\Search\Search::class,
-        'subscriptions' => \ForkBB\Models\Subscription\Model::class,
+        'subscriptions' => \ForkBB\Models\Subscription\Subscription::class,
         'bbcode'        => '@BBCodeListModel:init',
         'pms'           => \ForkBB\Models\PM\PM::class,
 
@@ -187,8 +187,6 @@ return [
         'ProfileRules' => \ForkBB\Models\Rules\Profile::class,
         'UsersRules'   => \ForkBB\Models\Rules\Users::class,
 
-        'SubscriptionModelSend' => \ForkBB\Models\Subscription\Send::class,
-
         'BanList/check'    => \ForkBB\Models\BanList\Check::class,
         'BanList/delete'   => \ForkBB\Models\BanList\Delete::class,
         'BanList/filter'   => \ForkBB\Models\BanList\Filter::class,
@@ -274,6 +272,8 @@ return [
         'SmileyList/load'   => \ForkBB\Models\SmileyList\Load::class,
         'SmileyList/update' => \ForkBB\Models\SmileyList\Update::class,
 
+        'Subscription/send' => \ForkBB\Models\Subscription\Send::class,
+
         'UserManagerNormUsername' => \ForkBB\Models\User\NormUsername::class,
     ],
     'multiple'  => [