Allow Storage::put to accept a Psr StreamInterface

Remove brackets arround URL php artisan serve (laravel#30168)

To allow opening the development URL in Visual Studio Code with ctrl + click the bracket after the URL needs to be removed.
This patch wil remove the brackets around the url.

add test for sorted middlewares (laravel#30166)

[6.x] Apply limit to database rather than collection (laravel#30148)

* Apply limit to database rather than collection

For HasInDatabase.php

* Fix tests

* Add to SoftDeleted trait as well

* Update HasInDatabase.php

* Update SoftDeletedInDatabase.php

[6.x] Allow to use scoped macro in nested queries (laravel#30127)

* Allow to use scoped macro in nested queries.

* Use newQueryWithoutRelationships

composer.json

@@ -29,6 +29,7 @@
         "opis/closure": "^3.1",
         "psr/container": "^1.0",
         "psr/simple-cache": "^1.0",
+        "psr/http-message": "^1.0",
         "ramsey/uuid": "^3.7",
         "swiftmailer/swiftmailer": "^6.0",
         "symfony/console": "^4.3.4",

src/Illuminate/Filesystem/FilesystemAdapter.php

@@ -20,6 +20,7 @@
 use League\Flysystem\FileNotFoundException;
 use League\Flysystem\FilesystemInterface;
 use PHPUnit\Framework\Assert as PHPUnit;
+use Psr\Http\Message\StreamInterface;
 use RuntimeException;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
@@ -203,6 +204,10 @@ public function put($path, $contents, $options = [])
             return $this->putFile($path, $contents, $options);
         }
 
+        if ($contents instanceof StreamInterface) {
+            return $this->driver->putStream($path, $contents->detach(), $options);
+        }
+
         return is_resource($contents)
                 ? $this->driver->putStream($path, $contents, $options)
                 : $this->driver->put($path, $contents, $options);

tests/Filesystem/FilesystemAdapterTest.php

@@ -2,13 +2,16 @@
 
 namespace Illuminate\Tests\Filesystem;
 
+use GuzzleHttp\Psr7\Stream;
 use Illuminate\Contracts\Filesystem\FileExistsException;
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Illuminate\Filesystem\FilesystemAdapter;
 use InvalidArgumentException;
 use League\Flysystem\Adapter\Local;
 use League\Flysystem\Filesystem;
+use Mockery as m;
 use PHPUnit\Framework\TestCase;
+use Psr\Http\Message\StreamInterface;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class FilesystemAdapterTest extends TestCase
@@ -26,6 +29,7 @@ protected function tearDown(): void
     {
         $filesystem = new Filesystem(new Local(dirname($this->tempDir)));
         $filesystem->deleteDir(basename($this->tempDir));
+        m::close();
     }
 
     public function testResponse()
@@ -218,4 +222,17 @@ public function testStreamInvalidResourceThrows()
         $filesystemAdapter = new FilesystemAdapter($this->filesystem);
         $filesystemAdapter->writeStream('file.txt', 'foo bar');
     }
+
+    public function testPutWithStreamInterface()
+    {
+        file_put_contents($this->tempDir.'/foo.txt', 'some-data');
+        $spy = m::spy($this->filesystem);
+
+        $filesystemAdapter = new FilesystemAdapter($spy);
+        $stream = new Stream(fopen($this->tempDir.'/foo.txt', 'r'));
+        $filesystemAdapter->put('bar.txt', $stream);
+
+        $spy->shouldHaveReceived('putStream');
+        $this->assertEquals('some-data', $filesystemAdapter->get('bar.txt'));
+    }
 }