diff --git a/src/Controller/Action.php b/src/Controller/Action.php index fab01da..13b7ba8 100644 --- a/src/Controller/Action.php +++ b/src/Controller/Action.php @@ -111,7 +111,7 @@ class Action implements ActionInterface * @param int $size * @return string Путь к иконке */ - function findIcon($icon, $size) { + function findIcon($icon, $size): string { $webPath = $this->config->get('site', 'web'); return Path::join($webPath, 'icons', $size . 'x' . $size, $icon . '.png'); } @@ -119,8 +119,8 @@ class Action implements ActionInterface /** * Создает представление * @param string $name - * @param class-string $viewClass - * @return Composite + * @param class-string $viewClass + * @return View */ public function getView($name, $viewClass = Composite::class) { @@ -143,7 +143,7 @@ class Action implements ActionInterface /** @var \ctiso\View\Composite */ $tpl = new $viewClass($template); - $tpl->config = $this->config; + $tpl->set('config', $this->config); $stylePath = Path::join($webPath, "assets", "css"); $iconsPath = Path::join($webPath, 'icons'); diff --git a/src/Controller/ActionInterface.php b/src/Controller/ActionInterface.php index 4c8dbf6..ddb2ff6 100644 --- a/src/Controller/ActionInterface.php +++ b/src/Controller/ActionInterface.php @@ -2,6 +2,7 @@ namespace ctiso\Controller; +use ctiso\View\Template; use ctiso\Database; use ctiso\HttpRequest; @@ -10,14 +11,14 @@ interface ActionInterface { * Действие может вернуть Шаблон или строку * * @param HttpRequest $request - * @return \ctiso\View\View|string|false + * @return Template|string|false */ function execute(HttpRequest $request); function getConnection(): Database; /** * @param string $name - * @param class-string<\ctiso\View\View> $class - * @return \ctiso\View\View + * @param class-string