Update Models\Online

app/Models/Online/Info.php

@@ -11,7 +11,7 @@ declare(strict_types=1);
 namespace ForkBB\Models\Online;
 
 use ForkBB\Models\Method;
-use ForkBB\Models\Online\Model as Online;
+use ForkBB\Models\Online\Online;
 
 class Info extends Method
 {

app/Models/Online/Model.php → app/Models/Online/Online.php

@@ -10,12 +10,18 @@ declare(strict_types=1);
 
 namespace ForkBB\Models\Online;
 
-use ForkBB\Models\Model as ParentModel;
-use ForkBB\Models\User\Model as User;
+use ForkBB\Models\Model;
+use ForkBB\Models\User\User;
 use ForkBB\Models\Page;
 
-class Model extends ParentModel
+class Online extends Model
 {
+    /**
+     * Ключ модели для контейнера
+     * @var string
+     */
+    protected $cKey = 'Online';
+
     protected $visits = [];
     protected $online = [];
 
@@ -40,7 +46,7 @@ class Model extends ParentModel
      * Обновление данных текущего пользователя
      * Возврат данных по пользователям онлайн
      */
-    public function calc(Page $page): Model
+    public function calc(Page $page): Online
     {
         if ($this->done) {
             return $this;

app/Models/Online/UpdateUsername.php

@@ -11,7 +11,7 @@ declare(strict_types=1);
 namespace ForkBB\Models\Online;
 
 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

@@ -158,7 +158,7 @@ return [
             'Secury' => '@Secury',
             'key'    => '%user.password%%user.ip%%user.id%%BASE_URL%',
         ],
-        'Online' => \ForkBB\Models\Online\Model::class,
+        'Online' => \ForkBB\Models\Online\Online::class,
         'Cookie' => [
             'class'   => \ForkBB\Models\Cookie\Cookie::class,
             'options' => '%COOKIE%',
@@ -238,6 +238,9 @@ return [
         'Group&perm'   => \ForkBB\Models\Group\Perm::class,
         'Group&save'   => \ForkBB\Models\Group\Save::class,
 
+        '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,
@@ -314,9 +317,6 @@ return [
 
         'ConfigModel' => \ForkBB\Models\Config\Config::class,
 
-        'OnlineModelInfo' => \ForkBB\Models\Online\Info::class,
-        'OnlineModelUpdateUsername' => \ForkBB\Models\Online\UpdateUsername::class,
-
         'BanListModel'         => \ForkBB\Models\BanList\BanList::class,
 
         'CensorshipModel'        => \ForkBB\Models\Censorship\Censorship::class,