From d501f07b6e8ed3eea11ec2e94728b205c60d7b75 Mon Sep 17 00:00:00 2001
From: xamgore <xamgore@ya.ru>
Date: Wed, 11 Mar 2015 02:09:35 +0300
Subject: [PATCH] Removed warnings according to Kohana documentation
---
~dev_rating/application/bootstrap.php | 12 ++++++------
~dev_rating/system/classes/Kohana/Route.php | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/~dev_rating/application/bootstrap.php b/~dev_rating/application/bootstrap.php
index 1f913902e..09e3a7a12 100644
--- a/~dev_rating/application/bootstrap.php
+++ b/~dev_rating/application/bootstrap.php
@@ -214,7 +214,7 @@ Route::set('student:subject', 'subject/<id>', array('id' => '[0-9]+'))
// Внутренние вызовы!
Route::set('student:index', 'student/index')
- ->filter(function($route, $params, $request){
+ ->filter(function($route, $params, Request $request){
if($request->is_initial())
return FALSE;
})
@@ -225,7 +225,7 @@ Route::set('student:index', 'student/index')
));
Route::set('student:settings', 'student/settings')
- ->filter(function($route, $params, $request){
+ ->filter(function($route, $params, Request $request){
if($request->is_initial())
return FALSE;
})
@@ -236,7 +236,7 @@ Route::set('student:settings', 'student/settings')
));
Route::set('student:profile', 'student/profile')
- ->filter(function($route, $params, $request){
+ ->filter(function($route, $params, Request $request){
if($request->is_initial())
return FALSE;
})
@@ -305,7 +305,7 @@ Route::set('teacher:exam', 'exam/<id>', array('id' => '[0-9]+'))
// Внутренние вызовы!
Route::set('teacher:index', 'teacher/index')
- ->filter(function($route, $params, $request){
+ ->filter(function($route, $params, Request $request){
if($request->is_initial())
return FALSE;
})
@@ -316,7 +316,7 @@ Route::set('teacher:index', 'teacher/index')
));
Route::set('teacher:settings', 'teacher/settings')
- ->filter(function($route, $params, $request){
+ ->filter(function($route, $params, Request $request){
if($request->is_initial())
return FALSE;
})
@@ -327,7 +327,7 @@ Route::set('teacher:settings', 'teacher/settings')
));
Route::set('teacher:profile', 'teacher/profile(/<action>(/<id>))', array('action' => '(student)', 'id' => '[0-9]+'))
- ->filter(function($route, $params, $request){
+ ->filter(function($route, $params, Request $request){
if($request->is_initial())
return FALSE;
})
diff --git a/~dev_rating/system/classes/Kohana/Route.php b/~dev_rating/system/classes/Kohana/Route.php
index 718bf1796..2a9e91517 100644
--- a/~dev_rating/system/classes/Kohana/Route.php
+++ b/~dev_rating/system/classes/Kohana/Route.php
@@ -381,7 +381,7 @@ class Kohana_Route {
* [!!] Default parameters are added before filters are called!
*
* @throws Kohana_Exception
- * @param array $callback callback string, array, or closure
+ * @param array|callback $callback callback string, array, or closure
* @return $this
*/
public function filter($callback)
--
GitLab