快递鸟网关优化BUG修复

shuqingzai · Aug 3, 2020 · c874cfc · c874cfc
1 parent 8d037ad
commit c874cfc
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 6 deletions.
diff --git a/src/Exceptions/GatewayAvailableException.php b/src/Exceptions/GatewayAvailableException.php
@@ -38,6 +38,13 @@ public function __construct(array $results = [], $code = 0, Throwable $previous
         parent::__construct('The gateways have failed. You can check "\Overbeck\Logistics\Interfaces\GatewayAvailableInterface" to get the results', $code, $previous);
     }
 
+    /**
+     * 获取结果.
+     *
+     * @return array
+     *
+     * @author ShuQingZai<929024757@qq.com>
+     */
     public function getResults(): array
     {
         return $this->results;
@@ -53,13 +60,24 @@ public function getException(string $gateway)
         return $this->exceptions[$gateway] ?? null;
     }
 
+    /**
+     * 获取所有网关异常.
+     *
+     * @return array
+     *
+     * @author ShuQingZai<929024757@qq.com>
+     */
     public function getExceptions(): array
     {
         return $this->exceptions;
     }
 
     /**
+     * 获取以后一个异常.
+     *
      * @return mixed
+     *
+     * @author ShuQingZai<929024757@qq.com>
      */
     public function getLastException()
     {

diff --git a/src/Gateways/KuaidiniaoGateway.php b/src/Gateways/KuaidiniaoGateway.php
@@ -87,7 +87,7 @@ protected function queryCompanyCode(string $logisticNumber): string
             $response = \json_decode($response, true);
         }
 
