更改文件名称

Qii/Application.php

@@ -336,7 +336,7 @@ class Application
         );
         //载入rewrite规则后重写request
         $rewrite = Psr4::loadStatic(
-            '\Qii\Route\Parse',
+            '\Qii\Router\Parse',
             'get',
             \Qii\Request\Url::getPathInfo(),
             $this->request->controller,

Qii/Request/Url.php

@@ -121,6 +121,7 @@ class Url
         $url = preg_replace('/' . $ext . '$/', '', $url);
         return self::getFullUrl($url, $ext);
     }
+
     /**
      * 获取来源地址
      */
@@ -128,6 +129,7 @@ class Url
     {
         return isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';
     }
+
     /**
      * 来源地址是否是当前网站
      * @param string $currentURL 需要验证的网址，不传默认当前网址
@@ -135,20 +137,20 @@ class Url
      */
     public static function refererFromCurrentSite($currentURL = null)
     {
-		$referer = self::getRefererURL();
-        if(!$currentURL) $currentURL = self::getCurrentURL();
-		if(parse_url($referer, PHP_URL_HOST) != parse_url($currentURL, PHP_URL_HOST)){
-			return false;
-		}
+        $referer = self::getRefererURL();
+        if (!$currentURL) $currentURL = self::getCurrentURL();
+        if (parse_url($referer, PHP_URL_HOST) != parse_url($currentURL, PHP_URL_HOST)) {
+            return false;
+        }
         return true;
     }
+
     /**
      * 先看本方法中有没有静态方法可调用
      */
     public function __call($method, $args)
     {
-        if(method_exists($this, $method))
-        {
+        if (method_exists($this, $method)) {
             return call_user_func_array(array(self, $method), $args);
         }
         return call_user_func_array(array($this->request, $method), $args);

Qii/Route/Parse.php → Qii/Router/Parse.php

@@ -1,5 +1,5 @@
 <?php
-namespace Qii\Route;
+namespace Qii\Router;
 
 use \Qii\Autoloader\Import;
 
@@ -39,8 +39,8 @@ class Parse
         $router = Register::getAppConfigure(Consts::APP_SITE_ROUTER);
         $rewriteRule = Register::getAppConfigure(Register::get(Consts::APP_INI_FILE), 'rewriteRule');
         if (!$rewriteRule) $rewriteRule = 'Normal';
-        Import::requires(Qii_DIR . DS . 'Route' . DS . 'Parse' .DS. $rewriteRule . '.php');
-        $className = '\Qii\Route\Parse\\' . $rewriteRule;
+        Import::requires(Qii_DIR . DS . 'Router' . DS . 'Parse' .DS. $rewriteRule . '.php');
+        $className = '\Qii\Router\Parse\\' . $rewriteRule;
         if (!class_exists($className, false)) {
             throw new \Qii\Exceptions\ClassNotFound(\Qii::i(1103, $className), __LINE__);
         }

Qii/Route/Parse/Normal.php → Qii/Router/Parse/Normal.php

@@ -1,5 +1,5 @@
 <?php
-namespace Qii\Route\Parse;
+namespace Qii\Router\Parse;
 
 /**
  * Route规则文件

Qii/Route/Parse/Regx.php → Qii/Router/Parse/Regx.php

@@ -1,5 +1,5 @@
 <?php
-namespace Qii\Route\Parse;
+namespace Qii\Router\Parse;
 
 /**
  * Route规则 支持正则表达式