Update Action, Manager, Model

app/Models/Action.php

@@ -11,7 +11,7 @@ declare(strict_types=1);
 namespace ForkBB\Models;
 
 use ForkBB\Core\Container;
-use ForkBB\Models\ManagerModel;
+use ForkBB\Models\Manager;
 
 class Action
 {
@@ -23,7 +23,7 @@ class Action
 
     /**
      * Модель
-     * @var ManagerModel
+     * @var Manager
      */
     protected $manager;
 
@@ -35,7 +35,7 @@ class Action
     /**
      * Объявление менеджера
      */
-    public function setManager(ManagerModel $manager): Action
+    public function setManager(Manager $manager): Action
     {
         $this->manager = $manager;
 

app/Models/ManagerModel.php → app/Models/Manager.php

@@ -12,7 +12,7 @@ namespace ForkBB\Models;
 
 use ForkBB\Core\Container;
 
-class ManagerModel
+class Manager
 {
     /**
      * Контейнер
@@ -20,6 +20,12 @@ class ManagerModel
      */
     protected $c;
 
+    /**
+     * Ключ модели для контейнера
+     * @var string
+     */
+    protected $cKey = 'unknown';
+
     /**
      * @var array
      */
@@ -52,9 +58,9 @@ class ManagerModel
      */
     public function __get(string $name) /* : mixed */
     {
-        $key = \str_replace(['ForkBB\\Models\\', 'ForkBB\\', '\\'], '', \get_class($this));
+        $key = $this->cKey . '&' . $name;
 
-        return $this->c->{$key . \ucfirst($name)}->setManager($this);
+        return $this->c->$key->setManager($this);
     }
 
     /**

app/Models/Model.php

@@ -20,6 +20,12 @@ class Model
      */
     protected $c;
 
+    /**
+     * Ключ модели для контейнера
+     * @var string
+     */
+    protected $cKey = 'unknown';
+
     /**
      * Данные модели
      * @var array
@@ -157,8 +163,8 @@ class Model
      */
     public function __call(string $name, array $args) /* : mixed */
     {
-        $key = \str_replace(['ForkBB\\Models\\', 'ForkBB\\', '\\'], '', \get_class($this));
+        $key = $this->cKey . '*' . $name;
 
-        return $this->c->{$key . \ucfirst($name)}->setModel($this)->$name(...$args);
+        return $this->c->$key->setModel($this)->$name(...$args);
     }
 }