From 3c4d02c12aecd599d352346f92139c8cdca09073 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Tue, 3 Aug 2021 11:30:16 +0200 Subject: [PATCH 1/5] GuzzleStreamFactory: support guzzle psr7 version 2 --- src/StreamFactory/GuzzleStreamFactory.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/StreamFactory/GuzzleStreamFactory.php b/src/StreamFactory/GuzzleStreamFactory.php index 9adeeb5..4cfc534 100644 --- a/src/StreamFactory/GuzzleStreamFactory.php +++ b/src/StreamFactory/GuzzleStreamFactory.php @@ -3,6 +3,8 @@ namespace Http\Message\StreamFactory; use Http\Message\StreamFactory; +use function GuzzleHttp\Psr7\uri_for; +use GuzzleHttp\Psr7\Utils; /** * Creates Guzzle streams. @@ -18,6 +20,10 @@ final class GuzzleStreamFactory implements StreamFactory */ public function createStream($body = null) { + if (class_exists(Utils::class)) { + return Utils::streamFor($body); + } + return \GuzzleHttp\Psr7\stream_for($body); } } From 462c63e74ea5ac40021d32e3cc76664f01ae3375 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Tue, 3 Aug 2021 11:33:07 +0200 Subject: [PATCH 2/5] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c580bd..3d44e8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [1.11.2] - 2021-XX-XX + +- Support GuzzleHttp/Psr7 version 2.0 in the (deprecated) GuzzleStreamFactory. + ## [1.11.1] - 2021-05-24 - Support GuzzleHttp/Psr7 version 2.0 in the (deprecated) GuzzleUriFactory. From 207b36947a89965998cddb595afbab928395b1ab Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Tue, 3 Aug 2021 11:35:57 +0200 Subject: [PATCH 3/5] Update GuzzleStreamFactory.php --- src/StreamFactory/GuzzleStreamFactory.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/StreamFactory/GuzzleStreamFactory.php b/src/StreamFactory/GuzzleStreamFactory.php index 4cfc534..267c1af 100644 --- a/src/StreamFactory/GuzzleStreamFactory.php +++ b/src/StreamFactory/GuzzleStreamFactory.php @@ -3,7 +3,6 @@ namespace Http\Message\StreamFactory; use Http\Message\StreamFactory; -use function GuzzleHttp\Psr7\uri_for; use GuzzleHttp\Psr7\Utils; /** From d057dc5e652d175c36ec52286bfe10532fcd50de Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Tue, 3 Aug 2021 12:22:26 +0200 Subject: [PATCH 4/5] fix CS --- src/StreamFactory/GuzzleStreamFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/StreamFactory/GuzzleStreamFactory.php b/src/StreamFactory/GuzzleStreamFactory.php index 267c1af..14d83e9 100644 --- a/src/StreamFactory/GuzzleStreamFactory.php +++ b/src/StreamFactory/GuzzleStreamFactory.php @@ -2,8 +2,8 @@ namespace Http\Message\StreamFactory; -use Http\Message\StreamFactory; use GuzzleHttp\Psr7\Utils; +use Http\Message\StreamFactory; /** * Creates Guzzle streams. From bbb1bb7c94a97e79288efdbe652e9b53b35e51db Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Tue, 3 Aug 2021 12:50:21 +0200 Subject: [PATCH 5/5] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d44e8a..0ab29dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [1.11.2] - 2021-XX-XX +## [1.11.2] - 2021-08-03 - Support GuzzleHttp/Psr7 version 2.0 in the (deprecated) GuzzleStreamFactory.