diff options
| -rw-r--r-- | lib/private/Files/ObjectStore/S3Signature.php | 4 | ||||
| -rw-r--r-- | lib/private/Files/ObjectStore/Swift.php | 6 | ||||
| -rw-r--r-- | tests/lib/Http/Client/ResponseTest.php | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/private/Files/ObjectStore/S3Signature.php b/lib/private/Files/ObjectStore/S3Signature.php index 1e5ef697835..64b994bac22 100644 --- a/lib/private/Files/ObjectStore/S3Signature.php +++ b/lib/private/Files/ObjectStore/S3Signature.php @@ -137,7 +137,7 @@ class S3Signature implements SignatureInterface { $modify['set_headers']['X-Amz-Security-Token'] = $token; } - return Psr7\modify_request($request, $modify); + return Psr7\Utils::modifyRequest($request, $modify); } private function signString($string, CredentialsInterface $credentials) { @@ -201,7 +201,7 @@ class S3Signature implements SignatureInterface { $query = $request->getUri()->getQuery(); if ($query) { - $params = Psr7\parse_query($query); + $params = Psr7\Query::parse($query); $first = true; foreach ($this->signableQueryString as $key) { if (array_key_exists($key, $params)) { diff --git a/lib/private/Files/ObjectStore/Swift.php b/lib/private/Files/ObjectStore/Swift.php index 3607eff5b29..a3c8d92f3d2 100644 --- a/lib/private/Files/ObjectStore/Swift.php +++ b/lib/private/Files/ObjectStore/Swift.php @@ -27,7 +27,7 @@ namespace OC\Files\ObjectStore; use GuzzleHttp\Client; use GuzzleHttp\Exception\BadResponseException; -use function GuzzleHttp\Psr7\stream_for; +use GuzzleHttp\Psr7\Utils; use Icewind\Streams\RetryWrapper; use OCP\Files\NotFoundException; use OCP\Files\ObjectStore\IObjectStore; @@ -81,13 +81,13 @@ class Swift implements IObjectStore { if (filesize($tmpFile) < SWIFT_SEGMENT_SIZE) { $this->getContainer()->createObject([ 'name' => $urn, - 'stream' => stream_for($handle), + 'stream' => Utils::streamFor($handle), 'contentType' => $mimetype, ]); } else { $this->getContainer()->createLargeObject([ 'name' => $urn, - 'stream' => stream_for($handle), + 'stream' => Utils::streamFor($handle), 'segmentSize' => SWIFT_SEGMENT_SIZE, 'contentType' => $mimetype, ]); diff --git a/tests/lib/Http/Client/ResponseTest.php b/tests/lib/Http/Client/ResponseTest.php index f8f520d6a73..1384e4e732c 100644 --- a/tests/lib/Http/Client/ResponseTest.php +++ b/tests/lib/Http/Client/ResponseTest.php @@ -9,7 +9,7 @@ namespace Test\Http\Client; use GuzzleHttp\Psr7\Response as GuzzleResponse; -use function GuzzleHttp\Psr7\stream_for; +use GuzzleHttp\Psr7\Utils; use OC\Http\Client\Response; /** @@ -25,7 +25,7 @@ class ResponseTest extends \Test\TestCase { } public function testGetBody() { - $response = new Response($this->guzzleResponse->withBody(stream_for('MyResponse'))); + $response = new Response($this->guzzleResponse->withBody(Utils::streamFor('MyResponse'))); $this->assertSame('MyResponse', $response->getBody()); } |