Merge branch 'ftp_storage_url' of https://github.com/shadoWalker89/fr…

…amework into shadoWalker89-ftp_storage_url

src/Illuminate/Filesystem/FilesystemAdapter.php

@@ -12,6 +12,7 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use InvalidArgumentException;
+use League\Flysystem\Adapter\Ftp;
 use League\Flysystem\Adapter\Local as LocalAdapter;
 use League\Flysystem\AdapterInterface;
 use League\Flysystem\AwsS3v3\AwsS3Adapter;
@@ -435,6 +436,8 @@ public function url($path)
             return $this->driver->getUrl($path);
         } elseif ($adapter instanceof AwsS3Adapter) {
             return $this->getAwsUrl($adapter, $path);
+        } elseif ($adapter instanceof Ftp) {
+            return $this->getFtpUrl($path);
         } elseif ($adapter instanceof LocalAdapter) {
             return $this->getLocalUrl($path);
         } else {
@@ -487,6 +490,23 @@ protected function getAwsUrl($adapter, $path)
         );
     }
 
+    /**
+     * Get the URL for the file at the given path.
+     *
+     * @param  string  $path
+     * @return string
+     */
+    protected function getFtpUrl($path)
+    {
+        $config = $this->driver->getConfig();
+
+        if ($config->has('url')) {
+            return $this->concatPathToUrl($config->get('url'), $path);
+        }
+
+        return $path;
+    }
+
     /**
      * Get the URL for the file at the given path.
      *