remeve the deprecated functions of guzzlehttp7.2 and replace with the…

composer.json

@@ -1,26 +1,40 @@
 {
-    "name": "upyun/sdk",
+    "name": "v012345/upyun",
     "description": "UPYUN sdk for php",
-    "keywords": ["UPYUN", "sdk"],
+    "keywords": [
+        "UPYUN",
+        "sdk"
+    ],
     "type": "library",
     "minimum-stability": "stable",
     "homepage": "https://github.com/upyun/php-sdk/",
     "license": "MIT",
     "require": {
         "php": ">=5.5.0",
         "ext-curl": "*",
-        "guzzlehttp/guzzle": "~6.0"
+        "guzzlehttp/guzzle": "~7.2"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0",
         "phpdocumentor/phpdocumentor": "^2.9",
         "consolidation/robo": "^1.0"
     },
     "autoload": {
-        "psr-4": { "Upyun\\": "src/Upyun/" }
+        "psr-4": {
+            "Upyun\\": "src/Upyun/"
+        }
     },
     "autoload-dev": {
-        "psr-4": { "Upyun\\Tests\\": "tests/" }
+        "psr-4": {
+            "Upyun\\Tests\\": "tests/"
+        }
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Upyun\\ServiceProvider"
+            ]
+        }
     },
     "authors": [
         {
@@ -32,12 +46,12 @@
             "email": "[email protected]"
         },
         {
-          "name": "totoleo",
-          "email": "[email protected]"
+            "name": "totoleo",
+            "email": "[email protected]"
         },
         {
-          "name": "sabakugaara",
-          "email": "[email protected]"
+            "name": "sabakugaara",
+            "email": "[email protected]"
         }
     ]
-}
+}

src/Upyun/Api/Rest.php

@@ -47,7 +47,7 @@ public function request($method, $storagePath)
      */
     public function withFile($file)
     {
-        $stream = Psr7\stream_for($file);
+        $stream = Psr7\Utils::streamFor($file);
         $this->file = $stream;
 
         return $this;

src/Upyun/ServiceProvider.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Upyun;
+
+class ServiceProvider extends \Illuminate\Support\ServiceProvider
+{
+    protected $defer = true;
+
+    public function register()
+    {
+        $this->app->singleton(Upyun::class, function () {
+            return new Upyun(new Config(config('services.upyun.bucket'), config('services.upyun.operator'), config('services.upyun.password')));
+        });
+
+        $this->app->alias(Upyun::class, 'upyun');
+    }
+
+    public function provides()
+    {
+        return [Upyun::class, 'upyun'];
+    }
+}

src/Upyun/Uploader.php

@@ -24,7 +24,7 @@ public function __construct(Config $config)
 
     public function upload($path, $file, $params, $withAsyncProcess)
     {
-        $stream = Psr7\stream_for($file);
+        $stream = Psr7\Utils::streamFor($file);
         $size = $stream->getSize();
         $useBlock = $this->needUseBlock($size);
 
@@ -67,7 +67,7 @@ private function pointUpload($path, $stream, $params)
         $res = $req->request('PUT', $path)
             ->withHeaders(array_merge(array(
                 'X-Upyun-Multi-Stage' => 'initiate',
-                'X-Upyun-Multi-Type' => Psr7\mimetype_from_filename($path),
+                'X-Upyun-Multi-Type' => Psr7\MimeType::fromFilename($path),
                 'X-Upyun-Multi-Length' => $stream->getSize(),
             ), $headers))
             ->send();
@@ -87,7 +87,7 @@ private function pointUpload($path, $stream, $params)
                     'X-Upyun-Multi-Uuid' => $uuid,
                     'X-Upyun-Part-Id' => $partId
                 ))
-                ->withFile(Psr7\stream_for($fileBlock))
+                ->withFile(Psr7\Utils::streamFor($fileBlock))
                 ->send();
 
             if ($res->getStatusCode() !== 204) {
@@ -146,7 +146,7 @@ private function concurrentPointUpload($path, $stream, $params)
             ->withHeaders(array_merge(array(
                 'X-Upyun-Multi-Disorder' => 'true',
                 'X-Upyun-Multi-Stage' => 'initiate',
-                'X-Upyun-Multi-Type' => Psr7\mimetype_from_filename($path),
+                'X-Upyun-Multi-Type' => Psr7\MimeType::fromFilename($path),
                 'X-Upyun-Multi-Length' => $stream->getSize(),
             ), $headers))
             ->send();
@@ -167,7 +167,7 @@ private function concurrentPointUpload($path, $stream, $params)
                         'X-Upyun-Multi-Uuid' => $uuid,
                         'X-Upyun-Part-Id' => $i
                     ))
-                    ->withFile(Psr7\stream_for($fileBlock))
+                    ->withFile(Psr7\Utils::streamFor($fileBlock))
                     ->toRequest();
             }
         };

src/Upyun/Upyun.php

@@ -24,7 +24,7 @@ class Upyun
 {
 
     /**
-     * @var Config: 服务配置
+     * @var Config 服务配置
      */
     protected $config;
 
@@ -154,7 +154,7 @@ public function read($path, $saveHandler = null, $params = array())
 
         if (! isset($params['x-upyun-list-iter'])) {
             if (is_resource($saveHandler)) {
-                Psr7\copy_to_stream($response->getBody(), Psr7\stream_for($saveHandler));
+                Psr7\Utils::copyToStream($response->getBody(), Psr7\Utils::streamFor($saveHandler));
                 return true;
             } else {
                 return $response->getBody()->getContents();