Merge pull request #9 from qbhy/master

修复文件上传问题
Hanson · Sep 12, 2019 · 665decc · 665decc
2 parents b81e458 + 8af743d
commit 665decc
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 composer.phar
 /vendor/
 /.idea/
+composer.lock
 
 # Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file

diff --git a/src/Http.php b/src/Http.php
@@ -82,7 +82,7 @@ public function get($url, array $options = [])
      * POST request.
      *
      * @param string $url
-     * @param array $form
+     * @param array  $form
      *
      * @return ResponseInterface
      */
@@ -95,22 +95,22 @@ public function post($url, array $form = [])
      * JSON request.
      *
      * @param string $url
-     * @param $query
+     * @param        $query
      *
      * @return ResponseInterface
      */
-     public function json($url, $query = [])
-     {
-         return $this->request('POST', $url, ['json' => $query]);
-     }
+    public function json($url, $query = [])
+    {
+        return $this->request('POST', $url, ['json' => $query]);
+    }
 
     /**
      * Upload file.
      *
      * @param string $url
-     * @param array $files
-     * @param array $form
-     * @param array $queries
+     * @param array  $files
+     * @param array  $form
+     * @param array  $queries
      *
      * @return ResponseInterface
      */
@@ -119,16 +119,16 @@ public function upload($url, array $queries = [], array $files = [], array $form
         $multipart = [];
 
         foreach ($files as $name => $path) {
-            if (is_array($path)){
+            if (is_array($path)) {
                 foreach ($path as $item) {
                     $multipart[] = [
                             'name' => $name . '[]',
-                        ] + $item;
+                        ] + $this->fileToMultipart($item);
                 }
-            }else{
+            } else {
                 $multipart[] = [
                         'name' => $name,
-                    ] + $path;
+                    ] + $this->fileToMultipart($path);
             }
         }
 
@@ -139,6 +139,19 @@ public function upload($url, array $queries = [], array $files = [], array $form
         return $this->request('POST', $url, ['query' => $queries, 'multipart' => $multipart]);
     }
 
+    private function fileToMultipart($file)
+    {
+        if (is_array($file)) {
+            return $file;
+        } elseif (@file_exists($file)) {
+            return ['contents' => fopen($file, 'r')];
+        } elseif (filter_var($file, FILTER_VALIDATE_URL)) {
+            return ['contents' => file_get_contents($file)];
+        } else {
+            return ['contents' => $file];
+        }
+    }
+
     /**
      * Set GuzzleHttp\Client.
      *
@@ -196,7 +209,7 @@ public function getMiddlewares()
      *
      * @param string $url
      * @param string $method
-     * @param array $options
+     * @param array  $options
      *
      * @return ResponseInterface
      */
@@ -213,10 +226,10 @@ public function request($method, $url, $options = [])
         $response = $this->getClient()->request($method, $url, $options);
 
         Log::debug('API response:', [
-            'Status' => $response->getStatusCode(),
-            'Reason' => $response->getReasonPhrase(),
+            'Status'  => $response->getStatusCode(),
+            'Reason'  => $response->getReasonPhrase(),
             'Headers' => $response->getHeaders(),
-            'Body' => strval($response->getBody()),
+            'Body'    => strval($response->getBody()),
         ]);
 
         return $response;