Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
615 commits
Select commit Hold shift + click to select a range
71bce4c
改进Validate类
liu21st Mar 6, 2016
de11f8c
简化validate类
liu21st Mar 6, 2016
e002d16
修正
liu21st Mar 6, 2016
92c707a
Validate类serialize方法支持二级
liu21st Mar 7, 2016
7a0a474
Update Redis.php
Mar 7, 2016
64591e8
Merge pull request #359 from 5ini99/patch-10
kinosang Mar 7, 2016
85ae960
瀹屽杽File缂撳瓨椹卞姩鍗曞厓娴嬭瘯
Mar 7, 2016
bd09948
澧炲姞Memcache缂撳瓨椹卞姩
Mar 7, 2016
3169f10
澧炲姞test缂撳瓨椹卞姩娴嬭瘯
Mar 7, 2016
1c8958b
Validate类支持读取模型类的属性定义完成验证
liu21st Mar 7, 2016
ae841b4
Merge branch 'master' of https://github.com/top-think/think
liu21st Mar 7, 2016
594a844
Merge pull request #358 from chunice/master
liu21st Mar 7, 2016
af67078
增加db_attr_case配置参数 用于配置 数据表字段大小写规则
liu21st Mar 7, 2016
b2a90cd
Merge branch 'master' of https://github.com/top-think/think
liu21st Mar 7, 2016
cdfa6fb
自动填充移出Validate类
liu21st Mar 7, 2016
aefb5dd
修正W助手函数
liu21st Mar 8, 2016
398e648
taglib 增加一个U函数的tag
pakey Mar 9, 2016
c55da87
代码格式化
pakey Mar 9, 2016
4574336
Merge pull request #364 from pakey/master
liu21st Mar 9, 2016
2545351
修改File缓存驱动 默认path参数为 CACHE_PATH
liu21st Mar 9, 2016
dff49b1
修正memcached缓存驱动的有效期
liu21st Mar 9, 2016
9b538b5
sae模式配置调整
liu21st Mar 10, 2016
d9fcaca
修正traits\model\Auto
liu21st Mar 10, 2016
fda3bde
Merge branch 'master' of https://github.com/top-think/think
liu21st Mar 10, 2016
f929f0f
版本更新
liu21st Mar 10, 2016
f4c145e
单元测试修正
liu21st Mar 10, 2016
97a3ba3
readme更新
liu21st Mar 11, 2016
9b994f3
修复undefined index:extra
leunggamciu Mar 11, 2016
1060097
优代部分代码;block标签内可以使用{__block__}来引用所继承模板中相应block标签的内容;
Mar 11, 2016
403324c
Merge pull request #373 from oldrind/template
liu21st Mar 11, 2016
3bb8891
Merge pull request #371 from leunggamciu/fix_undefined_index_extra
liu21st Mar 11, 2016
ab798d1
修正Response的一处问题
liu21st Mar 11, 2016
4332900
修正模板缓存问题
Mar 12, 2016
4f88db5
Merge pull request #374 from oldrind/template
liu21st Mar 12, 2016
4cd637a
改进Trace日志驱动 支持配置 trace_tabs参数
liu21st Mar 12, 2016
233ee53
改进session函数支持判断是否赋值操作 修正response类success方法
liu21st Mar 12, 2016
b0782ab
修复模板更新后不更新缓存的问题
Mar 12, 2016
b80322b
Merge pull request #375 from oldrind/template
liu21st Mar 12, 2016
442a619
多维数组的点语法支持数字键值
hugtale Mar 12, 2016
73460e7
Merge pull request #376 from hugtale/master
liu21st Mar 13, 2016
5bc53ba
修正 模板解析路径
liu21st Mar 13, 2016
628be72
修正Oracle驱动
liu21st Mar 13, 2016
2a2bf10
改进View类
liu21st Mar 13, 2016
14559c1
改进View类的模板引擎配置
liu21st Mar 13, 2016
a9b6d04
替换T函数
hugtale Mar 13, 2016
642d2a9
View类engine参数更改为view_engine 避免冲突
liu21st Mar 14, 2016
38dd9d1
修正单元测试
liu21st Mar 14, 2016
8ae543e
修正
liu21st Mar 14, 2016
2bc63b5
Merge pull request #379 from hugtale/master
liu21st Mar 14, 2016
d9bb908
View类优化
liu21st Mar 14, 2016
ced44ac
Merge branch 'master' of https://github.com/top-think/think
liu21st Mar 14, 2016
ed3cb7c
改进Config类
liu21st Mar 14, 2016
5bc1fd2
修正config类一处bug
liu21st Mar 14, 2016
502dc2c
改进View类对模板引擎的初始化
liu21st Mar 14, 2016
079a7de
继续改进
liu21st Mar 14, 2016
2dacc97
改进部署模式下异常日志记录详细错误信息
liu21st Mar 14, 2016
d33a9be
改进异常页面显示
liu21st Mar 14, 2016
b94475f
异常模板调整
liu21st Mar 15, 2016
58d3760
修改测试文件
Mar 15, 2016
2a93a2b
Revert "修改测试文件"
Mar 15, 2016
458d204
瀹屽杽妗嗘灦鎯緥閰嶇疆鏂囦欢娉ㄩ噴
Mar 15, 2016
60275e7
改进View类和Template类 简化模板主题(取消自动侦测) 当前主题作为view_path传入template 模板标签中可以使用 …
liu21st Mar 15, 2016
47d8224
模板引擎参数采用template二级配置
liu21st Mar 15, 2016
f76ec74
修正
liu21st Mar 15, 2016
945defb
Merge pull request #386 from chunice/master
liu21st Mar 15, 2016
a325542
改进View 避免手动初始化engine的时候 view_path为空值
liu21st Mar 15, 2016
fdde08c
Merge branch 'master' of https://github.com/top-think/think
liu21st Mar 15, 2016
82ef0f5
修正View类模板定位
liu21st Mar 15, 2016
11e973e
修正单元测试
liu21st Mar 15, 2016
d9f0811
改进模板变量赋值
liu21st Mar 15, 2016
5b2b9f1
修复错别字
leunggamciu Mar 15, 2016
146eebc
Merge pull request #387 from leunggamciu/fix_typo
liu21st Mar 16, 2016
c5fb836
修正模板文件
liu21st Mar 16, 2016
efdf549
修正
liu21st Mar 16, 2016
4bf8593
修正单元测试
liu21st Mar 16, 2016
5d8062e
修正单元测试
liu21st Mar 16, 2016
617ea10
优化2处写法
huangdijia Mar 16, 2016
063e32f
修正
liu21st Mar 16, 2016
f9940d0
Merge branch 'master' of https://github.com/top-think/think
liu21st Mar 16, 2016
b17d2dc
修正template类的模板解析方法
liu21st Mar 16, 2016
8074889
Merge branch 'master' of https://github.com/top-think/think
Mar 16, 2016
da9647f
改进默认模板引擎的设置 如果没有设置 template.type 或者为空 默认为think
liu21st Mar 16, 2016
9e0c714
保证$_REQUEST正常取值
liu21st Mar 17, 2016
04c291b
Merge branch 'master' of https://github.com/top-think/think
Mar 17, 2016
d51158d
修正block标签的bug
Mar 17, 2016
d108069
Merge pull request #396 from oldrind/template
kinosang Mar 17, 2016
fc56417
修复内置模版引擎无法自动获取静态缓存的问题
hugtale Mar 17, 2016
e6b183d
Merge pull request #400 from hugtale/master
liu21st Mar 18, 2016
78bc94c
修正error_page配置无效的问题
liu21st Mar 18, 2016
c650800
Merge branch 'master' of https://github.com/top-think/think
liu21st Mar 18, 2016
8bbb7c3
修复php标签合并时输出标签间的空格也被合并的bug
Mar 18, 2016
ff2e9d3
Merge pull request #405 from oldrind/template
liu21st Mar 18, 2016
d88ea37
修正phpdoc注释
leunggamciu Mar 19, 2016
7df0530
Merge pull request #406 from leunggamciu/fix-phpdoc
kinosang Mar 19, 2016
9954a78
改写Validate类和单元测试
liu21st Mar 19, 2016
4d629a7
Merge branch 'master' of https://github.com/top-think/think
liu21st Mar 19, 2016
4879a81
修正Validate类message方法
liu21st Mar 19, 2016
48f7e3a
改进model类的validate方法
liu21st Mar 19, 2016
38a173a
validate类完善 controller和model类的validate方法支持传入提示信息 model类的validate方法支持指…
liu21st Mar 20, 2016
6e5276c
验证器类支持公共目录定义 修正Route类单一模块下面GET变量获取错误的BUG
liu21st Mar 20, 2016
144cee6
验证类型规则支持使用别名 例如
liu21st Mar 20, 2016
4f91fc2
改进model的validate方法
liu21st Mar 20, 2016
55f8c91
validate类的extend方法支持批量设置 修正单元测试
liu21st Mar 20, 2016
3748a18
修正
pwf0112 Mar 20, 2016
826812d
Merge pull request #408 from pwf0112/master
kinosang Mar 20, 2016
174a522
验证方法和规则统一使用 驼峰法
liu21st Mar 20, 2016
9f1cc25
添加console的MIT开源许可
yunwuxin Mar 20, 2016
7f2e563
改进validate类的unique规则
liu21st Mar 20, 2016
87a1b2e
添加默认的规则提示信息
liu21st Mar 20, 2016
0ce912e
validate类增加setTypeMsg方法用于设置验证规则的默认提示信息
liu21st Mar 20, 2016
a811813
简化验证规则的默认提示信息定义
liu21st Mar 20, 2016
ac62c0d
完善提示信息
liu21st Mar 20, 2016
9662f6c
修正unique验证规则
liu21st Mar 20, 2016
599bfde
优化unique方法的查询
liu21st Mar 20, 2016
8f7df2d
规则说明改进
liu21st Mar 21, 2016
b06b68c
删除 Model类的rule属性 验证规则支持直接传入提示信息 采用 [field,rule,msg] 的方式定义 所有验证规则只在 值不…
liu21st Mar 21, 2016
edb2f82
修正
liu21st Mar 21, 2016
e4e0534
修正单元测试
liu21st Mar 21, 2016
7076a8f
增加 default_validate 参数 用于设置默认的验证器名(用于controller和model的validate方法) 控制器…
liu21st Mar 21, 2016
27b9a38
controller和model类的validate方法支持指定场景 例如 $this->validate('User.edit');
liu21st Mar 21, 2016
ffa9b69
validate的场景可以使用回调方法(支持闭包)而不是固定的字段
liu21st Mar 21, 2016
ab54adf
修正
liu21st Mar 21, 2016
a44d6c8
改进validate类的验证规则错误提示信息获取
liu21st Mar 21, 2016
f88449c
修正Model类order方法一处bug,优化改进视图模型
Mar 21, 2016
54b985c
validate自定义错误信息支持数组
liu21st Mar 21, 2016
9150165
改进validate类的unique验证规则的条件
liu21st Mar 21, 2016
d78f8c6
改进unique验证规则的复合主键导致的错误 复合主键的情况直接使用条件判断表达式
liu21st Mar 21, 2016
cf0831a
修正一处错误
liu21st Mar 21, 2016
59f3bf7
Merge pull request #413 from oldrind/master
liu21st Mar 21, 2016
c1bb549
提高runtime的计算精度 避免吞吐率出现Division by zero错误
liu21st Mar 22, 2016
f0c0058
改进PUT请求获取不到GET参数的问题
liu21st Mar 22, 2016
2059162
完善modelTest
liu21st Mar 22, 2016
2cd3dd9
修正单元测试
liu21st Mar 22, 2016
f5a113f
增加dbTest
liu21st Mar 22, 2016
e8f4b27
修正debugTest
liu21st Mar 22, 2016
bcf68ef
controllerTest增加validate测试
liu21st Mar 22, 2016
003b07c
完善validateTest
liu21st Mar 22, 2016
ee20f5a
完善validateTest
liu21st Mar 22, 2016
184c7cc
修正validate类的unique规则使用多字段检测
liu21st Mar 22, 2016
1263666
完善loaderTest
liu21st Mar 22, 2016
116dfac
完善loaderTest
liu21st Mar 22, 2016
70e775b
修正单元测试
liu21st Mar 22, 2016
4b3614c
简化validate
liu21st Mar 22, 2016
7eeecf1
增加应用的环境变量配置文件 增加ROOT_PATH常量定义 runtime目录默认移到ROOT_PATH录下面
liu21st Mar 23, 2016
16799e2
完善console
yunwuxin Mar 23, 2016
676422c
Merge remote-tracking branch 'origin/master'
yunwuxin Mar 23, 2016
b8d9516
环境变量读取改成getenv方法
liu21st Mar 23, 2016
1351fac
默认的环境变量前缀 改成 PHP_
liu21st Mar 23, 2016
ee32001
自动根据环境变量识别是否调试模式
liu21st Mar 23, 2016
77f01af
调整Loader::addNamespace方法的位置 修正configTest
liu21st Mar 23, 2016
b9c16fc
Merge remote-tracking branch 'origin/master'
yunwuxin Mar 23, 2016
410a5e4
修正console
yunwuxin Mar 23, 2016
8854015
删除validate类make方法的第三个参数
liu21st Mar 24, 2016
4c72487
Merge branch 'master' of https://github.com/top-think/think
liu21st Mar 24, 2016
5c88038
框架核心独立
kinosang Mar 24, 2016
69c4b45
调整composer及入口文件
kinosang Mar 24, 2016
1af9973
自动选择加载composer autoloader或tp loader
kinosang Mar 24, 2016
de54abe
Merge pull request #427 from top-think/split
liu21st Mar 24, 2016
02284e6
清理文件和readme修改
liu21st Mar 24, 2016
32db0d3
更新 README.me
kinosang Mar 24, 2016
a86c63b
入口文件更改
liu21st Mar 26, 2016
ab36888
Merge branch 'master' of https://github.com/top-think/think
liu21st Mar 26, 2016
0848f4f
修正composer安装,完善console模式
yunwuxin Mar 28, 2016
704a895
增加 composer 安装方法说明
Mar 31, 2016
1cddb30
Merge pull request #436 from chunice/patch-1
liu21st Mar 31, 2016
a88629a
router文件移动位置
liu21st Apr 19, 2016
09480f4
默认的入口文件 开启调试模式
liu21st Apr 23, 2016
7e19a95
readme修改
liu21st Apr 23, 2016
44f2acb
改进router.php
liu21st Apr 25, 2016
2a6d459
Merge branch 'master' of https://github.com/top-think/think
liu21st Apr 25, 2016
332f414
移动router.php位置
huangdijia May 3, 2016
b9520f6
preferred-install:dist
yunwuxin May 19, 2016
b37d8b1
去除rewite的Multiviews选项
yunwuxin May 26, 2016
46dcf8f
改进console模式
yunwuxin Jun 13, 2016
e6e2703
示例配置文件调整
liu21st Jun 14, 2016
f6db179
取消APP_DEBUG 常量
liu21st Jun 15, 2016
0cceccf
调整配置文件
liu21st Jun 15, 2016
973a6c1
配置调整
liu21st Jun 15, 2016
249f13f
修正配置
liu21st Jun 20, 2016
57ad583
改进console模式 命令文件改为think
yunwuxin Jun 22, 2016
8271db9
增加runtime目录
liu21st Jun 23, 2016
bf7e40b
readme代码规范更新
liu21st Jun 23, 2016
144f18d
修正样式
yunwuxin Jun 29, 2016
bfcc69f
增加配置
yunwuxin Jun 29, 2016
15cb829
配置文件调整
liu21st Jul 1, 2016
3af8758
readme更新
liu21st Jul 1, 2016
3346c4b
更新配置
lilwil Jul 3, 2016
abecf30
Merge pull request #476 from lilwil/master
liu21st Jul 3, 2016
ab0da67
配置文件调整
liu21st Jul 3, 2016
81f63aa
配置调整
liu21st Jul 4, 2016
c1fb611
配置修改
liu21st Jul 7, 2016
b989e79
配置文件调整
liu21st Jul 9, 2016
be7e7b9
Merge branch 'master' of https://github.com/top-think/think
liu21st Jul 9, 2016
1c1a977
添加应用公共文件common.php
liu21st Jul 12, 2016
0fc03fb
配置文件调整
liu21st Jul 18, 2016
80a7389
build文件修改
liu21st Jul 18, 2016
487b787
增加单元测试示例
yunwuxin Jul 29, 2016
db3e150
示例也放入think-testing包内
yunwuxin Jul 29, 2016
56aa711
配置修改
liu21st Aug 3, 2016
9d848a8
更新配置文件
liu21st Aug 8, 2016
e398b93
配置文件更新
liu21st Aug 23, 2016
1d36ae2
添加应用默认行为扩展定义文件
liu21st Sep 1, 2016
78afa42
一处注释
lilwil Sep 7, 2016
2f04858
Merge pull request #519 from lilwil/master
liu21st Sep 7, 2016
cac2401
注释调整
liu21st Sep 15, 2016
278065d
指引开发者转向核心框架包
kinosang Sep 15, 2016
8c359ee
Update metadata badges
kinosang Sep 15, 2016
14ec011
Merge pull request #525 from top-think/update-metadata-badges
kinosang Sep 15, 2016
e7ab1a6
Merge pull request #524 from top-think/rm-contributing-md
kinosang Sep 15, 2016
e47aab0
Remove GitHub download metadata badges
kinosang Sep 15, 2016
f42f42c
Use stable version of ThinkPHP 5.0
kinosang Sep 16, 2016
35f7fe7
readme文件修改
liu21st Sep 18, 2016
5bcf9fa
Replace shields badges with pugx badges
kinosang Sep 23, 2016
8f46b48
改进命令行入口文件
liu21st Sep 23, 2016
6c1bcdc
配置更新
liu21st Sep 28, 2016
2eb65c0
添加:忽略框架目录
xiasf Oct 19, 2016
ddc4341
Merge pull request #541 from xiasf/patch-1
liu21st Oct 22, 2016
54372d6
配置调整
liu21st Oct 23, 2016
d2a01fa
配置更新
liu21st Nov 11, 2016
b64bf07
CI 自动打包
kinosang Dec 25, 2016
1793302
调整 CI 包安装
kinosang Dec 25, 2016
f1f4fcd
Apply fixes from StyleCI
liu21st Dec 26, 2016
25bc5f6
Merge pull request #594 from top-think/analysis-qyRDeN
liu21st Dec 26, 2016
67d1b31
配置调整
liu21st Jan 17, 2017
600613e
Merge branch 'master' of https://github.com/top-think/think
liu21st Jan 17, 2017
c2ba7ac
去除一些数据库配置 避免使用数据库驱动的时候影响
liu21st Feb 3, 2017
eb1d4e0
配置调整
liu21st Feb 3, 2017
6cfac53
更新
liu21st Feb 24, 2017
6d2c7ec
配置调整
liu21st Mar 20, 2017
1783221
框架引导文件改为绝对路径
tic8 May 20, 2017
162dde0
去除无用配置
liu21st May 22, 2017
02d56fd
Merge branch 'master' of https://github.com/top-think/think
liu21st May 22, 2017
cff793c
默认关闭调试模式
liu21st Jul 4, 2017
7ab81d4
更新composer.json
liu21st Jul 15, 2017
69400b6
fixed #691
ganlvtech Jul 8, 2017
3e392fe
改进composer.json
liu21st Sep 22, 2017
7ea464c
Merge branch 'master' of https://github.com/top-think/think
liu21st Oct 9, 2017
d2a67b5
修正router
liu21st Oct 23, 2017
748036b
更新
liu21st Dec 12, 2017
6930c25
Merge branch 'master' of https://github.com/top-think/think
liu21st Jan 1, 2018
429821e
composer调整
liu21st Jan 1, 2018
10edc80
更新说明
liu21st Jan 1, 2018
ec303f1
更新
liu21st Jan 31, 2018
55f6d36
readme更新
liu21st Mar 26, 2018
6089b6d
配置调整
liu21st Apr 14, 2018
fcdf196
配置调整
liu21st Apr 25, 2018
bad4bee
调整
liu21st May 11, 2018
2b9f858
增加配置
liu21st Sep 7, 2018
9cff976
添加更新日志
liu21st Dec 10, 2018
40551b4
更新日志
liu21st Jan 11, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.idea
composer.lock
*.log
thinkphp
53 changes: 28 additions & 25 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,42 @@
sudo: false

