使用 php_cs 格式化代码

Signed-off-by: iwzh <[email protected]>
iamjs1 · Oct 12, 2019 · 3036f2c · 3036f2c
1 parent fa3ab01
commit 3036f2c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/src/Gateways/Alipay/AppGateway.php b/src/Gateways/Alipay/AppGateway.php
@@ -4,8 +4,8 @@
 
 use Symfony\Component\HttpFoundation\Response;
 use Yansongda\Pay\Events;
-use Yansongda\Pay\Exceptions\InvalidConfigException;
 use Yansongda\Pay\Exceptions\InvalidArgumentException;
+use Yansongda\Pay\Exceptions\InvalidConfigException;
 use Yansongda\Pay\Gateways\Alipay;
 
 class AppGateway extends Gateway
@@ -28,7 +28,7 @@ public function pay($endpoint, array $payload): Response
         $payload['method'] = 'alipay.trade.app.pay';
 
         $biz_array = json_decode($payload['biz_content'], true);
-        if (($this->mode === Alipay::MODE_SERVICE) && (!empty(Support::getInstance()->pid))) {
+        if ((Alipay::MODE_SERVICE === $this->mode) && (!empty(Support::getInstance()->pid))) {
             //服务商模式且服务商pid参数不为空
             $biz_array['extend_params'] = is_array($biz_array['extend_params']) ? array_merge(['sys_service_provider_id' => Support::getInstance()->pid], $biz_array['extend_params']) : ['sys_service_provider_id' => Support::getInstance()->pid];
         }

diff --git a/src/Gateways/Alipay/Gateway.php b/src/Gateways/Alipay/Gateway.php
@@ -38,4 +38,4 @@ public function __construct()
      * @return Collection
      */
     abstract public function pay($endpoint, array $payload);
-}
+}
diff --git a/src/Gateways/Alipay/MiniGateway.php b/src/Gateways/Alipay/MiniGateway.php
@@ -2,12 +2,12 @@
 
 namespace Yansongda\Pay\Gateways\Alipay;
 
-use Yansongda\Pay\Gateways\Alipay;
 use Yansongda\Pay\Events;
 use Yansongda\Pay\Exceptions\GatewayException;
 use Yansongda\Pay\Exceptions\InvalidArgumentException;
 use Yansongda\Pay\Exceptions\InvalidConfigException;
 use Yansongda\Pay\Exceptions\InvalidSignException;
+use Yansongda\Pay\Gateways\Alipay;
 use Yansongda\Supports\Collection;
 
 class MiniGateway extends Gateway
@@ -35,7 +35,7 @@ public function pay($endpoint, array $payload): Collection
         if (empty($biz_array['buyer_id'])) {
             throw new InvalidArgumentException('buyer_id required');
         }
