diff --git a/src/Controller/Component.php b/src/Controller/Component.php index badc2f0..f0c6647 100644 --- a/src/Controller/Component.php +++ b/src/Controller/Component.php @@ -208,9 +208,11 @@ class Component $filename = Path::join($this->viewPath[count($this->viewPath) - 1], 'install.json'); if (file_exists($filename)) { $settings = json_decode(File::getContents($filename), true); - return $settings; + if ($settings) { + return $settings; + } } - return array(); + return array('parameter' => []); } /** @@ -246,7 +248,7 @@ class Component $name = $path; $path = Path::join ($site->config->get('site', 'components'), $name, $name . '.php'); - $className = 'Components\\'. ucfirst($name). '\\' . ucfirst($name); + $className = implode("\\", ['Components', ucfirst($name), ucfirst($name)]); $component/*: Component*/ = null; diff --git a/src/Model/Factory.php b/src/Model/Factory.php index 39d30ca..dd99fd7 100644 --- a/src/Model/Factory.php +++ b/src/Model/Factory.php @@ -10,7 +10,7 @@ class Factory public $db; public $config; - public function __construct (Database $db, Registry $config = null, User $user) + public function __construct (Database $db, Registry $config = null, User $user = null) { $this->db = $db; $this->config = $config;