Merge pull request #20 from ebln/liberal72

Unstricten dependencies and reintroducted deprecated stream_for
ebln · Jul 10, 2021 · 7a07c72 · 7a07c72
2 parents 84158e0 + 7060224
commit 7a07c72
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 22 deletions.
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         }
     },
     "require": {
-        "guzzlehttp/psr7": "^1.8",
+        "guzzlehttp/psr7": "~1.6.1",
         "php": "^7.2",
         "webmozart/assert": "^1.6"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/src/Adapter/CommonAdapterTrait.php b/src/Adapter/CommonAdapterTrait.php
@@ -7,7 +7,7 @@
 namespace brnc\Symfony1\Message\Adapter;
 
 use brnc\Symfony1\Message\Utillity\Assert;
-use GuzzleHttp\Psr7\Utils;
+use function GuzzleHttp\Psr7\stream_for;
 use Psr\Http\Message\StreamInterface;
 
 /**
@@ -83,7 +83,7 @@ public function withHeader($name, $value)
      */
     public function getBody(): StreamInterface
     {
-        return $this->body ?? Utils::streamFor();
+        return $this->body ?? stream_for();
     }
 
     /**

diff --git a/src/Adapter/Request.php b/src/Adapter/Request.php
@@ -9,9 +9,9 @@
 use brnc\Symfony1\Message\Utillity\Assert;
 use GuzzleHttp\Psr7\CachingStream;
 use GuzzleHttp\Psr7\LazyOpenStream;
+use function GuzzleHttp\Psr7\stream_for;
 use GuzzleHttp\Psr7\UploadedFile;
 use GuzzleHttp\Psr7\Uri;
-use GuzzleHttp\Psr7\Utils;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UriInterface;
@@ -107,7 +107,7 @@ public static function fromSfWebRequest(\sfWebRequest $sfWebRequest, array $opti
             $content = $sfWebRequest->getContent();
             if (false !== $content) {
                 // lazy init, as getBody() defaults properly to an empty body using stream_for()
-                $new->body = Utils::streamFor($content);
+                $new->body = stream_for($content);
             }
         }
 

diff --git a/src/Adapter/Response.php b/src/Adapter/Response.php
@@ -6,7 +6,7 @@
 namespace brnc\Symfony1\Message\Adapter;
 
 use brnc\Symfony1\Message\Utillity\Assert;
-use GuzzleHttp\Psr7\Utils;
+use function GuzzleHttp\Psr7\stream_for;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
 use ReflectionObject;
@@ -225,7 +225,7 @@ public function getBody(): StreamInterface
     {
         if (!$this->body || !$this->body->isReadable()) {
             // Refresh from adapted sfWebRequest if stream is missing or stale
-            $this->body = Utils::streamFor($this->sfWebResponse->getContent());
+            $this->body = stream_for($this->sfWebResponse->getContent());
         }
 
         return $this->body;