Selaa lähdekoodia

Update: set info

Jinhui Zhu 4 vuotta sitten
vanhempi
commit
c54d6ae010
3 muutettua tiedostoa jossa 6 lisäystä ja 3 poistoa
  1. 1 1
      src/Autoloader/Psr4.php
  2. 2 2
      src/Base/Request.php
  3. 3 0
      src/Request/Url/Base.php

+ 1 - 1
src/Autoloader/Psr4.php

@@ -451,7 +451,7 @@ class Psr4
         $class = array_shift($args);
         $className = $this->getClassName($class);
         //如果实例化的参数发生变化,就重新实例化
-        $paramsHash = md5(var_export($args, true));
+        $paramsHash = md5(print_r($args, true));
         if (isset(self::$_loadedClass[$className]) && isset(self::$_loadedClassParams[$className])
             && self::$_loadedClassParams[$className] == $paramsHash) return self::$_loadedClass[$className];
         

+ 2 - 2
src/Base/Request.php

@@ -47,9 +47,9 @@ abstract class Request
         $this->host = IS_CLI ? '' : $_SERVER['HTTP_HOST'];
         $params = (array)$this->url->getParams();
         if(count($params) > 0) $this->params = array_merge($this->params, $params);
-        $routeInfo = $this->url->getPathArgs();
+        $routeInfo = (array)$this->url->getPathArgs();
 		$controller = $this->defaultController();
-		$action = $this->defaultAction();
+        $action = $this->defaultAction();
 		if(count($routeInfo) > 1)
 		{
 			$action = array_pop($routeInfo);

+ 3 - 0
src/Request/Url/Base.php

@@ -271,11 +271,14 @@ abstract class Base
                     $args[$index] = $val;
                 }
             }
+            
+            $this->pathArgs = $args;
             if ($args && $key != '') {
                 return isset($args[$key]) ? $args[$key] : '';
             }
             return $args;
         }
+        return array();
     }
 
     /**