Commit Graph

5689 Commits

Author SHA1 Message Date
黄朝晖
df70ebb7bc
Merge pull request #2027 from sy-records/patch-2
Update FUNDING.yml
2020-07-02 00:48:00 +08:00
黄朝晖
99d949c705
Update FUNDING.yml 2020-07-02 00:47:38 +08:00
沈唁
9e175e71b2
Update FUNDING.yml 2020-07-01 19:39:09 +08:00
沈唁
5f13910d4b
Update Response.php 2020-07-01 18:21:32 +08:00
沈唁
19adae2cd6
Update Response.php 2020-07-01 17:21:46 +08:00
李铭昕
91cadc2550
Merge pull request #2019 from weskiller/master
Fixed bug that `gen:model` generate property failed, when used `morphTo` or `where`.
2020-07-01 10:28:21 +08:00
李铭昕
9878c2b08f Format code. 2020-07-01 10:24:01 +08:00
李铭昕
d3010b3937 FIxed morphTo when does not has args. 2020-07-01 10:00:05 +08:00
weskiller
b776ca8fc2 Fixed MorphTo Model class namespace 2020-06-30 21:31:28 +08:00
weskiller
c191287c54 Fixed morphTo not define name 2020-06-30 20:57:49 +08:00
weskiller
6d5e9f4239 Fixed gen:model generate morphTo relation annotate, and relation method used where 2020-06-30 19:19:42 +08:00
逍遥
a640b36a24
Merge branch 'master' into feat_prometheus_redis_support_cluster 2020-06-30 16:34:48 +08:00
逍遥
cdb325c497 docs: 新增CHANGELOG文档 2020-06-30 16:29:00 +08:00
逍遥
d52400eb4f feat: 新增prometheus使用redis打点支持Redis集群 2020-06-30 16:25:21 +08:00
逍遥
6402d179f6 docs: 添加CHANGELOG说明 2020-06-30 16:21:11 +08:00
逍遥
9bba1b23e3 docs: 添加CHANGELOG说明 2020-06-30 15:37:01 +08:00
逍遥
9cf9c48fe3 fix: 修复Prometheus使用redis打点,改变label导致收集报错的问题 2020-06-30 15:32:40 +08:00
李铭昕
0e6e12b11d
Fixed default config. (#2014) 2020-06-30 13:46:39 +08:00
黄朝晖
6023344407
Merge pull request #2010 from sy-records/patch-1
Update constants.md
2020-06-30 13:20:39 +08:00
黄朝晖
61368737e2
Update constants.md 2020-06-30 13:15:11 +08:00
沈唁
99ecda9555 Update constants.md
Update constants.md

Update constants.md

Update constants.md
2020-06-29 19:17:21 +08:00
黄朝晖
58e2998bfd
Merge pull request #2005 from yasarluo/patch-1
Update changelog.md
2020-06-29 11:33:34 +08:00
Yasar Luo
fb7fc19239
Update changelog.md 2020-06-29 08:28:27 +08:00
李铭昕
357c39cd8f Added test cases. 2020-06-28 17:46:39 +08:00
李铭昕
bc03ae0725 Deleted useless code. 2020-06-28 17:34:04 +08:00
李铭昕
3f3c0cae1b Support aop in trait. 2020-06-28 17:32:42 +08:00
nfangxu
5b506f5e72 fix code 2020-06-28 16:51:43 +08:00
nfangxu
2d28f549a2 add command parser test 2020-06-28 16:47:08 +08:00
nfangxu
875f2e413c fix code 2020-06-28 16:35:57 +08:00
nfangxu
790392ed06 add command sognature 2020-06-28 16:35:18 +08:00
祇是一支歌
041bf8fa8e
fix: change the binding attribute order in aop trait (#1989) (#1990)
* fix: change the binding attribute order in aop trait (#1989)

before:
The old binding order is parent->trait->current
It causes some properties of current to not be bound
after:
The new binding order is current->trait->parent

* docs(contribute): update pull request url

* Update PropertyHandlerTrait.php

* Removed uesless code.

* Fixed handled property not be handled again by parent class.

Co-authored-by: 李铭昕 <715557344@qq.com>
2020-06-28 15:20:33 +08:00
黄朝晖
0a299268d1
Merge pull request #1998 from haozing/patch-3
所需版本更新
2020-06-28 13:29:12 +08:00
haozing
191baeb33b
所需版本更新
1.Swoole扩展版本
2.hyperf最新docker镜像
2020-06-28 10:32:43 +08:00
黄朝晖
29e0d46993
Merge pull request #1853 from nfangxu/command-doc
update command.md
2020-06-28 00:27:25 +08:00
huangzhhui
323d4a111f Translate doc 2020-06-28 00:26:45 +08:00
huangzhhui
1b4511dfd9 Update command.md 2020-06-28 00:25:05 +08:00
huangzhhui
70c13647e0 Merge remote-tracking branch 'origin/master' into pr/1853 2020-06-28 00:22:47 +08:00
huangzhhui
d399afa36b Update command.md 2020-06-28 00:22:19 +08:00
李铭昕
4e6382af89 Update Scanner.php 2020-06-27 06:28:10 +08:00
李铭昕
8206a6a06c Merge branch 'master' into pr/1968 2020-06-27 06:24:30 +08:00
李铭昕
d014e6aed8
Fixed default driver not found. (#1994) 2020-06-27 05:35:18 +08:00
黄朝晖
9dc74e4525
Merge pull request #1993 from bob-yangpf/bob-yangpf-v2
docs(contribute): update pull request url
2020-06-27 03:07:22 +08:00
黄朝晖
19463bd056
Merge pull request #1987 from sy-records/update-doc
remove ./
2020-06-27 03:01:41 +08:00
杨鹏飞
80913175fb docs(contribute): update pull request url 2020-06-26 19:20:17 +08:00
李铭昕
1d54de7cbd
Optimized code for watcher. (#1988) 2020-06-26 14:14:08 +08:00
sy-records
55326e0abd remove ./ 2020-06-25 10:54:10 +08:00
沈唁
059aedf3e6
Changed exit_code 0 to SIGTERM when swoole short name do not set disable. (#1986)
* Add get php path

* Update CHANGELOG-2.0.md

Co-authored-by: 李铭昕 <715557344@qq.com>
2020-06-25 10:05:07 +08:00
李铭昕
7233402df8
Fixed global_imports do not work when the aliases are not all lowercase letters. (#1985) 2020-06-25 09:56:19 +08:00
沈唁
3f35cb60d9
Added command gen:constants. (#1934)
* add gen constants

* update doc

* Update CHANGELOG-2.0.md

Co-authored-by: 李铭昕 <715557344@qq.com>
2020-06-25 08:09:16 +08:00
李铭昕
7a66b3c250
Merge pull request #1982 from limingxinleo/2.0-watcher
Added watcher component.
2020-06-25 08:01:06 +08:00