-        $code = $response['Shipper'][0]['ShipperCode'] ?? null;
+        $code = $response['Shippers'][0]['ShipperCode'] ?? null;
 
         if (empty($response) || \is_null($code)) {
             throw new GatewayErrorException('Could not find this company code.', 404, (array) $response);

diff --git a/src/Supports/Arr.php b/src/Supports/Arr.php
@@ -21,6 +21,7 @@ class Arr
     /**
      * Add an element to an array using "dot" notation if it doesn't exist.
      *
+     * @param array  $array
      * @param string $key
      * @param mixed  $value
      *
@@ -66,6 +67,7 @@ public static function crossJoin(...$arrays)
     /**
      * Divide an array into two arrays. One with keys and the other with values.
      *
+     * @param array $array
      * @return array
      */
     public static function divide(array $array)
@@ -76,6 +78,7 @@ public static function divide(array $array)
     /**
      * Flatten a multi-dimensional associative array with dots.
      *
+     * @param array  $array
      * @param string $prepend
      *
      * @return array
@@ -98,6 +101,7 @@ public static function dot(array $array, $prepend = '')
     /**
      * Get all of the given array except for a specified array of items.
      *
+     * @param array        $array
      * @param array|string $keys
      *
      * @return array
@@ -112,6 +116,7 @@ public static function except(array $array, $keys)
     /**
      * Determine if the given key exists in the provided array.
      *
+     * @param array      $array
      * @param string|int $key
      *
      * @return bool
@@ -124,7 +129,9 @@ public static function exists(array $array, $key)
     /**
      * Return the first element in an array passing a given truth test.
      *
-     * @param mixed $default
+     * @param array         $array
+     * @param callable|null $callback
+     * @param mixed         $default
      *
      * @return mixed
      */
@@ -152,7 +159,9 @@ public static function first(array $array, callable $callback = null, $default =
     /**
      * Return the last element in an array passing a given truth test.
      *
-     * @param mixed $default
+     * @param array         $array
+     * @param callable|null $callback
+     * @param mixed         $default
      *
      * @return mixed
      */
@@ -168,7 +177,8 @@ public static function last(array $array, callable $callback = null, $default =
     /**
      * Flatten a multi-dimensional array into a single level.
      *
-     * @param int $depth
+     * @param array $array
+     * @param int   $depth
      *
      * @return array
      */
@@ -190,6 +200,7 @@ public static function flatten(array $array, $depth = INF)
     /**
      * Remove one or many array items from a given array using "dot" notation.
      *
+     * @param array        $array
      * @param array|string $keys
      */
     public static function forget(array &$array, $keys)
@@ -232,6 +243,7 @@ public static function forget(array &$array, $keys)
     /**
      * Get an item from an array using "dot" notation.
      *
+     * @param array  $array
      * @param string $key
      * @param mixed  $default
      *
@@ -261,6 +273,7 @@ public static function get(array $array, $key, $default = null)
     /**
      * Check if an item or items exist in an array using "dot" notation.
      *
+     * @param array        $array
      * @param string|array $keys
      *
      * @return bool
@@ -305,6 +318,7 @@ public static function has(array $array, $keys)
      *
      * An array is "associative" if it doesn't have sequential numerical keys beginning with zero.
      *
+     * @param array $array
      * @return bool
      */
     public static function isAssoc(array $array)
@@ -317,6 +331,7 @@ public static function isAssoc(array $array)
     /**
      * Get a subset of the items from the given array.
      *
+     * @param array        $array
      * @param array|string $keys
      *
      * @return array
@@ -329,6 +344,7 @@ public static function only(array $array, $keys)
     /**
      * Push an item onto the beginning of an array.
      *
+     * @param array $array
      * @param mixed $value
      * @param mixed $key
      *
@@ -348,6 +364,7 @@ public static function prepend(array $array, $value, $key = null)
     /**
      * Get a value from the array, and remove it.
      *
+     * @param array  $array
      * @param string $key
      * @param mixed  $default
      *
@@ -365,6 +382,8 @@ public static function pull(array &$array, $key, $default = null)
     /**
      * Get a 1 value from an array.
      *
+     * @param array    $array
+     * @param int|null $amount
      * @return mixed
      */
     public static function random(array $array, int $amount = null)
@@ -389,7 +408,9 @@ public static function random(array $array, int $amount = null)
      *
      * If no key is given to the method, the entire array will be replaced.
      *
-     * @param mixed $value
+     * @param array  $array
+     * @param string $key
+     * @param mixed  $value
      *
      * @return array
      */
@@ -418,6 +439,8 @@ public static function set(array &$array, string $key, $value)
     /**
      * Filter the array using the given callback.
      *
+     * @param array    $array
+     * @param callable $callback
      * @return array
      */
     public static function where(array $array, callable $callback)

diff --git a/src/Supports/Collection.php b/src/Supports/Collection.php
@@ -34,6 +34,8 @@ class Collection implements Countable, IteratorAggregate, JsonSerializable, Seri
 
     /**
      * set data.
+     *
+     * @param array $items
      */
     public function __construct(array $items = [])
     {
@@ -55,6 +57,7 @@ public function all()
     /**
      * Return specific items.
      *
+     * @param array $keys
      * @return \Overbeck\Logistics\Supports\Collection
      */
     public function only(array $keys)
@@ -119,6 +122,7 @@ public function has($key)
     /**
      * Run a filter over each of the items.
      *
+     * @param callable|null $callback
      * @return static
      */
     public function filter(callable $callback = null)

diff --git a/src/Traits/HasHttpRequest.php b/src/Traits/HasHttpRequest.php
@@ -24,6 +24,9 @@ trait HasHttpRequest
     /**
      * Make a get request.
      *
+     * @param string $endpoint
+     * @param array  $query
+     * @param array  $headers
      * @return array
      */
     protected function get(string $endpoint, array $query = [], array $headers = [])
@@ -37,6 +40,9 @@ protected function get(string $endpoint, array $query = [], array $headers = [])
     /**
      * Make a post request.
      *
+     * @param string $endpoint
+     * @param array  $params
+     * @param array  $headers
      * @return array
      */
     protected function post(string $endpoint, array $params = [], array $headers = [])
@@ -50,6 +56,9 @@ protected function post(string $endpoint, array $params = [], array $headers = [
     /**
      * Make a post request with json params.
      *
+     * @param string $endpoint
+     * @param array  $params
+     * @param array  $headers
      * @return array
      */
     protected function postJson(string $endpoint, array $params = [], array $headers = [])
@@ -63,7 +72,9 @@ protected function postJson(string $endpoint, array $params = [], array $headers
     /**
      * Make a http request.
      *
-     * @param array $options http://docs.guzzlephp.org/en/latest/request-options.html
+     * @param string $method
+     * @param string $endpoint
+     * @param array  $options http://docs.guzzlephp.org/en/latest/request-options.html
      *
      * @return array
      */
@@ -91,6 +102,7 @@ protected function getBaseOptions()
     /**
      * Return http client.
      *
+     * @param array $options
      * @return \GuzzleHttp\Client
      *
      * @codeCoverageIgnore
@@ -103,6 +115,7 @@ protected function getHttpClient(array $options = [])
     /**
      * Convert response contents to json.
      *
+     * @param ResponseInterface $response
      * @return ResponseInterface|array|string
      */
     protected function unwrapResponse(ResponseInterface $response)