Merge branch 'master' of https://github.com/finecho/logistics-inquiry

Author: thisliu

src/Providers/Kuaidi100.php

@@ -94,7 +94,7 @@ public function order($no, $company = null)
 
             $response = $this->sendRequestGet(self::LOGISTICS_COM_CODE_URL, $query, []);
 
-            if(!\is_array($response)){
+            if (!\is_array($response)) {
                 $response = \json_decode($response, true);
             }
 
@@ -103,7 +103,7 @@ public function order($no, $company = null)
             }
 
             $param['com'] = \current($response)['comCode'];
-        }else{
+        } else {
             $param['com'] = $this->getLogisticsCompanyAliases($company);
 
             $this->company = $company;
@@ -136,6 +136,7 @@ public function getProviderName()
      * @param array  $headers
      *
      * @return array
+     *
      * @throws \Finecho\Logistics\Exceptions\HttpException
      */
     protected function sendRequestGet($url, $params, $headers)
@@ -156,6 +157,7 @@ protected function sendRequestGet($url, $params, $headers)
      * @param int $SUCCESS_STATUS
      *
      * @return array
+     *
      * @throws \Finecho\Logistics\Exceptions\HttpException
      * @throws \Finecho\Logistics\Exceptions\InquiryErrorException
      */
@@ -167,7 +169,7 @@ protected function sendRequestPost($url, $params, $headers, $SUCCESS_STATUS = se
             throw new HttpException($e->getMessage(), $e->getCode(), $e);
         }
 
-        if(!\is_array($result)){
+        if (!\is_array($result)) {
             $result = \json_decode($result, true);
         }
 
@@ -229,6 +231,6 @@ protected function resetList($list)
      */
     protected function generateSign($param, $key, $customer)
     {
-        return \strtoupper(\md5(\json_encode($param) . $key . $customer));
+        return \strtoupper(\md5(\json_encode($param).$key.$customer));
     }
 }

tests/Providers/Kuaidi100ProviderTest.php

@@ -34,7 +34,7 @@ public function testGetLogisticsInfo()
             'kuaidi100' => [
                 'app_code' => 'xxxxxxx',
                 'customer' => 'xxxxxxx',
-            ],];
+            ], ];
 
         $response = [
             'msg' => 'OK',
@@ -45,7 +45,7 @@ public function testGetLogisticsInfo()
             'courierPhone' => '',
         ];
 
-        $kuaidi100 = \Mockery::mock(Kuaidi100::class . '[post]', [$config])->shouldAllowMockingProtectedMethods();
+        $kuaidi100 = \Mockery::mock(Kuaidi100::class.'[post]', [$config])->shouldAllowMockingProtectedMethods();
 
         $params = [
             'customer' => 'xxxxxxx',