Detach stream before serializing PSR-7 response

Author: nicolas-grekas

.github/workflows/tests.yml

@@ -74,7 +74,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "friends-of-phpspec/phpspec-code-coverage:^4.3.2" --no-interaction --no-update
+          composer require "friends-of-phpspec/phpspec-code-coverage" --no-interaction --no-update
           composer update --prefer-dist --no-interaction --no-progress
 
       - name: Execute tests

src/CachePlugin.php

@@ -195,11 +195,7 @@ protected function doHandleRequest(RequestInterface $request, callable $next, ca
             if ($this->isCacheable($response) && $this->isCacheableRequest($request)) {
                 $bodyStream = $response->getBody();
                 $body = $bodyStream->__toString();
-                if ($bodyStream->isSeekable()) {
-                    $bodyStream->rewind();
-                } else {
-                    $response = $response->withBody($this->streamFactory->createStream($body));
-                }
+                $bodyStream->detach();
 
                 $maxAge = $this->getMaxAge($response);
                 $cacheItem
@@ -212,6 +208,13 @@ protected function doHandleRequest(RequestInterface $request, callable $next, ca
                         'etag' => $response->getHeader('ETag'),
                     ]);
                 $this->pool->save($cacheItem);
+
+                $bodyStream = $this->streamFactory->createStream($body);
+                if ($bodyStream->isSeekable()) {
+                    $bodyStream->rewind();
+                }
+
+                $response = $response->withBody($bodyStream);
             }
 
             return $this->handleCacheListeners($request, $response, false, $cacheItem);