language: php

sudo: false
branches:
only:
- stable

cache:
directories:
- $HOME/.composer/cache

matrix:
fast_finish: true
include:
- php: 5.4
- php: 5.5
- php: 5.6
- php: 7.0
- php: hhvm
allow_failures:
- php: hhvm

before_install:
- composer self-update

install:
- ./thinkphp/tests/script/install.sh
- composer install --no-dev --no-interaction --ignore-platform-reqs
- zip -r --exclude='*.git*' --exclude='*.zip' --exclude='*.travis.yml' ThinkPHP_Core.zip .
- composer require --update-no-dev --no-interaction "topthink/think-image:^1.0"
- composer require --update-no-dev --no-interaction "topthink/think-migration:^1.0"
- composer require --update-no-dev --no-interaction "topthink/think-captcha:^1.0"
- composer require --update-no-dev --no-interaction "topthink/think-mongo:^1.0"
- composer require --update-no-dev --no-interaction "topthink/think-worker:^1.0"
- composer require --update-no-dev --no-interaction "topthink/think-helper:^1.0"
- composer require --update-no-dev --no-interaction "topthink/think-queue:^1.0"
- composer require --update-no-dev --no-interaction "topthink/think-angular:^1.0"
- composer require --dev --update-no-dev --no-interaction "topthink/think-testing:^1.0"
- zip -r --exclude='*.git*' --exclude='*.zip' --exclude='*.travis.yml' ThinkPHP_Full.zip .

