@@ -367,7 +367,7 @@ |
||
| 367 | 367 | /** |
| 368 | 368 | * Put state to session storage and return it. |
| 369 | 369 | * |
| 370 | - * @return string|bool |
|
| 370 | + * @return false|string |
|
| 371 | 371 | */ |
| 372 | 372 | protected function makeState() |
| 373 | 373 | { |
@@ -74,7 +74,7 @@ |
||
| 74 | 74 | /** |
| 75 | 75 | * MessageBuilder constructor. |
| 76 | 76 | * |
| 77 | - * @param \EntWeChat\Broadcast\Broadcast $broadcast |
|
| 77 | + * @param Broadcast $broadcast |
|
| 78 | 78 | */ |
| 79 | 79 | public function __construct(Broadcast $broadcast) |
| 80 | 80 | { |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | * @param array $especial |
| 66 | 66 | * @param array $advancedInfo |
| 67 | 67 | * |
| 68 | - * @return \EntWeChat\Support\Collection |
|
| 68 | + * @return \YEntWeChat\Support\Collection |
|
| 69 | 69 | */ |
| 70 | 70 | public function create($cardType = 'member_card', array $baseInfo = [], array $especial = [], array $advancedInfo = []) |
| 71 | 71 | { |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | * |
| 85 | 85 | * @param array $cards |
| 86 | 86 | * |
| 87 | - * @return \EntWeChat\Support\Collection |
|
| 87 | + * @return \YEntWeChat\Support\Collection |
|
| 88 | 88 | */ |
| 89 | 89 | public function QRCode(array $cards = []) |
| 90 | 90 | { |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | * @param string $cardId |
| 223 | 223 | * @param array $code |
| 224 | 224 | * |
| 225 | - * @return \EntWeChat\Support\Collection |
|
| 225 | + * @return \YEntWeChat\Support\Collection |
|
| 226 | 226 | */ |
| 227 | 227 | public function checkCode($cardId, $code) |
| 228 | 228 | { |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | * @param bool $checkConsume |
| 242 | 242 | * @param string $cardId |
| 243 | 243 | * |
| 244 | - * @return \EntWeChat\Support\Collection |
|
| 244 | + * @return \YEntWeChat\Support\Collection |
|
| 245 | 245 | */ |
| 246 | 246 | public function getCode($code, $checkConsume, $cardId) |
| 247 | 247 | { |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | * @param string $code |
| 261 | 261 | * @param string $cardId |
| 262 | 262 | * |
| 263 | - * @return \EntWeChat\Support\Collection |
|
| 263 | + * @return \YEntWeChat\Support\Collection |
|
| 264 | 264 | */ |
| 265 | 265 | public function consume($code, $cardId = null) |
| 266 | 266 | { |
@@ -284,7 +284,7 @@ discard block |
||
| 284 | 284 | * |
| 285 | 285 | * @param string $cardId |
| 286 | 286 | * |
| 287 | - * @return \EntWeChat\Support\Collection |
|
| 287 | + * @return \YEntWeChat\Support\Collection |
|
| 288 | 288 | */ |
| 289 | 289 | public function getHtml($cardId) |
| 290 | 290 | { |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | * |
| 301 | 301 | * @param string $cardId |
| 302 | 302 | * |
| 303 | - * @return \EntWeChat\Support\Collection |
|
| 303 | + * @return \YEntWeChat\Support\Collection |
|
| 304 | 304 | */ |
| 305 | 305 | public function getCard($cardId) |
| 306 | 306 | { |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | * @param int $count |
| 319 | 319 | * @param string $statusList |
| 320 | 320 | * |
| 321 | - * @return \EntWeChat\Support\Collection |
|
| 321 | + * @return \YEntWeChat\Support\Collection |
|
| 322 | 322 | */ |
| 323 | 323 | public function lists($offset = 0, $count = 10, $statusList = 'CARD_STATUS_VERIFY_OK') |
| 324 | 324 | { |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | * @param string $cardId |
| 338 | 338 | * @param int $amount |
| 339 | 339 | * |
| 340 | - * @return \EntWeChat\Support\Collection |
|
| 340 | + * @return \YEntWeChat\Support\Collection |
|
| 341 | 341 | */ |
| 342 | 342 | public function increaseStock($cardId, $amount) |
| 343 | 343 | { |
@@ -350,7 +350,7 @@ discard block |
||
| 350 | 350 | * @param string $cardId |
| 351 | 351 | * @param int $amount |
| 352 | 352 | * |
| 353 | - * @return \EntWeChat\Support\Collection |
|
| 353 | + * @return \YEntWeChat\Support\Collection |
|
| 354 | 354 | */ |
| 355 | 355 | public function reduceStock($cardId, $amount) |
| 356 | 356 | { |
@@ -364,7 +364,7 @@ discard block |
||
| 364 | 364 | * @param int $amount |
| 365 | 365 | * @param string $action |
| 366 | 366 | * |
| 367 | - * @return \EntWeChat\Support\Collection |
|
| 367 | + * @return \YEntWeChat\Support\Collection |
|
| 368 | 368 | */ |
| 369 | 369 | protected function updateStock($cardId, $amount, $action = 'increase') |
| 370 | 370 | { |
@@ -382,7 +382,7 @@ discard block |
||
| 382 | 382 | * |
| 383 | 383 | * @param string $cardId |
| 384 | 384 | * |
| 385 | - * @return \EntWeChat\Support\Collection |
|
| 385 | + * @return \YEntWeChat\Support\Collection |
|
| 386 | 386 | */ |
| 387 | 387 | public function delete($cardId) |
| 388 | 388 | { |
@@ -44,17 +44,17 @@ discard block |
||
| 44 | 44 | const API_DELETE_CARD = 'https://qyapi.weixin.qq.com/cgi-bin/card/delete'; |
| 45 | 45 | |
| 46 | 46 | // 卡券类型 |
| 47 | - const TYPE_GENERAL_COUPON = 'GENERAL_COUPON'; // 通用券 |
|
| 48 | - const TYPE_GROUPON = 'GROUPON'; // 团购券 |
|
| 49 | - const TYPE_DISCOUNT = 'DISCOUNT'; // 折扣券 |
|
| 50 | - const TYPE_GIFT = 'GIFT'; // 礼品券 |
|
| 51 | - const TYPE_CASH = 'CASH'; // 代金券 |
|
| 47 | + const TYPE_GENERAL_COUPON = 'GENERAL_COUPON'; // 通用券 |
|
| 48 | + const TYPE_GROUPON = 'GROUPON'; // 团购券 |
|
| 49 | + const TYPE_DISCOUNT = 'DISCOUNT'; // 折扣券 |
|
| 50 | + const TYPE_GIFT = 'GIFT'; // 礼品券 |
|
| 51 | + const TYPE_CASH = 'CASH'; // 代金券 |
|
| 52 | 52 | |
| 53 | 53 | // 卡券状态 |
| 54 | - const CARD_STATUS_NOT_VERIFY = 'CARD_STATUS_NOT_VERIFY'; // 待审核 |
|
| 55 | - const CARD_STATUS_VERIFY_FAIL = 'CARD_STATUS_VERIFY_FAIL'; // 审核失败 |
|
| 56 | - const CARD_STATUS_VERIFY_OK = 'CARD_STATUS_VERIFY_OK'; // 通过审核 |
|
| 57 | - const CARD_STATUS_USER_DELETE = 'CARD_STATUS_USER_DELETE'; // 卡券被商户删除 |
|
| 54 | + const CARD_STATUS_NOT_VERIFY = 'CARD_STATUS_NOT_VERIFY'; // 待审核 |
|
| 55 | + const CARD_STATUS_VERIFY_FAIL = 'CARD_STATUS_VERIFY_FAIL'; // 审核失败 |
|
| 56 | + const CARD_STATUS_VERIFY_OK = 'CARD_STATUS_VERIFY_OK'; // 通过审核 |
|
| 57 | + const CARD_STATUS_USER_DELETE = 'CARD_STATUS_USER_DELETE'; // 卡券被商户删除 |
|
| 58 | 58 | const CARD_STATUS_USER_DISPATCH = 'CARD_STATUS_USER_DISPATCH'; // 在公众平台投放过的卡券 |
| 59 | 59 | |
| 60 | 60 | /** |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | */ |
| 164 | 164 | public function jsConfigForAssign(array $cards) |
| 165 | 165 | { |
| 166 | - return json_encode(array_map(function ($card) { |
|
| 166 | + return json_encode(array_map(function($card) { |
|
| 167 | 167 | return $this->attachExtension($card['card_id'], $card); |
| 168 | 168 | }, $cards)); |
| 169 | 169 | } |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | /** |
| 37 | 37 | * Constructor. |
| 38 | 38 | * |
| 39 | - * @param \EntWeChat\Core\AccessToken $accessToken |
|
| 39 | + * @param AccessToken $accessToken |
|
| 40 | 40 | */ |
| 41 | 41 | public function __construct(AccessToken $accessToken) |
| 42 | 42 | { |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | /** |
| 65 | 65 | * Set the http instance. |
| 66 | 66 | * |
| 67 | - * @param \EntWeChat\Core\Http $http |
|
| 67 | + * @param Http $http |
|
| 68 | 68 | * |
| 69 | 69 | * @return $this |
| 70 | 70 | */ |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | /** |
| 89 | 89 | * Set the request token. |
| 90 | 90 | * |
| 91 | - * @param \EntWeChat\Core\AccessToken $accessToken |
|
| 91 | + * @param AccessToken $accessToken |
|
| 92 | 92 | * |
| 93 | 93 | * @return $this |
| 94 | 94 | */ |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | * @param string $method |
| 106 | 106 | * @param array $args |
| 107 | 107 | * |
| 108 | - * @return \EntWeChat\Support\Collection |
|
| 108 | + * @return Collection |
|
| 109 | 109 | */ |
| 110 | 110 | public function parseJSON($method, array $args) |
| 111 | 111 | { |
@@ -138,8 +138,8 @@ discard block |
||
| 138 | 138 | */ |
| 139 | 139 | protected function accessTokenMiddleware() |
| 140 | 140 | { |
| 141 | - return function (callable $handler) { |
|
| 142 | - return function (RequestInterface $request, array $options) use ($handler) { |
|
| 141 | + return function(callable $handler) { |
|
| 142 | + return function(RequestInterface $request, array $options) use ($handler) { |
|
| 143 | 143 | if (!$this->accessToken) { |
| 144 | 144 | return $handler($request, $options); |
| 145 | 145 | } |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | */ |
| 162 | 162 | protected function logMiddleware() |
| 163 | 163 | { |
| 164 | - return Middleware::tap(function (RequestInterface $request, $options) { |
|
| 164 | + return Middleware::tap(function(RequestInterface $request, $options) { |
|
| 165 | 165 | Log::debug("Request: {$request->getMethod()} {$request->getUri()} ".json_encode($options)); |
| 166 | 166 | Log::debug('Request headers:'.json_encode($request->getHeaders())); |
| 167 | 167 | }); |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | */ |
| 175 | 175 | protected function retryMiddleware() |
| 176 | 176 | { |
| 177 | - return Middleware::retry(function ( |
|
| 177 | + return Middleware::retry(function( |
|
| 178 | 178 | $retries, |
| 179 | 179 | RequestInterface $request, |
| 180 | 180 | ResponseInterface $response = null |
@@ -97,11 +97,10 @@ |
||
| 97 | 97 | * @param string $msgSignature |
| 98 | 98 | * @param string $nonce |
| 99 | 99 | * @param string $timestamp |
| 100 | - * @param string $postXML |
|
| 101 | 100 | * |
| 102 | 101 | * @throws EncryptionException |
| 103 | 102 | * |
| 104 | - * @return array |
|
| 103 | + * @return string |
|
| 105 | 104 | */ |
| 106 | 105 | public function decryptEcho($msgSignature, $nonce, $timestamp, $echo) |
| 107 | 106 | { |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | /** |
| 48 | 48 | * API constructor. |
| 49 | 49 | * |
| 50 | - * @param \EntWeChat\Payment\Merchant $merchant |
|
| 50 | + * @param Merchant $merchant |
|
| 51 | 51 | */ |
| 52 | 52 | public function __construct(Merchant $merchant) |
| 53 | 53 | { |
@@ -411,7 +411,7 @@ discard block |
||
| 411 | 411 | * |
| 412 | 412 | * @param ResponseInterface $response |
| 413 | 413 | * |
| 414 | - * @return \EntWeChat\Support\Collection |
|
| 414 | + * @return Collection |
|
| 415 | 415 | */ |
| 416 | 416 | protected function parseResponse($response) |
| 417 | 417 | { |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | * |
| 63 | 63 | * @throws \EntWeChat\Core\Exceptions\FaultException |
| 64 | 64 | * |
| 65 | - * @return \EntWeChat\Support\Collection |
|
| 65 | + * @return Collection |
|
| 66 | 66 | */ |
| 67 | 67 | public function getNotify() |
| 68 | 68 | { |
@@ -275,7 +275,7 @@ |
||
| 275 | 275 | /** |
| 276 | 276 | * Return Notify instance. |
| 277 | 277 | * |
| 278 | - * @return \EntWeChat\Payment\Notify |
|
| 278 | + * @return Notify |
|
| 279 | 279 | */ |
| 280 | 280 | public function getNotify() |
| 281 | 281 | { |
@@ -55,7 +55,7 @@ |
||
| 55 | 55 | /** |
| 56 | 56 | * MessageBuilder constructor. |
| 57 | 57 | * |
| 58 | - * @param \EntWeChat\Staff\Staff $staff |
|
| 58 | + * @param Staff $staff |
|
| 59 | 59 | */ |
| 60 | 60 | public function __construct(Staff $staff) |
| 61 | 61 | { |