From 39b371b2416ae764fd41caa9ad2fe664ebad08e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D1=91=D0=B4=D0=BE=D1=80=20=D0=9F=D0=BE=D0=B4=D0=BB?= =?UTF-8?q?=D0=B5=D1=81=D0=BD=D0=BE=D0=B2?= Date: Wed, 24 Aug 2016 11:22:18 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=82=D0=B8=D0=BF=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/filter/filterbase.php | 2 +- core/filter/filterlogin.php | 4 ++-- core/layout/layout.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) 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); }