添加摇一摇周边模块 #548

Merged
merged 9 commits into from Dec 19, 2016

Projects

None yet

2 participants

@allen05ren
Contributor

No description provided.

allen05ren added some commits Dec 16, 2016
@allen05ren allen05ren Add ShakeAround module. 14de14f
@allen05ren allen05ren remove getDeviceByPageId method. 6c6ef85
@allen05ren allen05ren Add a argument for getPageByDeviceId method
a2b2fa1
@allen05ren allen05ren Clear up.
6a88f3f
@allen05ren allen05ren Clear up.
cb0d3e3
@allen05ren allen05ren Clear up.
5eeca82
src/Foundation/Application.php
@@ -20,9 +20,10 @@
* @author overtrue <i@overtrue.me>
* @copyright 2015
*
- * @link https://github.com/overtrue/wechat
- * @link http://overtrue.me
+ * @see https://github.com/overtrue/wechat
@overtrue
overtrue Dec 19, 2016 Owner

这是干嘛?

@allen05ren
allen05ren Dec 19, 2016 Contributor

styleci检测提示把link改成see,强迫症

@overtrue
overtrue Dec 19, 2016 Owner

哦,好吧,请忽略它

@overtrue

挺好的,就是变量命名需要改成驼峰命名法,谢谢!

src/ShakeAround/Device.php
+ *
+ * @return \EasyWeChat\Support\Collection
+ */
+ public function getStatus($apply_id)
@overtrue
overtrue Dec 19, 2016 Owner

请使用驼峰命名法

@allen05ren allen05ren camelCase style.
b0b1780
@overtrue
Owner

@allen05ren 现在 src/Foundation/Application.php 文件有冲突,你拉取一下我的版本,然后处理一下

@allen05ren
Contributor

@overtrue OK,刚改了命名,现在处理。

allen05ren added some commits Dec 19, 2016
@allen05ren allen05ren Merge pull request #1 from overtrue/master
Sync
80688f0
@allen05ren allen05ren Merge branch 'master' into shake-around
Conflicts:
	src/Foundation/Application.php
66680d8
@overtrue overtrue merged commit 8d02ae7 into overtrue:master Dec 19, 2016

1 of 4 checks passed

Scrutinizer Running
Details
codacy/pr Hang in there, Codacy is reviewing your Pull request.
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
continuous-integration/styleci/pr The StyleCI analysis has passed
Details
@overtrue overtrue referenced this pull request Dec 19, 2016
Merged

Apply fixes from StyleCI #549

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment