Skip to content

[WIP] Guzzle6 for core #38706

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 6 commits into from
Closed

[WIP] Guzzle6 for core #38706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
11bab43
Update guzzle to 6.5
phil-davis May 7, 2021
0f9b4f8
Adjust core code for Guzzle6
phil-davis Feb 24, 2020
fdf119f
Fixup Client get
phil-davis Feb 25, 2020
afb69f3
Temporarily test with files_primary_s3 from update-guzzle-6 branch
phil-davis Apr 7, 2020
daa8e2c
Bump existing dependencies in apps/files_external/3rdparty
phil-davis May 7, 2021
3234cb3
Update guzzle to 6.5 in apps/files_external/3rdparty
phil-davis May 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .drone.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2245,6 +2245,9 @@ def installExtraApps(phpVersion, extraApps, pathOfServerUnderTest = '/drone/src'
commandArray = []
for app, command in extraApps.items():
commandArray.append('ls %s/apps/%s || git clone https://github.com/owncloud/%s.git %s/apps/%s' % (pathOfServerUnderTest, app, app, pathOfServerUnderTest, app))
if (app == 'files_primary_s3'):
commandArray.append('cd /drone/src/apps/%s' % app)
commandArray.append('git checkout update-guzzle-6')
if (command != ''):
commandArray.append('cd %s/apps/%s' % (pathOfServerUnderTest, app))
commandArray.append(command)
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/3rdparty/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"icewind/smb": "3.4.1",
"icewind/streams": "0.7.4",
"google/apiclient": "2.9.1",
"guzzlehttp/guzzle": "^5.3"
"guzzlehttp/guzzle": "^6.5"
},
"autoload": {
"files": ["../lib/config.php"]
Expand Down
Loading