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

改进Input类和Request类的session获取

Browse Source
This commit is contained in:
thinkphp
2016-06-07 17:05:01 +08:00
parent ee7ef63c00
commit 451e7f0dda
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/Input.php
View File

@@ -13,6 +13,7 @@ namespace think;
use think\Config; use think\Config;
use think\File; use think\File;
use think\Session;
class Input class Input
{ {
@@ -129,10 +130,7 @@ class Input
*/ */
public static function session($name = '', $default = null, $filter = null, $merge = false) public static function session($name = '', $default = null, $filter = null, $merge = false)
{ {
if (PHP_SESSION_DISABLED == session_status()) { return self::data(Session::get(), $name, $default, $filter, $merge);
session_start();
}
return self::data($_SESSION, $name, $default, $filter, $merge);
} }
/** /**

6
library/think/Request.php
View File

@@ -13,6 +13,7 @@ namespace think;
use think\Config; use think\Config;
use think\Input; use think\Input;
use think\Session;
class Request class Request
{ {
@@ -632,10 +633,7 @@ class Request
*/ */
public function session($name = '') public function session($name = '')
{ {
if (PHP_SESSION_DISABLED == session_status()) { return Input::data($this->session ?: Session::get(), $name);
session_start();
}
return Input::data($this->session ?: $_SESSION, $name);
} }
/** /**

2
tests/thinkphp/library/think/loaderTest.php
View File

@@ -23,8 +23,6 @@ class loaderTest extends \PHPUnit_Framework_TestCase
public function testAutoload() public function testAutoload()
{ {
$this->assertEquals(true, Loader::autoload('think\Session'));
//$this->assertEquals(false, Loader::autoload('think\COOKIE'));
$this->assertEquals(false, Loader::autoload('\think\Url')); $this->assertEquals(false, Loader::autoload('\think\Url'));
$this->assertEquals(false, Loader::autoload('think\Test')); $this->assertEquals(false, Loader::autoload('think\Test'));
$this->assertEquals(false, Loader::autoload('my\HelloTest')); $this->assertEquals(false, Loader::autoload('my\HelloTest'));