remove deprecated

frostealth · Dec 26, 2015 · ec6c090 · ec6c090
1 parent 3d9a10d
commit ec6c090
Showing 1 changed file with 5 additions and 25 deletions.
diff --git a/src/Storage.php b/src/Storage.php
@@ -79,6 +79,10 @@ public function init()
             throw new InvalidConfigException('You must set bucket name.');
         }
 
+        if (!empty($this->cdnHostname)) {
+            $this->cdnHostname = rtrim($this->cdnHostname, '/');
+        }
+
         $args = $this->prepareArgs($this->options, [
             'version' => '2006-03-01',
             'region' => $this->region,
@@ -169,7 +173,7 @@ public function getPresignedUrl($filename, $expires)
      */
     public function getCdnUrl($filename)
     {
-        return ltrim($this->cdnHostname, '/') . '/' . $filename;
+        return $this->cdnHostname . '/' . $filename;
     }
 
     /**
@@ -199,30 +203,6 @@ public function upload($filename, $source, $acl = null, array $options = [])
         );
     }
 
-    /**
-     * @deprecated
-     * @see self::uploadAsync()
-     *
-     * @param string $filename
-     * @param mixed  $source
-     * @param int    $concurrency
-     * @param int    $partSize
-     * @param string $acl
-     * @param array  $options
-     *
-     * @return \Aws\ResultInterface
-     */
-    public function multipartUpload(
-        $filename,
-        $source,
-        $concurrency = null,
-        $partSize = null,
-        $acl = null,
-        array $options = []
-    ) {
-        return $this->uploadAsync($filename, $source, $concurrency, $partSize, $acl, $options)->wait();
-    }
-
     /**
      * @inheritDoc
      */