Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scrutinizer Auto-Fixes #475

Merged
merged 1 commit into from
Aug 1, 2016
Merged

Scrutinizer Auto-Fixes #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
71 changes: 35 additions & 36 deletions src/Card/Card.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class Card extends AbstractAPI
/**
* 获取卡券颜色.
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function getColors()
{
Expand All @@ -91,7 +91,7 @@ public function getColors()
* @param array $especial
* @param array $advancedInfo
*
* @return bool|array
* @return \EasyWeChat\Support\Collection
*/
public function create($cardType = 'member_card', array $baseInfo = [], array $especial = [], array $advancedInfo = [])
{
Expand All @@ -110,7 +110,7 @@ public function create($cardType = 'member_card', array $baseInfo = [], array $e
*
* @param array $cards
*
* @return array|bool
* @return \EasyWeChat\Support\Collection
*/
public function QRCode(array $cards = [])
{
Expand Down Expand Up @@ -250,7 +250,7 @@ public function getSignature()
* SCENE_H5 h5页面,SCENE_IVR 自动回复,SCENE_CARD_CUSTOM_CELL 卡券自定义cell]
* @param array $cardList
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function createLandingPage($banner, $pageTitle, $canShare, $scene, $cardList)
{
Expand All @@ -271,7 +271,7 @@ public function createLandingPage($banner, $pageTitle, $canShare, $scene, $cardL
* @param string $cardId
* @param array $code
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function deposit($cardId, $code)
{
Expand All @@ -288,7 +288,7 @@ public function deposit($cardId, $code)
*
* @param string $cardId
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function getDepositedCount($cardId)
{
Expand All @@ -305,7 +305,7 @@ public function getDepositedCount($cardId)
* @param string $cardId
* @param array $code
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function checkCode($cardId, $code)
{
Expand All @@ -324,7 +324,7 @@ public function checkCode($cardId, $code)
* @param bool $checkConsume
* @param string $cardId
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function getCode($code, $checkConsume, $cardId)
{
Expand All @@ -343,7 +343,7 @@ public function getCode($code, $checkConsume, $cardId)
* @param string $cardId
* @param string $code
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function consume($cardId, $code)
{
Expand All @@ -360,7 +360,7 @@ public function consume($cardId, $code)
*
* @param string $encryptedCode
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function decryptCode($encryptedCode)
{
Expand All @@ -376,7 +376,7 @@ public function decryptCode($encryptedCode)
*
* @param string $cardId
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function getHtml($cardId)
{
Expand All @@ -390,10 +390,9 @@ public function getHtml($cardId)
/**
* 设置测试白名单.
*
* @param array $openid
* @param array $username
* @param array $openids
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function setTestWhitelist($openids)
{
Expand All @@ -409,7 +408,7 @@ public function setTestWhitelist($openids)
*
* @param array $usernames
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function setTestWhitelistByUsername($usernames)
{
Expand All @@ -426,7 +425,7 @@ public function setTestWhitelistByUsername($usernames)
* @param string $openid
* @param string $cardId
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function getUserCards($openid, $cardId = '')
{
Expand All @@ -443,7 +442,7 @@ public function getUserCards($openid, $cardId = '')
*
* @param string $cardId
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function getCard($cardId)
{
Expand All @@ -461,7 +460,7 @@ public function getCard($cardId)
* @param int $count
* @param string $statusList
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function lists($offset = 0, $count = 10, $statusList = 'CARD_STATUS_VERIFY_OK')
{
Expand All @@ -482,7 +481,7 @@ public function lists($offset = 0, $count = 10, $statusList = 'CARD_STATUS_VERIF
* @param array $baseInfo
* @param array $especial
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function update($cardId, $type, $baseInfo = [], $especial = [])
{
Expand All @@ -505,7 +504,7 @@ public function update($cardId, $type, $baseInfo = [], $especial = [])
* @param string $cardId
* @param bool $isOpen
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function setPayCell($cardId, $isOpen = true)
{
Expand All @@ -523,7 +522,7 @@ public function setPayCell($cardId, $isOpen = true)
* @param string $cardId
* @param int $amount
*
* @return bool
* @return \EasyWeChat\Support\Collection
*/
public function increaseStock($cardId, $amount)
{
Expand All @@ -536,7 +535,7 @@ public function increaseStock($cardId, $amount)
* @param string $cardId
* @param int $amount
*
* @return bool
* @return \EasyWeChat\Support\Collection
*/
public function reduceStock($cardId, $amount)
{
Expand All @@ -550,7 +549,7 @@ public function reduceStock($cardId, $amount)
* @param int $amount
* @param string $action
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
protected function updateStock($cardId, $amount, $action = 'increase')
{
Expand All @@ -570,7 +569,7 @@ protected function updateStock($cardId, $amount, $action = 'increase')
* @param string $newCode
* @param array $cardId
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function updateCode($code, $newCode, $cardId = [])
{
Expand All @@ -588,7 +587,7 @@ public function updateCode($code, $newCode, $cardId = [])
*
* @param string $cardId
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function delete($cardId)
{
Expand All @@ -605,7 +604,7 @@ public function delete($cardId)
* @param string $code
* @param string $cardId
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function disable($code, $cardId = '')
{
Expand All @@ -622,7 +621,7 @@ public function disable($code, $cardId = '')
*
* @param array $info
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function activate($info = [])
{
Expand All @@ -636,7 +635,7 @@ public function activate($info = [])
* @param array $requiredForm
* @param array $optionalForm
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function activateUserForm($cardId, array $requiredForm = [], array $optionalForm = [])
{
Expand All @@ -651,7 +650,7 @@ public function activateUserForm($cardId, array $requiredForm = [], array $optio
* @param string $cardId
* @param string $code
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function getMemberCardUser($cardId, $code)
{
Expand All @@ -668,7 +667,7 @@ public function getMemberCardUser($cardId, $code)
*
* @param array $params
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function updateMemberCardUser(array $params = [])
{
Expand All @@ -680,7 +679,7 @@ public function updateMemberCardUser(array $params = [])
*
* @param array $info
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function createSubMerchant(array $info = [])
{
Expand All @@ -707,7 +706,7 @@ public function createSubMerchant(array $info = [])
* @param int $merchantId
* @param array $info
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function updateSubMerchant($merchantId, array $info = [])
{
Expand All @@ -734,7 +733,7 @@ public function updateSubMerchant($merchantId, array $info = [])
*
* @param int $merchantId
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function getSubMerchant($merchantId)
{
Expand All @@ -748,7 +747,7 @@ public function getSubMerchant($merchantId)
* @param int $limit
* @param string $status
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function listSubMerchants($beginId = 0, $limit = 50, $status = 'CHECKING')
{
Expand All @@ -764,7 +763,7 @@ public function listSubMerchants($beginId = 0, $limit = 50, $status = 'CHECKING'
/**
* 卡券开放类目查询接口.
*
* @return array|bool
* @return \EasyWeChat\Support\Collection
*/
public function getCategories()
{
Expand Down Expand Up @@ -800,7 +799,7 @@ public function getCache()
*
* @param string $url
*
* @return array
* @return Card
*/
public function setUrl($url)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Core/AccessToken.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ public function getQueryFields()
*
* @throws \EasyWeChat\Core\Exceptions\HttpException
*
* @return array|bool
* @return string
*/
public function getTokenFromServer()
{
Expand Down
10 changes: 5 additions & 5 deletions src/Notice/Notice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public function __construct(AccessToken $accessToken)
* @param int $industryOne
* @param int $industryTwo
*
* @return bool
* @return \EasyWeChat\Support\Collection
*/
public function setIndustry($industryOne, $industryTwo)
{
Expand All @@ -95,7 +95,7 @@ public function setIndustry($industryOne, $industryTwo)
/**
* Get industry.
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function getIndustry()
{
Expand All @@ -107,7 +107,7 @@ public function getIndustry()
*
* @param string $shortId
*
* @return string
* @return \EasyWeChat\Support\Collection
*/
public function addTemplate($shortId)
{
Expand All @@ -119,7 +119,7 @@ public function addTemplate($shortId)
/**
* Get private templates.
*
* @return array
* @return \EasyWeChat\Support\Collection
*/
public function getPrivateTemplates()
{
Expand All @@ -145,7 +145,7 @@ public function deletePrivateTemplate($templateId)
*
* @param $data
*
* @return mixed
* @return \EasyWeChat\Support\Collection
*
* @throws \EasyWeChat\Core\Exceptions\InvalidArgumentException
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Payment/API.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ protected function safeRequest($api, array $params, $method = 'post')
/**
* Parse Response XML to array.
*
* @param string|\Psr\Http\Message\ResponseInterface $response
* @param ResponseInterface $response
*
* @return \EasyWeChat\Support\Collection
*/
Expand Down
3 changes: 1 addition & 2 deletions src/Payment/MerchantPay/API.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ public function query($mchBillNo)
* Send MerchantPay.
*
* @param array $params
* @param string $type
*
* @return \EasyWeChat\Support\Collection
*/
Expand Down Expand Up @@ -137,7 +136,7 @@ protected function request($api, array $params, $method = 'post')
/**
* Parse Response XML to array.
*
* @param \Psr\Http\Message\ResponseInterface|string $response
* @param ResponseInterface $response
*
* @return \EasyWeChat\Support\Collection
*/
Expand Down
Loading