内核更新

This commit is contained in:
2016-07-22 14:33:13 +08:00
parent 265a9da552
commit c4ba53fd9e
10 changed files with 80 additions and 44 deletions
+4 -3
View File
@@ -238,8 +238,9 @@ class App
foreach ($params as $param) {
$name = $param->getName();
$class = $param->getClass();
if ($class && 'think\Request' == $class->getName()) {
$args[] = Request::instance();
if ($class) {
$className = $class->getName();
$args[] = method_exists($className, 'instance') ? $className::instance() : new $className();
} elseif (1 == $type && !empty($vars)) {
$args[] = array_shift($vars);
} elseif (0 == $type && isset($vars[$name])) {
@@ -465,7 +466,7 @@ class App
*/
public static function routeCheck($request, array $config)
{
$path = $request->path();
$path = rtrim($request->path(), '/');
$depr = $config['pathinfo_depr'];
$result = false;
// 路由检测