-        if (($this->mode === Alipay::MODE_SERVICE) && (!empty(Support::getInstance()->pid))) {
+        if ((Alipay::MODE_SERVICE === $this->mode) && (!empty(Support::getInstance()->pid))) {
             $biz_array['extend_params'] = is_array($biz_array['extend_params']) ? array_merge(['sys_service_provider_id' => Support::getInstance()->pid], $biz_array['extend_params']) : ['sys_service_provider_id' => Support::getInstance()->pid];
         }
         $payload['biz_content'] = json_encode($biz_array);

diff --git a/src/Gateways/Alipay/PosGateway.php b/src/Gateways/Alipay/PosGateway.php
@@ -2,12 +2,12 @@
 
 namespace Yansongda\Pay\Gateways\Alipay;
 
-use Yansongda\Pay\Gateways\Alipay;
 use Yansongda\Pay\Events;
 use Yansongda\Pay\Exceptions\GatewayException;
 use Yansongda\Pay\Exceptions\InvalidArgumentException;
 use Yansongda\Pay\Exceptions\InvalidConfigException;
 use Yansongda\Pay\Exceptions\InvalidSignException;
+use Yansongda\Pay\Gateways\Alipay;
 use Yansongda\Supports\Collection;
 
 class PosGateway extends Gateway
@@ -31,7 +31,7 @@ public function pay($endpoint, array $payload): Collection
     {
         $payload['method'] = 'alipay.trade.pay';
         $biz_array = json_decode($payload['biz_content'], true);
-        if (($this->mode === Alipay::MODE_SERVICE) && (!empty(Support::getInstance()->pid))) {
+        if ((Alipay::MODE_SERVICE === $this->mode) && (!empty(Support::getInstance()->pid))) {
             $biz_array['extend_params'] = is_array($biz_array['extend_params']) ? array_merge(['sys_service_provider_id' => Support::getInstance()->pid], $biz_array['extend_params']) : ['sys_service_provider_id' => Support::getInstance()->pid];
         }
         $payload['biz_content'] = json_encode(array_merge(

diff --git a/src/Gateways/Alipay/ScanGateway.php b/src/Gateways/Alipay/ScanGateway.php
@@ -2,12 +2,12 @@
 
 namespace Yansongda\Pay\Gateways\Alipay;
 
-use Yansongda\Pay\Gateways\Alipay;
 use Yansongda\Pay\Events;
 use Yansongda\Pay\Exceptions\GatewayException;
 use Yansongda\Pay\Exceptions\InvalidArgumentException;
 use Yansongda\Pay\Exceptions\InvalidConfigException;
 use Yansongda\Pay\Exceptions\InvalidSignException;
+use Yansongda\Pay\Gateways\Alipay;
 use Yansongda\Supports\Collection;
 
 class ScanGateway extends Gateway
@@ -31,7 +31,7 @@ public function pay($endpoint, array $payload): Collection
     {
         $payload['method'] = 'alipay.trade.precreate';
         $biz_array = json_decode($payload['biz_content'], true);
-        if (($this->mode === Alipay::MODE_SERVICE) && (!empty(Support::getInstance()->pid))) {
+        if ((Alipay::MODE_SERVICE === $this->mode) && (!empty(Support::getInstance()->pid))) {
             $biz_array['extend_params'] = is_array($biz_array['extend_params']) ? array_merge(['sys_service_provider_id' => Support::getInstance()->pid], $biz_array['extend_params']) : ['sys_service_provider_id' => Support::getInstance()->pid];
         }
         $payload['biz_content'] = json_encode(array_merge($biz_array, ['product_code' => '']));

diff --git a/src/Gateways/Alipay/WebGateway.php b/src/Gateways/Alipay/WebGateway.php
@@ -4,10 +4,10 @@
 
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
-use Yansongda\Pay\Gateways\Alipay;
 use Yansongda\Pay\Events;
 use Yansongda\Pay\Exceptions\InvalidArgumentException;
 use Yansongda\Pay\Exceptions\InvalidConfigException;
+use Yansongda\Pay\Gateways\Alipay;
 
 class WebGateway extends Gateway
 {
@@ -32,7 +32,7 @@ public function pay($endpoint, array $payload): Response
         $method = $biz_array['http_method'] ?? 'POST';
 
         unset($biz_array['http_method']);
-        if (($this->mode === Alipay::MODE_SERVICE) && (!empty(Support::getInstance()->pid))) {
+        if ((Alipay::MODE_SERVICE === $this->mode) && (!empty(Support::getInstance()->pid))) {
             $biz_array['extend_params'] = is_array($biz_array['extend_params']) ? array_merge(['sys_service_provider_id' => Support::getInstance()->pid], $biz_array['extend_params']) : ['sys_service_provider_id' => Support::getInstance()->pid];
         }
         $payload['method'] = $this->getMethod();
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,4 +38,4 @@ public function __construct() @@
          * @return Collection
          */
         abstract public function pay($endpoint, array $payload);
-    }
+    }