feat: 支持使用 URL 参数 r 作为路由

twinh · May 18, 2020 · 7de4f06 · 7de4f06
1 parent 22eddf6
commit 7de4f06
Show file tree

Hide file tree

Showing 4 changed files with 399 additions and 113 deletions.
diff --git a/lib/Request.php b/lib/Request.php
@@ -103,6 +103,21 @@ class Request extends Base implements \ArrayAccess, \Countable, \IteratorAggrega
      */
     protected $overwriteFormat = true;
 
+    /**
+     * The param name to receive path info for router, when URL rewrite is not enabled
+     *
+     * @var string
+     */
+    protected $routerKey = 'r';
+
+    /**
+     * A flag to indicate whether URL rewriting is enabled, since we cannot detected it in index page(path info is
+     * always empty).
+     *
+     * @var bool
+     */
+    protected $defaultUrlRewrite = true;
+
     /**
      * @var string
      */
@@ -968,6 +983,41 @@ public function getReferer()
         return $this->getServer('HTTP_REFERER');
     }
 
+    /**
+     * @return string
+     */
+    public function getRouterKey()
+    {
+        return $this->routerKey;
+    }
+
+    /**
+     * Whether URL rewriting is enabled
+     *
+     * @return bool
+     */
+    public function isUrlRewrite()
+    {
+        if ($this->getPathInfo() !== '/') {
+            return true;
+        }
+        return $this->defaultUrlRewrite;
+    }
+
+    /**
+     * Receive path info for router
+     *
+     * @return string
+     */
+    public function getRouterPathInfo()
+    {
+        if ($this->isUrlRewrite()) {
+            return $this->getPathInfo();
+        } else {
+            return '/' . ltrim($this[$this->routerKey], '/');
+        }
+    }
+
     /**
      * Removes extra keys in data
      */

diff --git a/lib/Url.php b/lib/Url.php
@@ -40,7 +40,21 @@ public function __invoke($url = '', $argsOrParams = array(), $params = array())
      */
     protected function to($url = '', $argsOrParams = array(), $params = array())
     {
-        return $this->request->getBaseUrl() . '/' . $this->append($url, $argsOrParams, $params);
+        if ($this->request->isUrlRewrite()) {
+            return $this->request->getBaseUrl() . '/' . $this->append($url, $argsOrParams, $params);
+        }
+
+        if (strpos($url, '%s') !== false) {
+            $url = $this->append($url, $argsOrParams);
+            $argsOrParams = $params;
+        }
+
+        // Add router path info into url
+        if ($url) {
+            $argsOrParams = [$this->request->getRouterKey() => $url] + $argsOrParams;
+        }
+
+        return $this->request->getBaseUrl() . '/' . $this->append('', $argsOrParams);
     }
 
     /**
@@ -85,7 +99,7 @@ public function query($url = '', $argsOrParams = array(), $params = array())
     public function append($url = '', $argsOrParams = array(), $params = array())
     {
         if (strpos($url, '%s') !== false) {
-            $url = vsprintf($url, (array)$argsOrParams);
+            $url = vsprintf($url, (array) $argsOrParams);
         } else {
             $params = $argsOrParams;
         }