diff --git a/core/filter/filterbase.php b/core/filter/filterbase.php index d6059cd..d56c9e5 100644 --- a/core/filter/filterbase.php +++ b/core/filter/filterbase.php @@ -11,7 +11,7 @@ class Filter $this->processor = $processor; } - public function execute(Collection $request) + public function execute(HttpRequest $request) { return $this->processor->execute($request); } diff --git a/core/filter/filterlogin.php b/core/filter/filterlogin.php index d6b14dd..1ed835a 100644 --- a/core/filter/filterlogin.php +++ b/core/filter/filterlogin.php @@ -17,7 +17,7 @@ class LoginFilter extends Filter * Проверка авторизации * @return Boolean Авторизовани пользователь или нет */ - public function isLoggin(Collection $request) + public function isLoggin(HttpRequest $request) { // Авторизация session_start(); @@ -91,7 +91,7 @@ class LoginFilter extends Filter $_SESSION ["time"] = time(); } - public function execute(Collection $request) + public function execute(HttpRequest $request) { if (!$this->isLoggin($request)) { // Параметры при неправильной авторизации diff --git a/core/layout/layout.php b/core/layout/layout.php index e39ac1e..7c13029 100644 --- a/core/layout/layout.php +++ b/core/layout/layout.php @@ -63,7 +63,7 @@ class LayoutManager extends Filter /** * Выбирает и применяет макет для страницы */ - public function execute(Collection $request) + public function execute(HttpRequest $request) { foreach ($this->condition as $condition) { if (call_user_func($condition[0], $request)) { @@ -86,7 +86,7 @@ class LayoutManager extends Filter */ class LayoutNone extends Filter { - function execute(Collection $request) + function execute(HttpRequest $request) { return $this->processor->execute($request); }