diff --git a/tests/thinkphp/library/think/config/ConfigInitTrait.php b/tests/thinkphp/library/think/config/ConfigInitTrait.php index 79bfd066..0af031f9 100644 --- a/tests/thinkphp/library/think/config/ConfigInitTrait.php +++ b/tests/thinkphp/library/think/config/ConfigInitTrait.php @@ -34,11 +34,11 @@ trait ConfigInitTrait { self::$internalConfigFoo = \Closure::bind(function($value = null) { return !is_null($value) ? Config::$config = $value : Config::$config; - }, null, Config::class); + }, null, '\\Think\\Config'); self::$internalRangeFoo = \Closure::bind(function($value = null) { return !is_null($value) ? Config::$range = $value : Config::$range; - }, null, Config::class); + }, null, '\\Think\\Config'); self::$originConfig = call_user_func(self::$internalConfigFoo); self::$originRange = call_user_func(self::$internalRangeFoo); diff --git a/tests/thinkphp/library/think/requestTest.php b/tests/thinkphp/library/think/requestTest.php index f86546e6..3da94a2e 100644 --- a/tests/thinkphp/library/think/requestTest.php +++ b/tests/thinkphp/library/think/requestTest.php @@ -157,15 +157,31 @@ class requestTest extends \PHPUnit_Framework_TestCase public function testIsAjax() { - $request = Request::create(''); + $request = Request::create(''); + + $this->assertFalse($request->isAjax()); + $_SERVER['HTTP_X_REQUESTED_WITH'] = 'xmlhttprequest'; + $this->assertFalse($request->isAjax()); + $this->assertFalse($request->isAjax(true)); + + $request->server(['HTTP_X_REQUESTED_WITH' => 'xmlhttprequest']); $this->assertTrue($request->isAjax()); } public function testIsPjax() { - $request = Request::create(''); + $request = Request::create(''); + + $this->assertFalse($request->isPjax()); + $_SERVER['HTTP_X_PJAX'] = true; + $this->assertFalse($request->isPjax()); + $this->assertFalse($request->isPjax(true)); + + $request->server(['HTTP_X_PJAX' => true]); + $this->assertTrue($request->isPjax()); + $request->server(['HTTP_X_PJAX' => false]); $this->assertTrue($request->isPjax()); }