add options argument to temporaryUrl() (#20394)

This allows users to specify additions command arguments such as: `ResponseContentDisposition`.
laravel · Aug 2, 2017 · 868d6dc · 868d6dc
1 parent 2086522
commit 868d6dc
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/Illuminate/Filesystem/FilesystemAdapter.php b/src/Illuminate/Filesystem/FilesystemAdapter.php
@@ -385,9 +385,10 @@ protected function getLocalUrl($path)
      *
      * @param  string  $path
      * @param  \DateTimeInterface  $expiration
+     * @param  array  $options
      * @return string
      */
-    public function temporaryUrl($path, $expiration)
+    public function temporaryUrl($path, $expiration, array $options = [])
     {
         $adapter = $this->driver->getAdapter();
 
@@ -397,10 +398,10 @@ public function temporaryUrl($path, $expiration)
             throw new RuntimeException('This driver does not support creating temporary URLs.');
         }
 
-        $command = $client->getCommand('GetObject', [
+        $command = $client->getCommand('GetObject', array_merge([
             'Bucket' => $adapter->getBucket(),
             'Key' => $adapter->getPathPrefix().$path,
-        ]);
+        ], $options));
 
         return (string) $client->createPresignedRequest(
             $command, $expiration