Skip to content

Commit 169cc7e

Browse files
committed
Merge branch '2.x' into 1.x
* 2.x: Php < 7.0 opcache issue
2 parents d98f60a + ec5917f commit 169cc7e

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/HttpMessage/Utility/HttpFoundationBridge.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
use bdk\HttpMessage\Response as BdkResponse;
1616
use bdk\HttpMessage\ServerRequestExtended;
17-
use bdk\HttpMessage\Stream;
17+
use bdk\HttpMessage\Stream as BdkStream;
1818
use bdk\HttpMessage\UploadedFile;
1919
use bdk\HttpMessage\Uri as BdkUri;
2020
use Symfony\Component\HttpFoundation\BinaryFileResponse;
@@ -50,7 +50,7 @@ public static function createRequest(HttpFoundationRequest $request)
5050
$uri = new BdkUri($uri);
5151

5252
$bodyContentResource = $request->getContent(true);
53-
$stream = new Stream($bodyContentResource);
53+
$stream = new BdkStream($bodyContentResource);
5454

5555
$psr7request = new ServerRequestExtended($request->getMethod(), $uri, $request->server->all());
5656
$psr7request = $psr7request
@@ -104,15 +104,15 @@ public static function createResponse(HttpFoundationResponse $response)
104104
*
105105
* @param HttpFoundationResponse $response response instance
106106
*
107-
* @return Stream
107+
* @return BdkStream
108108
*/
109109
private static function createResponseStream(HttpFoundationResponse $response)
110110
{
111111
if ($response instanceof BinaryFileResponse && !$response->headers->has('Content-Range')) {
112112
$pathName = $response->getFile()->getPathname();
113-
return new Stream(\fopen($pathName, 'rb+'));
113+
return new BdkStream(\fopen($pathName, 'rb+'));
114114
}
115-
$stream = new Stream(\fopen('php://temp', 'wb+'));
115+
$stream = new BdkStream(\fopen('php://temp', 'wb+'));
116116
if ($response instanceof StreamedResponse || $response instanceof BinaryFileResponse) {
117117
\ob_start(
118118
/**

0 commit comments

Comments
 (0)