Skip to content

Update Guzzle to 6.3 #32537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
phil-davis wants to merge 9 commits into from
Closed

Update Guzzle to 6.3 #32537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5f17d9c
Update libraries, and Guzzle to 6.3
Jun 1, 2017
37fb5e9
Adjust core for Guzzle V6
Jun 1, 2017
1b475ef
Add ::class in tests
phil-davis Aug 14, 2018
bc026cc
Adjust integration tests for Guzzle V6
Jun 1, 2017
c0f434f
Adjust TestHelpers Unit Tests for Guzzle6
phil-davis Jan 16, 2019
c06ed64
Adjust more acceptance test crud
phil-davis Jan 17, 2019
e4ece73
Avoid using getEffectiveUrl() which no longer exists in Guzzle6
phil-davis May 28, 2019
2f21655
Use update-guzzle-6 branch of files_primary_s3 in CI
phil-davis May 28, 2019
f274767
composer update to latest dependencies as at 20190702
phil-davis Jul 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ pipeline:
- cd /drone/src/apps
- git clone https://github.com/owncloud/files_primary_s3.git
- cd files_primary_s3
- git checkout update-guzzle-6
- composer install
- cp tests/drone/${OBJECTSTORE}.config.php /drone/src/config
- cd /drone/src
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"nikic/php-parser": "^4.0",
"icewind/streams": "0.7.1",
"swiftmailer/swiftmailer": "^6.0",
"guzzlehttp/guzzle": "^5.3",
"guzzlehttp/guzzle": "^6.3",
"league/flysystem": "^1.0",
"pear/pear-core-minimal": "^v1.10",
"interfasys/lognormalizer": "^v1.0",
Expand Down
209 changes: 143 additions & 66 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/private/Files/Storage/DAV.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@

use Exception;
use GuzzleHttp\Exception\RequestException;
use GuzzleHttp\Message\ResponseInterface;
use OC\Files\Filesystem;
use OC\Files\Stream\Close;
use Icewind\Streams\IteratorDirectory;
Expand All @@ -50,6 +49,7 @@
use Sabre\HTTP\ClientHttpException;
use Sabre\DAV\Exception\InsufficientStorage;
use OCA\DAV\Connector\Sabre\Exception\Forbidden;
use Psr\Http\Message\ResponseInterface;

/**
* Class DAV
Expand Down
Loading