Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichaIng <micha@dietpi.com>2022-02-23 02:12:08 +0300
committerGitHub <noreply@github.com>2022-02-23 02:12:08 +0300
commit56d75b87efbf6ba2dabb095ace7f558deab651ef (patch)
tree5d48ee58c74160b679e0eb8274c8f20b4e1fa59c
parent9e80f6f18a2247d60438cac64fe52156a79ff93d (diff)
parente4588a37d06f607776b731dd19ae862fbe91fe27 (diff)
Merge pull request #30210 from nextcloud/dependabot/composer/build/integration/guzzlehttp/guzzle-7.4.1
Update guzzlehttp/guzzle requirement from 6.5.2 to 7.4.1 in /build/integration
-rw-r--r--build/integration/composer.json2
-rw-r--r--build/integration/features/bootstrap/Avatar.php2
-rw-r--r--build/integration/features/bootstrap/ChecksumsContext.php2
-rw-r--r--build/integration/features/bootstrap/FilesDropContext.php2
-rw-r--r--build/integration/features/bootstrap/WebDav.php8
5 files changed, 8 insertions, 8 deletions
diff --git a/build/integration/composer.json b/build/integration/composer.json
index 8a09ed9365d..a574d9cad28 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 56bf3b5da0f..6e59beeb7de 100644
--- a/build/integration/features/bootstrap/Avatar.php
+++ b/build/integration/features/bootstrap/Avatar.php
@@ -109,7 +109,7 @@ trait Avatar {
* @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 75b9734e0aa..ae44fcb1503 100644
--- a/build/integration/features/bootstrap/ChecksumsContext.php
+++ b/build/integration/features/bootstrap/ChecksumsContext.php
@@ -79,7 +79,7 @@ class ChecksumsContext implements \Behat\Behat\Context\Context {
* @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 d360f518968..a5d4dad14e3 100644
--- a/build/integration/features/bootstrap/FilesDropContext.php
+++ b/build/integration/features/bootstrap/FilesDropContext.php
@@ -51,7 +51,7 @@ class FilesDropContext implements Context, SnippetAcceptingContext {
$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 93602968fb1..3ea4831f42c 100644
--- a/build/integration/features/bootstrap/WebDav.php
+++ b/build/integration/features/bootstrap/WebDav.php
@@ -493,7 +493,7 @@ trait WebDav {
* @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 @@ trait WebDav {
* @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 @@ trait WebDav {
*/
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 @@ trait WebDav {
* @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");
}