Update Upstream #2
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
0746832 Fix Http Client Travis Failed (#183) e36a870 Fix swoft-cloud/swoft#301 (#182) e5c4ecb Update HttpCoResult.php (#178) git-subtree-dir: src/http-client git-subtree-split: 0746832be474138ffc30d82e5eb0a88f8a28d9d7
a463143 fix: ws server push method param is error (#186) a8a91ad Upstream travis ci config (#160) b6a8e59 修复Json Validator会失效的BUG (#153) 93113b0 修复执行php bin/swoft stop命令时master进程异常未退出的问题，以及停止失败后，pid文件被删除的问题 (#134) git-subtree-dir: src/websocket-server git-subtree-split: a46314397916c28553ffff73c61985e0e2635ebd
0062cd5 Fixed swoft-cloud/swoft#293 and clean codes, also remove `App\Task\Task::run2()` method. (#192) 548e997 Upstream travis ci config (#160) 32c35b4 修复Json Validator会失效的BUG (#153) git-subtree-dir: src/task git-subtree-split: 0062cd5d2acd4620befe2aab203dcce19ddf4513
cd995fb 修改consul注入失败，也会显示成功的BUG (#187) git-subtree-dir: src/service-governance git-subtree-split: cd995fb5d8db5d801eaf45fb46bd421e7971ea1d
525b92e Upstream some components travis ci config (#161) ddc5acb 修复Json Validator会失效的BUG (#153) 77f265c 修复执行php bin/swoft stop命令时master进程异常未退出的问题，以及停止失败后，pid文件被删除的问题 (#134) 37026e2 fix spelling (#120) 197a91e add coWrite(); use swoft/swoole-ide-helper (#83) f231b50 add server type option on before server start. git-subtree-dir: src/rpc-server git-subtree-split: 525b92ec408af75dc98c1cbc8a35f01267dea1ad
e782bc1 Upstream travis ci config (#160) a58ef2c Fix rpc unit test (#159) a47e885 Fix ci (#158) 92c9b75 fix ci (#157) fd461c6 rpc component add travis ci config (#156) 8f02304 修复非server环境下使用rpc服务时抛出Call to a member function getTcpSetting() on null 的BUG (#155) 0eaec24 修复Json Validator会失效的BUG (#153) git-subtree-dir: src/rpc git-subtree-split: e782bc15cd72b710131bda795e4871b5606ea4a0
61469f2 fix #82 6faa845 Fix Travis Ci (#190) db8883f 修改timeout为float，增加协程Redis timeout配置 (#188) 395dd1d Fix php7.0 travis ci failed (#167) 1f84117 完善Redis代码提醒 (#165) bed4d1b 修改 Redis::ZRangeByScore 与 Redis::zRevRangeByScore 入参有误的BUG (#163 (comment)) git-subtree-dir: src/redis git-subtree-split: 61469f25a5e48f11188de9da480e91822f7ff3de
3bca6f7 add coWrite(); use swoft/swoole-ide-helper (#83) git-subtree-dir: src/memory git-subtree-split: 3bca6f7fd79b139627b17e8aad4b1b9163e2f35a
bf58b9d Upstream some components travis ci config (#161) f0450aa 修复Json Validator会失效的BUG (#153) 303b1de optimization translate, do not throw exception (#138) f4b7470 add coWrite(); use swoft/swoole-ide-helper (#83) git-subtree-dir: src/i18n git-subtree-split: bf58b9d520e5b0eddab11318d5b5c12f3070f208
afe514c docs: Fix typo (#213) git-subtree-dir: src/http-client git-subtree-split: afe514cc4d317dce5ffc1ac14b999e58eed79313
218abf7 Update Request.php (#184) b20adb8 修复Json Validator会失效的BUG (#153) 68b8332 fix stripos() expects parameter 1 to be string, array given (#140) 31e4eb9 fix: cannot correctly detect json request (#135) 6be72b3 Validator增加Json格式支持 (#122) c9e871d add coWrite(); use swoft/swoole-ide-helper (#83) c989bfe add server params git-subtree-dir: src/http-message git-subtree-split: 218abf7ed6ecc16ae7ba3a3d61e1fc6d67caa1b9
54b7afe auto ffe54c9 Merge branch 'master' of https://github.com/swoft-cloud/swoft-component 8259e90 modify setter a272a99 add gen entity to devtool git-subtree-dir: src/devtool git-subtree-split: 54b7afe9982e23e7072a49d7c7c80783c1d38f0c
d7153f5 使用StringHelper::ucfirst 代替 ucfirst，解决中文乱码的BUG (#194) 57158f7 修复Json Validator会失效的BUG (#153) d906edb add coWrite(); use swoft/swoole-ide-helper (#83) ea46275 new: add timezone setting. fix some bug for Config git-subtree-dir: src/console git-subtree-split: d7153f56505a9be420ebae9eb29f7e45bfb2982e
373301c add coWrite(); use swoft/swoole-ide-helper (#83) git-subtree-dir: src/trace git-subtree-split: 373301c6f99ed9e0abeafba627caf98ee48bb0f6
92a47f4 add coWrite(); use swoft/swoole-ide-helper (#83) git-subtree-dir: src/queue git-subtree-split: 92a47f4149051ed29be60815b16f8819941d0026
c0f55c2 Fix auth travis ci (#205) 643afe8 Revert ./composer.json and remove useless comment and fix code style 7059e38 Merge branch 'master' of https://github.com/aprchen/swoft-component c28008f remove test 0ee7caf Merge branch 'master' into master 6d1b532 cs-fix 89ea514 fix session get getExtendedData and add manager test,enable redis 8bced95 fix session get getExtendedData 4d3efab Fixed cache key repetition (#197) 3d9dad1 fix cache key repeat 5aba246 Upstream travis ci config (#160) 4809074 修复Json Validator会失效的BUG (#153) git-subtree-dir: src/auth git-subtree-split: c0f55c26faa9d048249f9d5cba69cd48d152ea4c
b3a45be fix error on trigger event handler (#196) b1a48cd fix a bug when warnings appear in the high version of swoole (#195) 9c4da9f 自定义组件支持别名配置 (#181) bccf7a6 修复restart不能正常使用的BUG (#180) 97bfe2e 修改连接池配置的timeout字段为float (#177) 525097b 修改自定义组件只能扫描Aop、Command、Bootstrap三个文件的BUG (#169) 0b5f320 兼容swoole 4.0.3版本 (#166) 1d11b56 增加用户自定义组件配置 (#150) git-subtree-dir: src/framework git-subtree-split: b3a45be705c9cb53cb357925e228e4f60e6d76d5
* 增加DB严格模式配置 * 增加配置读取单测 * Update SqlTest.php * Update DbPoolProperties.php * Remoe useless comments.
* [fixed]Can't use column(alias) in Query 修复无法使用数据表列字段别名问题 * [add]test [add]test
* [fixed]can't use function in DB
修复字段不可为函数调用的问题
```
Query::table($this->table)
->condition($where)
->groupBy('tagId')
->get([
'tagId' => 'tagId',
'count(1)' => 'sum'
])->getResult();
```
* [add]testQueryWithFunc
testQueryWithFunc
* fix #401 db entity to array lost null value column * Unit test * Unit test * Format.
* 修复Number验证器最大和最小的template没有生效的问题 * Fix: Optimize accuracy of the wording
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
拉取上游代码的更新