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

添加lang类单元测试

Browse Source
This commit is contained in:
thinkphp
2016-02-28 13:41:16 +08:00
parent 8d79e07dc5
commit 58eebe7763
5 changed files with 73 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/think/App.php
View File

@@ -153,8 +153,7 @@ class App
{
$args = [];
// 判断数组类型 数字数组时按顺序绑定参数
$keys = array_keys($vars);
$type = array_keys($keys) === $keys ? 1 : 0;
$type = key($vars) === 0 ? 1 : 0;
if ($reflect->getNumberOfParameters() > 0) {
$params = $reflect->getParameters();
foreach ($params as $param) {

7
library/think/Lang.php
View File

@@ -94,7 +94,7 @@ class Lang
}
$key = strtolower($name);
$value = isset(self::$lang[$range][$key]) ? self::$lang[$range][$key] : $name;
// 变量解析
if (!empty($vars) && is_array($vars)) {
/**
@@ -104,7 +104,7 @@ class Lang
*/
if (key($vars) === 0) {
// 数字索引解析
array_unshift($vars, $name);
array_unshift($vars, $value);
$value = call_user_func_array('sprintf', $vars);
} else {
// 关联索引解析
@@ -114,8 +114,7 @@ class Lang
}
$value = str_replace($replace, $vars, $value);
}
}
return $value;
}

3
library/think/Model.php
View File

@@ -536,8 +536,7 @@ class Model
// 根据主键查询
if (is_array($options)) {
// 判断是否索引数组
$keys = array_keys($options);
if (array_keys($keys) === $keys) {
if (key($options) === 0) {
$where[$pk] = ['in', $options];
} else {
return;

4
tests/thinkphp/library/think/lang/lang.php Normal file
View File

@@ -0,0 +1,4 @@
<?php
return [
'load'=>'加载',
];

64
tests/thinkphp/library/think/langTest.php Normal file
View File

@@ -0,0 +1,64 @@
<?php
// +----------------------------------------------------------------------
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
// +----------------------------------------------------------------------
// | Copyright (c) 2006~2016 http://thinkphp.cn All rights reserved.
// +----------------------------------------------------------------------
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
// +----------------------------------------------------------------------
// | Author: liu21st <liu21st@gmail.com>
// +----------------------------------------------------------------------
/**
* Lang测试
* @author liu21st <liu21st@gmail.com>
*/
namespace tests\thinkphp\library\think;
use think\Lang;
use think\Config;
class langTest extends \PHPUnit_Framework_TestCase
{
public function testSetAndGet(){
Lang::set('hello,%s','欢迎,%s');
$this->assertEquals('欢迎,ThinkPHP',Lang::get('hello,%s',['ThinkPHP']) );
Lang::set('hello,%s','歡迎,%s','zh-tw');
$this->assertEquals('歡迎,ThinkPHP',Lang::get('hello,%s',['ThinkPHP'],'zh-tw') );
Lang::set(['hello'=>'欢迎','use'=>'使用']);
$this->assertEquals('欢迎',Lang::get('hello') );
$this->assertEquals('欢迎',Lang::get('HELLO') );
$this->assertEquals('使用',Lang::get('use') );
}
public function testLoad(){
Lang::load(__DIR__.DS.'lang'.DS.'lang.php');
$this->assertEquals('加载',Lang::get('load') );
Lang::load(__DIR__.DS.'lang'.DS.'lang.php','test');
$this->assertEquals('加载',Lang::get('load',[],'test') );
}
public function testDetect(){
Config::set('lang_list',['zh-cn','zh-tw']);
Lang::set('hello','欢迎','zh-cn');
Lang::set('hello','歡迎','zh-tw');
/*
$_GET['lang'] = 'zh-tw';
Lang::detect();
$this->assertEquals('歡迎',Lang::get('hello') );*/
$_GET['lang'] = 'zh-cn';
Lang::detect();
$this->assertEquals('欢迎',Lang::get('hello') );
}
public function testRange(){
Lang::set('hello','欢迎','test');
Lang::range('test');
$this->assertEquals('欢迎',Lang::get('hello') );
}
}