From 7609595eba8b0851be9e7c397fbcded1cd7735e7 Mon Sep 17 00:00:00 2001 From: thinkphp Date: Fri, 29 Jan 2016 12:21:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BInput=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/Input.php | 28 +++++++-------- tests/thinkphp/library/think/inputTest.php | 41 +++++++++++----------- 2 files changed, 34 insertions(+), 35 deletions(-) diff --git a/library/think/Input.php b/library/think/Input.php index 25072c88..9610bbe7 100644 --- a/library/think/Input.php +++ b/library/think/Input.php @@ -26,7 +26,7 @@ class Input */ public static function get($name = '', $default = null, $filter = null, $merge = false) { - return self::data($name, $default, $filter, $merge, $_GET); + return self::data($_GET, $name, $default, $filter, $merge); } /** @@ -39,7 +39,7 @@ class Input */ public static function post($name = '', $default = null, $filter = null, $merge = false) { - return self::data($name, $default, $filter, $merge, $_POST); + return self::data($_POST, $name, $default, $filter, $merge); } /** @@ -56,7 +56,7 @@ class Input if (is_null($_PUT)) { parse_str(file_get_contents('php://input'), $_PUT); } - return self::data($name, $default, $filter, $merge, $_PUT); + return self::data($_PUT, $name, $default, $filter, $merge); } /** @@ -92,7 +92,7 @@ class Input */ public static function request($name = '', $default = null, $filter = null, $merge = false) { - return self::data($name, $default, $filter, $merge, $_REQUEST); + return self::data($_REQUEST, $name, $default, $filter, $merge); } /** @@ -105,7 +105,7 @@ class Input */ public static function session($name = '', $default = null, $filter = null, $merge = false) { - return self::data($name, $default, $filter, $merge, $_SESSION); + return self::data($_SESSION, $name, $default, $filter, $merge); } /** @@ -118,7 +118,7 @@ class Input */ public static function cookie($name = '', $default = null, $filter = null, $merge = false) { - return self::data($name, $default, $filter, $merge, $_COOKIE); + return self::data($_COOKIE, $name, $default, $filter, $merge); } /** @@ -131,7 +131,7 @@ class Input */ public static function server($name = '', $default = null, $filter = null, $merge = false) { - return self::data(strtoupper($name), $default, $filter, $merge, $_SERVER); + return self::data($_SERVER, strtoupper($name), $default, $filter, $merge); } /** @@ -144,7 +144,7 @@ class Input */ public static function globals($name = '', $default = null, $filter = null, $merge = false) { - return self::data($name, $default, $filter, $merge, $GLOBALS); + return self::data($GLOBALS, $name, $default, $filter, $merge); } /** @@ -157,7 +157,7 @@ class Input */ public static function env($name = '', $default = null, $filter = null, $merge = false) { - return self::data(strtoupper($name), $default, $filter, $merge, $_ENV); + return self::data($_ENV, strtoupper($name), $default, $filter, $merge); } /** @@ -173,7 +173,7 @@ class Input if (!empty($_SERVER['PATH_INFO'])) { $depr = \think\Config::get('pathinfo_depr'); $input = explode($depr, trim($_SERVER['PATH_INFO'], $depr)); - return self::data($name, $default, $filter, $merge, $input); + return self::data($input, $name, $default, $filter, $merge); } else { return $default; } @@ -189,19 +189,19 @@ class Input */ public static function file($name = '', $default = null, $filter = null, $merge = false) { - return self::data($name, $default, $filter, $merge, $_FILES); + return self::data($_FILES, $name, $default, $filter, $merge); } /** - * 获取系统变量 支持过滤和默认值 + * 获取变量 支持过滤和默认值 + * @param array $input 数据源 * @param string $name 字段名 * @param mixed $default 默认值 * @param mixed $filter 过滤函数 * @param boolean $merge 是否与默认的过虑方法合并 - * @param array $input 数据源 * @return mixed */ - public static function data($name, $default = null, $filter = null, $merge = false, $input = null) + public static function data($input, $name, $default = null, $filter = null, $merge = false) { if (0 === strpos($name, '?')) { return self::has(substr($name, 1), $input); diff --git a/tests/thinkphp/library/think/inputTest.php b/tests/thinkphp/library/think/inputTest.php index e1855635..096ba3fa 100644 --- a/tests/thinkphp/library/think/inputTest.php +++ b/tests/thinkphp/library/think/inputTest.php @@ -24,17 +24,16 @@ class inputTest extends \PHPUnit_Framework_TestCase public function testInputName() { $input = ['a' => 'a', 'b' => ['c' => [' one ', 'two']]]; - $this->assertEquals($input, Input::data('', '', '', false, $input)); - $this->assertEquals($input['a'], Input::data('a', '', '', false, $input)); - $this->assertEquals('one', Input::data('b.c.0/s', 'default', 'trim', false, $input)); + $this->assertEquals($input, Input::data($input)); + $this->assertEquals($input['a'], Input::data($input, 'a')); + $this->assertEquals('one', Input::data($input, 'b.c.0/s', 'default', 'trim')); } public function testDefaultValue() { $input = ['a' => 'test']; $default = 'default'; - $this->assertEquals($default, Input::data($input['b'], $default)); - $this->assertEquals($default, Input::data($input, $default, '', false, $input)); + $this->assertEquals($default, Input::data($input, 'b', $default)); $this->assertEquals($default, Input::get('a', $default)); } @@ -42,25 +41,25 @@ class inputTest extends \PHPUnit_Framework_TestCase { $input = ['a' => ' test ', 'b' => ' test<> ']; $filters = 'trim'; - $this->assertEquals('test', Input::data('a', '', $filters, false, $input)); + $this->assertEquals('test', Input::data($input, 'a', '', $filters)); $filters = 'trim,htmlspecialchars'; - $this->assertEquals('test<>', Input::data('b', '', $filters, false, $input)); + $this->assertEquals('test<>', Input::data($input, 'b', '', $filters)); } public function testArrayFilter() { $input = ['a' => ' test ', 'b' => ' test<> ']; $filters = ['trim']; - $this->assertEquals('test', Input::data('a', '', $filters, false, $input)); + $this->assertEquals('test', Input::data($input, 'a', '', $filters)); $filters = ['trim', 'htmlspecialchars']; - $this->assertEquals('test<>', Input::data('b', '', $filters, false, $input)); + $this->assertEquals('test<>', Input::data($input, 'b', '', $filters)); } public function testFilterExp() { $src = 'EXP|NEQ|GT|EGT|LT|ELT|OR|XOR|LIKE|NOTLIKE|NOT BETWEEN|NOTBETWEEN|BETWEEN|NOTIN|NOT IN|IN'; $regexs = explode('|', $src); - $data = Input::data('', '', '', false, $regexs); + $data = Input::data($regexs); foreach ($regexs as $key => $value) { $expected = $value . ' '; $this->assertEquals($expected, $data[$key]); @@ -71,11 +70,11 @@ class inputTest extends \PHPUnit_Framework_TestCase { $input = ['a' => 'test1', 'b' => '_test2', 'c' => '']; $filters = '/^test/'; - $this->assertEquals('test1', Input::data('a', '', $filters, false, $input)); + $this->assertEquals('test1', Input::data($input, 'a', '', $filters)); $default = 'default value'; - $this->assertEquals($default, Input::data('b', $default, $filters, false, $input)); + $this->assertEquals($default, Input::data($input, 'b', $default, $filters)); $filters = '/.+/'; - $this->assertEquals('default value', Input::data('c', $default, $filters, false, $input)); + $this->assertEquals('default value', Input::data($input, 'c', $default, $filters)); } public function testFiltrateWithFilterVar() @@ -85,10 +84,10 @@ class inputTest extends \PHPUnit_Framework_TestCase $default = false; $input = ['a' => $email, 'b' => $error]; $filters = FILTER_VALIDATE_EMAIL; - $this->assertEquals($email, Input::data('a', '', $filters, false, $input)); - $this->assertFalse(Input::data('b', $default, $filters, false, $input)); + $this->assertEquals($email, Input::data($input, 'a', '', $filters)); + $this->assertFalse(Input::data($input, 'b', $default, $filters)); $filters = 'validate_email'; - $this->assertFalse(Input::data('b', $default, $filters, false, $input)); + $this->assertFalse(Input::data($input, 'b', $default, $filters)); } public function testAllInput() @@ -110,7 +109,7 @@ class inputTest extends \PHPUnit_Framework_TestCase 'e' => 'NEQ ', 'f' => 'gt ', ]; - $this->assertEquals($excepted, Input::data('', '', $filters, false, $input)); + $this->assertEquals($excepted, Input::data($input, '', '', $filters)); } public function testTypeCast() @@ -184,12 +183,12 @@ class inputTest extends \PHPUnit_Framework_TestCase { Input::setFilter('htmlspecialchars'); $input = ['a' => ' test<> ', 'b' => '']; - $this->assertEquals(' test<> ', Input::data('a', '', '', false, $input)); + $this->assertEquals(' test<> ', Input::data($input, 'a', '', '')); $filters = ['trim']; - $this->assertEquals('test<>', Input::data('a', '', $filters, false, $input)); - $this->assertEquals('test<>', Input::data('a', '', $filters, true, $input)); + $this->assertEquals('test<>', Input::data($input, 'a', '', $filters)); + $this->assertEquals('test<>', Input::data($input, 'a', '', $filters, true)); $filters = 'stripslashes'; - $this->assertEquals("<bar />", Input::data('b', '', $filters, true, $input)); + $this->assertEquals("<bar />", Input::data($input, 'b', '', $filters, true)); } }