diff --git a/src/Controller/Component.php b/src/Controller/Component.php index a639ac4..6cd5c66 100644 --- a/src/Controller/Component.php +++ b/src/Controller/Component.php @@ -232,13 +232,14 @@ class Component } /** + * FIXME: Передавать в модель имя класса, а не часть * Создает модель - * @param string $name + * @param class-string $modelName * @return mixed */ - public function getModel($name) + public function getModel($modelName) { - $modelName = "App\\Mapper\\" . $name; + // $modelName = "App\\Mapper\\" . $name; $model = new $modelName(); $model->config = $this->config; $model->db = $this->db; diff --git a/src/Database/Manager.php b/src/Database/Manager.php index 0ea3547..9f0fe05 100644 --- a/src/Database/Manager.php +++ b/src/Database/Manager.php @@ -12,10 +12,10 @@ use Exception; * type:string, * table_name:string, * table:string, - * fields:array, + * fields:array, * field: ColumnProps, - * constraints:?array, - * references:?array, + * constraints:?array, + * references:?array, * source:string, * pgsql?:string, * old_name?:string, @@ -24,7 +24,7 @@ use Exception; * column_name?:string, * refTable?:string, * refColumn?:string, - * values:array, + * values:array, * view:string, * select:string * } diff --git a/src/Database/PDOStatement.php b/src/Database/PDOStatement.php index 2811df2..3030723 100644 --- a/src/Database/PDOStatement.php +++ b/src/Database/PDOStatement.php @@ -11,7 +11,7 @@ class PDOStatement extends \PDOStatement implements \IteratorAggregate { /** @var int */ protected $cursorPos = 0; - /** @var array */ + /** @var array */ public $cache = []; /** @var ?array */ public $fields;