diff --git a/src/Controller/Action.php b/src/Controller/Action.php index 241b3df..4309caf 100644 --- a/src/Controller/Action.php +++ b/src/Controller/Action.php @@ -153,7 +153,7 @@ class Action public function getModel($name) { if (!$this->factory) { - $this->factory = new Factory($this->db, $this->config); + $this->factory = new Factory($this->db, $this->config, $this->user); } return $this->factory->getModel($name); } diff --git a/src/Database.php b/src/Database.php index 3cb15b6..b2ac6ca 100644 --- a/src/Database.php +++ b/src/Database.php @@ -30,7 +30,7 @@ class Database/**/ extends PDO $this->setAttribute(PDO::ATTR_STATEMENT_CLASS, array('ctiso\\Database\\PDOStatement', array())); } - function prepare($sql, $args = []) { + function prepare($sql, $args = []) { $result/*: PDOStatement*/ = parent::prepare($sql, $args); return $result; } diff --git a/src/Model/Factory.php b/src/Model/Factory.php index 031ce43..39d30ca 100644 --- a/src/Model/Factory.php +++ b/src/Model/Factory.php @@ -2,17 +2,19 @@ namespace ctiso\Model; use ctiso\Registry, - ctiso\Database; + ctiso\Database, + ctiso\Role\User; class Factory { public $db; public $config; - public function __construct (Database $db, Registry $config = null) + public function __construct (Database $db, Registry $config = null, User $user) { $this->db = $db; $this->config = $config; + $this->user = $user; } /** @@ -27,6 +29,7 @@ class Factory $model->db = $this->db; $model->factory = $this; $model->config = $this->config; + $model->user = $this->user; $model->setUp(); // return $model;