Merge remote-tracking branch 'origin/master' into 2.0

# Conflicts:
#	.github/workflows/ci-build.yml
#	.gitignore
#	Dockerfile
#	Makefile
#	bin/rr
#	bors.toml
#	cmd/rr/cmd/root.go

3 files changed, 5 insertions, 3 deletions

diff --git a/src/Diactoros/ServerRequestFactory.php b/src/Diactoros/ServerRequestFactory.php
index 3fcf8e29..6a42f207 100644
--- a/src/Diactoros/ServerRequestFactory.php
+++ b/src/Diactoros/ServerRequestFactory.php
@@ -11,12 +11,14 @@ namespace Spiral\RoadRunner\Diactoros;
 
 use Psr\Http\Message\ServerRequestFactoryInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Zend\Diactoros\ServerRequest;
+use Laminas\Diactoros\ServerRequest;
 
 final class ServerRequestFactory implements ServerRequestFactoryInterface
 {
     /**
      * @inheritdoc
+     *
+     * @param array<mixed> $serverParams Array of SAPI parameters with which to seed the generated request instance.
      */
     public function createServerRequest(string $method, $uri, array $serverParams = []): ServerRequestInterface
     {
diff --git a/src/Diactoros/StreamFactory.php b/src/Diactoros/StreamFactory.php
index cc0a5306..68a77e92 100644
--- a/src/Diactoros/StreamFactory.php
+++ b/src/Diactoros/StreamFactory.php
@@ -12,7 +12,7 @@ namespace Spiral\RoadRunner\Diactoros;
 use RuntimeException;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Message\StreamInterface;
-use Zend\Diactoros\Stream;
+use Laminas\Diactoros\Stream;
 
 final class StreamFactory implements StreamFactoryInterface
 {
diff --git a/src/Diactoros/UploadedFileFactory.php b/src/Diactoros/UploadedFileFactory.php
index 45773287..daa475c1 100644
--- a/src/Diactoros/UploadedFileFactory.php
+++ b/src/Diactoros/UploadedFileFactory.php
@@ -12,7 +12,7 @@ namespace Spiral\RoadRunner\Diactoros;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UploadedFileFactoryInterface;
 use Psr\Http\Message\UploadedFileInterface;
-use Zend\Diactoros\UploadedFile;
+use Laminas\Diactoros\UploadedFile;
 
 final class UploadedFileFactory implements UploadedFileFactoryInterface
 {