mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 23:22:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进Request类

Browse Source
This commit is contained in:
thinkphp
2016-06-03 10:26:53 +08:00
parent 50810bef0c
commit 661a470e5d
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
library/think/Model.php
View File

@@ -755,7 +755,6 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
case Relation::HAS_MANY_THROUGH: case Relation::HAS_MANY_THROUGH:
// TODO // TODO
} }
} }
/** /**

20
library/think/Request.php
View File

@@ -199,9 +199,9 @@ class Request
* @param string $domain 域名 * @param string $domain 域名
* @return string * @return string
*/ */
public function domain($domain = '') public function domain($domain = null)
{ {
if (!empty($domain)) { if (!is_null($domain)) {
$this->domain = $domain; $this->domain = $domain;
return $this; return $this;
} elseif (!$this->domain) { } elseif (!$this->domain) {
@@ -216,9 +216,9 @@ class Request
* @param string|true $url URL地址 true 带域名获取 * @param string|true $url URL地址 true 带域名获取
* @return string * @return string
*/ */
public function url($url = '') public function url($url = null)
{ {
if (is_string($url) && !empty($url)) { if (!is_null($url) && true !== $url) {
$this->url = $url; $this->url = $url;
return $this; return $this;
} elseif (!$this->url) { } elseif (!$this->url) {
@@ -243,9 +243,9 @@ class Request
* @param string $url URL地址 * @param string $url URL地址
* @return string * @return string
*/ */
public function baseUrl($url = '') public function baseUrl($url = null)
{ {
if (is_string($url) && !empty($url)) { if (!is_null($url) && true !== $url) {
$this->baseUrl = $url; $this->baseUrl = $url;
return $this; return $this;
} elseif (!$this->baseUrl) { } elseif (!$this->baseUrl) {
@@ -261,9 +261,9 @@ class Request
* @param string $file 当前执行的文件 * @param string $file 当前执行的文件
* @return string * @return string
*/ */
public function baseFile($file = '') public function baseFile($file = null)
{ {
if (is_string($file) && !empty($file)) { if (!is_null($file) && true !== $file) {
$this->baseFile = $file; $this->baseFile = $file;
return $this; return $this;
} elseif (!$this->baseFile) { } elseif (!$this->baseFile) {
@@ -293,9 +293,9 @@ class Request
* @param string $url URL地址 * @param string $url URL地址
* @return string * @return string
*/ */
public function root($url = '') public function root($url = null)
{ {
if (is_string($url) && !empty($url)) { if (!is_null($url) && true !== $url) {
$this->root = $url; $this->root = $url;
return $this; return $this;
} elseif (!$this->root) { } elseif (!$this->root) {