sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
pull/31271/head
MichaIng 2022-02-23 00:12:08 +07:00 committed by GitHub
parent 9e80f6f18a e4588a37d0
commit 56d75b87ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/integration/composer.json
Unescape Escape View File

@ -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"

2
build/integration/features/bootstrap/Avatar.php
Unescape Escape View File

@ -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',
[

2
build/integration/features/bootstrap/ChecksumsContext.php
Unescape Escape View File

@ -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,

2
build/integration/features/bootstrap/FilesDropContext.php
Unescape Escape View File

@ -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);

8
build/integration/features/bootstrap/WebDav.php
Unescape Escape View File

@ -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");
}