Commit Graph

624 Commits

Author SHA1 Message Date
huangdijia
e4a66b73b6 优化Response类,兼容rest控制器 2015-12-23 18:20:49 +08:00
huangdijia
541553f3bc 规范Response中result/success/error方法使用,与view使用方法保持一致,同时完美兼容单元测试
使用方法:
if(false){
    return Response::error('error msg');
}else{
    return Response::success('success msg');
}
2015-12-23 14:04:40 +08:00
huangdijia
843a726203 规范Response中result/success/error方法使用,与view使用方法保持一致,同时完美兼容单元测试
使用方法:
if(false){
    return Response::error('error msg');
}else{
    return Response::success('success msg');
}
2015-12-23 13:59:56 +08:00
huangdijia
f5f6dde8fb 恢复Response::success()、Response::error()中调用self::send()方法,保证当前退出。 2015-12-23 13:17:15 +08:00
huangdijia
df3b726f7f 改进Response::success及Response::error方法 2015-12-23 13:06:19 +08:00
huangdijia
2105b00126 优化Response::isExit()、Response::success()、Response::error() 2015-12-23 11:04:40 +08:00
thinkphp
7ecfdaf41c Merge branch 'master' of https://github.com/top-think/think 2015-12-23 10:38:07 +08:00
thinkphp
ca79fbb875 修正template和taglib类的session标签解析 2015-12-23 10:37:33 +08:00
thinkphp
61a52319e2 默认输出类型修改 2015-12-23 00:01:35 +08:00
thinkphp
633a086950 response类调整 data type 可以单独设置 2015-12-22 23:40:45 +08:00
thinkphp
daf7d3adbe Merge branch 'master' of https://github.com/top-think/think 2015-12-22 21:42:21 +08:00
ThinkPHP
dbb35b8061 Merge pull request #122 from pwf0112/master
route.php配置项无法自动加载
2015-12-22 21:40:58 +08:00
thinkphp
f9e190bc42 Merge branch 'master' of https://github.com/top-think/think 2015-12-22 21:37:00 +08:00
huangdijia
e5ecdde9dc 同步Response::success()和Response::error() 2015-12-22 18:39:10 +08:00
thinkphp
52821b9b17 Merge branch 'master' of https://github.com/top-think/think 2015-12-22 17:44:30 +08:00
thinkphp
38f7e25c82 returnData如果type参数为空处理 2015-12-22 17:42:53 +08:00
huangdijia
2c6b984438 统一命名空间规范 2015-12-22 17:42:00 +08:00
pwf0112
6b48bb5b9f route.php配置项无法自动加载 2015-12-22 16:59:05 +08:00
thinkphp
435ad7bc75 rest控制器扩展response方法调整 2015-12-22 16:41:34 +08:00
thinkphp
0e09711327 response类添加transform方法用于指定数据转换方法 2015-12-22 16:37:40 +08:00
thinkphp
c37aba27d7 Create类更名为Build 2015-12-22 15:55:52 +08:00
thinkphp
4d53e9bc19 自动生成添加常量控制 2015-12-22 15:43:37 +08:00
thinkphp
9ed8ca5e17 改进response类的returnData方法 2015-12-22 15:41:16 +08:00
simon
f726fbf6d2 修改单元测试命名空间等
Changes to be committed:
	modified:   tests/framework/application/index/controller/indexTest.php
	modified:   tests/framework/thinkphp/library/think/cache/driver/apcTest.php
	new file:   tests/framework/thinkphp/library/think/cache/driver/cache_test_case.php
	modified:   tests/mock.php
	modified:   thinkphp/library/think/cache/driver/apc.php
	modified:   thinkphp/start.php
2015-12-22 15:30:39 +08:00
huangdijia
a71ed560de 简化App::run(),省去参数$config 2015-12-22 15:25:38 +08:00
huangdijia
d28dbf644e 简化两处写法 2015-12-22 15:18:25 +08:00
huangdijia
f6acdd1578 优化视图,支持连操作,如:
return View::getInstance(Config::get())->assign($vars)->fetch();
2015-12-22 14:18:35 +08:00
huangdijia
429af2f86b 优化视图,支持连操作,如:
return View::getInstance(Config::get())->assign($vars)->fetch();
2015-12-22 14:16:50 +08:00
huangdijia
92be99e35f 修正两处warn 2015-12-22 13:32:04 +08:00
huangdijia
bbf8c03b51 修正几处因为函数重载时参数与父类参数不同而出现的warn 2015-12-22 13:29:37 +08:00
huangdijia
743bffb381 修正一处路由的Notice 2015-12-22 13:22:49 +08:00
huangdijia
5b75506aa7 修正几处Notice错误 2015-12-22 11:59:02 +08:00
thinkphp
0e6afef0be 去掉get_client_ip调用 2015-12-22 08:05:34 +08:00
thinkphp
247b76d9c0 点语法输出自动识别 2015-12-21 23:35:59 +08:00
thinkphp
6b42f979ef 改进子域名路由 2015-12-21 22:02:36 +08:00
thinkphp
2c0240cd42 修正一处配置参数名称 2015-12-21 21:50:31 +08:00
thinkphp
362be0ae3e 修正URL生成对子域名部署的支持 2015-12-21 21:27:42 +08:00
thinkphp
46fdf4aa14 修正扩展配置文件的读取 2015-12-21 19:38:01 +08:00
thinkphp
c2ac463a5c 配置修改 缓存驱动增加目录多级创建 2015-12-21 19:13:33 +08:00
thinkphp
ab5f408e50 优化写法 2015-12-21 18:00:15 +08:00
thinkphp
4d735fb03e 改进日志类的trace驱动 2015-12-21 17:53:22 +08:00
huangdijia
c0ef3e48a6 改进日志类型为trace并请求类型为ajax的情况下,不返回log信息 2015-12-21 15:51:14 +08:00
huangdijia
a1184f4930 优化 多语言 2015-12-21 12:03:34 +08:00
huangdijia
050735d8c9 优化多语言支持,url参数变量及cookie名称可通过配置更换 2015-12-21 11:29:26 +08:00
thinkphp
2bd097072b 增加lang目录 2015-12-21 08:40:07 +08:00
thinkphp
e2bf69ddb1 规范日志记录级别 2015-12-21 08:37:09 +08:00
thinkphp
b209bf5978 修正layout解析模板 2015-12-21 07:43:48 +08:00
thinkphp
5fa4e48c0d 注释修正 2015-12-20 22:23:39 +08:00
thinkphp
b1624fc2c9 数据库和缓存读写计数调整 增加页面Trace日志驱动(需要设置'response_exit'=>false) Log::record方法支持字符串之外的变量输出 2015-12-20 22:22:45 +08:00
thinkphp
40153f4fd8 改进template类的parseTemplateFile方法 支持读取当前主题 2015-12-20 19:13:15 +08:00