libs/phplibrary
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Мелкие правки

Browse source
This commit is contained in:
origami11@yandex.ru 2023-01-31 10:49:00 +03:00
parent b3f6cfcbd7
commit 0c3fba0d7e
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Controller/Component.php
View file

@ -208,9 +208,11 @@ class Component
$filename = Path::join($this->viewPath[count($this->viewPath) - 1], 'install.json'); $filename = Path::join($this->viewPath[count($this->viewPath) - 1], 'install.json');
if (file_exists($filename)) { if (file_exists($filename)) {
$settings = json_decode(File::getContents($filename), true); $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; $name = $path;
$path = Path::join ($site->config->get('site', 'components'), $name, $name . '.php'); $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; $component/*: Component*/ = null;

2
src/Model/Factory.php
View file

@ -10,7 +10,7 @@ class Factory
public $db; public $db;
public $config; 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->db = $db;
$this->config = $config; $this->config = $config;