script:
## LINT
- find thinkphp ! -path "thinkphp/vendor/*" -type f -name \*.php -exec php -l {} \;
## PHP_CodeSniffer
- thinkphp/vendor/bin/phpcs --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 --standard=PSR2 --ignore="thinkphp/vendor/*" thinkphp
## PHP Copy/Paste Detector
- thinkphp/vendor/bin/phpcpd --verbose --exclude vendor thinkphp || true
## PHPLOC
- thinkphp/vendor/bin/phploc --exclude vendor thinkphp
## PHPUNIT
- thinkphp/vendor/bin/phpunit --coverage-clover=coverage.xml --configuration=thinkphp/phpunit.xml
- php think unit

after_success:
- bash <(curl -s https://codecov.io/bash)
deploy:
provider: releases
api_key:
secure: TSF6bnl2JYN72UQOORAJYL+CqIryP2gHVKt6grfveQ7d9rleAEoxlq6PWxbvTI4jZ5nrPpUcBUpWIJHNgVcs+bzLFtyh5THaLqm39uCgBbrW7M8rI26L8sBh/6nsdtGgdeQrO/cLu31QoTzbwuz1WfAVoCdCkOSZeXyT/CclH99qV6RYyQYqaD2wpRjrhA5O4fSsEkiPVuk0GaOogFlrQHx+C+lHnf6pa1KxEoN1A0UxxVfGX6K4y5g4WQDO5zT4bLeubkWOXK0G51XSvACDOZVIyLdjApaOFTwamPcD3S1tfvuxRWWvsCD5ljFvb2kSmx5BIBNwN80MzuBmrGIC27XLGOxyMerwKxB6DskNUO9PflKHDPI61DRq0FTy1fv70SFMSiAtUv9aJRT41NQh9iJJ0vC8dl+xcxrWIjU1GG6+l/ZcRqVx9V1VuGQsLKndGhja7SQ+X1slHl76fRq223sMOql7MFCd0vvvxVQ2V39CcFKao/LB1aPH3VhODDEyxwx6aXoTznvC/QPepgWsHOWQzKj9ftsgDbsNiyFlXL4cu8DWUty6rQy8zT2b4O8b1xjcwSUCsy+auEjBamzQkMJFNlZAIUrukL/NbUhQU37TAbwsFyz7X0E/u/VMle/nBCNAzgkMwAUjiHM6FqrKKBRWFbPrSIixjfjkCnrMEPw=
file:
- ThinkPHP_Core.zip
- ThinkPHP_Full.zip
skip_cleanup: true
on:
tags: true
Loading