diff --git a/build/integration/composer.json b/build/integration/composer.json index 8a09ed9365dee..a574d9cad2826 100644 --- a/build/integration/composer.json +++ b/build/integration/composer.json @@ -2,7 +2,7 @@ "require-dev": { "phpunit/phpunit": "~6.5", "behat/behat": "~3.10.0", - "guzzlehttp/guzzle": "6.5.2", + "guzzlehttp/guzzle": "7.4.1", "jarnaiz/behat-junit-formatter": "^1.3", "sabre/dav": "4.3.1", "symfony/event-dispatcher": "~5.3" diff --git a/build/integration/features/bootstrap/Avatar.php b/build/integration/features/bootstrap/Avatar.php index 56bf3b5da0f50..6e59beeb7de92 100644 --- a/build/integration/features/bootstrap/Avatar.php +++ b/build/integration/features/bootstrap/Avatar.php @@ -109,7 +109,7 @@ public function loggedInUserGetsTemporaryAvatarWith(string $statusCode) { * @param string $source */ public function loggedInUserPostsTemporaryAvatarFromFile(string $source) { - $file = \GuzzleHttp\Psr7\stream_for(fopen($source, 'r')); + $file = \GuzzleHttp\Psr7\Utils::streamFor(fopen($source, 'r')); $this->sendingAToWithRequesttoken('POST', '/index.php/avatar', [ diff --git a/build/integration/features/bootstrap/ChecksumsContext.php b/build/integration/features/bootstrap/ChecksumsContext.php index 75b9734e0aaed..ae44fcb15034c 100644 --- a/build/integration/features/bootstrap/ChecksumsContext.php +++ b/build/integration/features/bootstrap/ChecksumsContext.php @@ -79,7 +79,7 @@ private function getPasswordForUser($userName) { * @param string $checksum */ public function userUploadsFileToWithChecksum($user, $source, $destination, $checksum) { - $file = \GuzzleHttp\Psr7\stream_for(fopen($source, 'r')); + $file = \GuzzleHttp\Psr7\Utils::streamFor(fopen($source, 'r')); try { $this->response = $this->client->put( $this->baseUrl . '/remote.php/webdav' . $destination, diff --git a/build/integration/features/bootstrap/FilesDropContext.php b/build/integration/features/bootstrap/FilesDropContext.php index d360f51896892..a5d4dad14e3df 100644 --- a/build/integration/features/bootstrap/FilesDropContext.php +++ b/build/integration/features/bootstrap/FilesDropContext.php @@ -51,7 +51,7 @@ public function droppingFileWith($path, $content) { $options['headers'] = [ 'X-REQUESTED-WITH' => 'XMLHttpRequest' ]; - $options['body'] = \GuzzleHttp\Psr7\stream_for($content); + $options['body'] = \GuzzleHttp\Psr7\Utils::streamFor($content); try { $this->response = $client->request('PUT', $fullUrl, $options); diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php index 93602968fb1a1..3ea4831f42cab 100644 --- a/build/integration/features/bootstrap/WebDav.php +++ b/build/integration/features/bootstrap/WebDav.php @@ -493,7 +493,7 @@ public function checkElementList($user, $expectedElements) { * @param string $destination */ public function userUploadsAFileTo($user, $source, $destination) { - $file = \GuzzleHttp\Psr7\stream_for(fopen($source, 'r')); + $file = \GuzzleHttp\Psr7\Utils::streamFor(fopen($source, 'r')); try { $this->response = $this->makeDavRequest($user, "PUT", $destination, [], $file); } catch (\GuzzleHttp\Exception\ServerException $e) { @@ -525,7 +525,7 @@ public function userAddsAFileTo($user, $bytes, $destination) { * @When User :user uploads file with content :content to :destination */ public function userUploadsAFileWithContentTo($user, $content, $destination) { - $file = \GuzzleHttp\Psr7\stream_for($content); + $file = \GuzzleHttp\Psr7\Utils::streamFor($content); try { $this->response = $this->makeDavRequest($user, "PUT", $destination, [], $file); } catch (\GuzzleHttp\Exception\ServerException $e) { @@ -583,7 +583,7 @@ public function userCreatedAFolder($user, $destination) { */ public function userUploadsChunkFileOfWithToWithChecksum($user, $num, $total, $data, $destination) { $num -= 1; - $data = \GuzzleHttp\Psr7\stream_for($data); + $data = \GuzzleHttp\Psr7\Utils::streamFor($data); $file = $destination . '-chunking-42-' . $total . '-' . $num; $this->makeDavRequest($user, 'PUT', $file, ['OC-Chunked' => '1'], $data, "uploads"); } @@ -654,7 +654,7 @@ public function userCreatesANewChunkingUploadWithId($user, $id) { * @Given user :user uploads new chunk file :num with :data to id :id */ public function userUploadsNewChunkFileOfWithToId($user, $num, $data, $id) { - $data = \GuzzleHttp\Psr7\stream_for($data); + $data = \GuzzleHttp\Psr7\Utils::streamFor($data); $destination = '/uploads/' . $user . '/' . $id . '/' . $num; $this->makeDavRequest($user, 'PUT', $destination, [], $data, "uploads"); }