From df4540910291cc04a3c62d53924248f1ee37cd20 Mon Sep 17 00:00:00 2001
From: topnuomi <1130395124@qq.com>
Date: Thu, 18 Jul 2024 14:32:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9RQ=E3=80=81Router=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework/library/Router.php        | 10 +++---
 framework/library/http/Request.php  | 49 ++++++++++++-----------------
 framework/library/http/Response.php | 16 +++++-----
 3 files changed, 33 insertions(+), 42 deletions(-)

diff --git a/framework/library/Router.php b/framework/library/Router.php
index a15dc67..008dbcd 100644
--- a/framework/library/Router.php
+++ b/framework/library/Router.php
@@ -81,7 +81,7 @@ class Router
 
     /**
      * 完整控制器名
-     * @return mixed
+     * @return string
      */
     public function controllerFullName()
     {
@@ -90,7 +90,7 @@ class Router
 
     /**
      * 控制器名
-     * @return mixed
+     * @return string
      */
     public function controller()
     {
@@ -99,7 +99,7 @@ class Router
 
     /**
      * 模块名
-     * @return mixed
+     * @return string
      */
     public function module()
     {
@@ -108,7 +108,7 @@ class Router
 
     /**
      * 方法名
-     * @return mixed
+     * @return string
      */
     public function method()
     {
@@ -117,7 +117,7 @@ class Router
 
     /**
      * 请求参数
-     * @return mixed
+     * @return array
      */
     public function params()
     {
diff --git a/framework/library/http/Request.php b/framework/library/http/Request.php
index 2493d08..c16879e 100644
--- a/framework/library/http/Request.php
+++ b/framework/library/http/Request.php
@@ -22,9 +22,9 @@ class Request
 
     /**
      * 当前URI
-     * @var mixed|null
+     * @var string
      */
-    private $uri = null;
+    private $uri = '';
 
     /**
      * post、get数据删除的值
@@ -44,7 +44,7 @@ class Request
 
     /**
      * 当前请求方式
-     * @return mixed|string
+     * @return string
      */
     public function requestMethod()
     {
@@ -53,7 +53,7 @@ class Request
 
     /**
      * 判断请求方式
-     * @param $method
+     * @param string $method
      * @return bool
      */
     public function is($method)
@@ -102,7 +102,7 @@ class Request
 
     /**
      * 当前请求的URI
-     * @return mixed
+     * @return string
      */
     public function uri()
     {
@@ -111,7 +111,7 @@ class Request
 
     /**
      * 模块名称
-     * @return mixed
+     * @return string
      */
     public function module()
     {
@@ -120,7 +120,7 @@ class Request
 
     /**
      * 控制器完整类名
-     * @return mixed
+     * @return string
      */
     public function controllerFullName()
     {
@@ -129,7 +129,7 @@ class Request
 
     /**
      * 控制器名称
-     * @return mixed
+     * @return string
      */
     public function controller()
     {
@@ -138,7 +138,7 @@ class Request
 
     /**
      * 方法名称
-     * @return mixed
+     * @return string
      */
     public function method()
     {
@@ -147,28 +147,19 @@ class Request
 
     /**
      * 参数
-     * @return mixed
+     * @return array
      */
     public function params()
     {
         return Router::instance($this)->params();
     }
 
-    /**
-     * 当前加载的路由规则
-     * @return null
-     */
-    public function routeParameters()
-    {
-        return Router::instance($this)->loadRuleParameters();
-    }
-
     /**
      * 移除值
-     * @param $field
+     * @param string $field
      * @return $this
      */
-    public function except($field = null)
+    public function except($field = '')
     {
         if (is_array($field)) {
             $this->except = array_merge($this->except, $field);
@@ -221,11 +212,11 @@ class Request
 
     /**
      * 得到当前的URI
-     * @return mixed|null
+     * @return string
      */
     private function getUri()
     {
-        $uri = null;
+        $uri = '';
         if (isset($this->server['PATH_INFO']) && $this->server['PATH_INFO']) {
             $uri = $this->server['PATH_INFO'];
         } elseif (isset($_GET['s']) && $_GET['s']) {
@@ -236,16 +227,16 @@ class Request
 
     /**
      * GET POST公共方法
-     * @param $type
-     * @param $name
-     * @param $except
-     * @param $filter
-     * @return null
+     * @param string $type
+     * @param string $name
+     * @param array $except
+     * @param string $filter
+     * @return array|string|null
      */
     private function requestData($type, $name, $except, $filter)
     {
         $data = ($type == 'get') ? $_GET : $_POST;
-        $name = ($name == '*') ? null : $name;
+        $name = ($name == '*') ? '' : $name;
 
         if (!is_array($except)) {
             $except = explode(',', $except);
diff --git a/framework/library/http/Response.php b/framework/library/http/Response.php
index d15adec..0e3d8da 100644
--- a/framework/library/http/Response.php
+++ b/framework/library/http/Response.php
@@ -87,10 +87,10 @@ class Response
 
     /**
      * 设置Header
-     * @param null $header
+     * @param array|string $header
      * @return $this
      */
-    public function header($header = null)
+    public function header($header)
     {
         if (is_array($header)) {
             $this->header = array_merge($this->header, $header);
@@ -106,7 +106,7 @@ class Response
 
     /**
      * 设置响应状态码
-     * @param $code
+     * @param int $code
      * @return Response
      */
     public function code($code = 200)
@@ -124,7 +124,7 @@ class Response
 
     /**
      * 返回内容
-     * @param $data
+     * @param mixed $data
      * @return Response
      */
     public function send($data = null)
@@ -151,11 +151,11 @@ class Response
 
     /**
      * 输出文件
-     * @param $filename
-     * @param $name
+     * @param string $filename
+     * @param string $name
      * @return Response
      */
-    public function sendFile($filename = null, $name = null)
+    public function sendFile($filename, $name = '')
     {
         if (is_file($filename)) {
             $name = ($name) ? $name : uniqid() . '.' . substr($filename, strrpos($filename, '.') + 1);
@@ -168,7 +168,7 @@ class Response
 
     /**
      * 处理数据
-     * @param $data
+     * @param mixed $data
      * @return false|int|null|string
      */
     private function getContent($data)