Skip to content

Adjust PHP dependencies for composer 2.0 #273

New issue

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

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

Already on GitHub? # to your account

Merged
merged 1 commit into from
Nov 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ def phpstan():
default = {
'phpVersions': ['7.2'],
'logLevel': '2',
'extraApps': {},
}

if 'defaults' in config:
Expand Down Expand Up @@ -242,6 +243,7 @@ def phpstan():
'steps':
installCore('daily-master-qa', 'sqlite', False) +
installApp(phpVersion) +
installExtraApps(phpVersion, params['extraApps']) +
setupServerAndApp(phpVersion, params['logLevel']) +
[
{
Expand Down Expand Up @@ -847,7 +849,7 @@ def acceptance():
},
'steps':
installCore(server, db, params['useBundledApp']) +
installTestrunner(phpVersion, params['useBundledApp']) +
installTestrunner('7.4', params['useBundledApp']) +
(installFederated(server, phpVersion, params['logLevel'], db, federationDbSuffix) + owncloudLog('federated') if params['federatedServerNeeded'] else []) +
installApp(phpVersion) +
installExtraApps(phpVersion, params['extraApps']) +
Expand All @@ -860,7 +862,7 @@ def acceptance():
[
({
'name': 'acceptance-tests',
'image': 'owncloudci/php:%s' % phpVersion,
'image': 'owncloudci/php:7.4',
'pull': 'always',
'environment': environment,
'commands': params['extraCommandsBeforeTestRun'] + [
Expand Down
4 changes: 2 additions & 2 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ The use of OAuth2 in ownCloud greatly enhances security while facilitating the i
### Benefits provided by the OAuth2 interface

- No user passwords are being stored in ownCloud clients or third party web applications

Instead of connecting clients with username/password, a user only needs to provide the information once in the browser. The respective client is then provided with a unique access token which is used for future connections to the ownCloud server. ownCloud clients or third party applications never get to know the actual login credentials.

- The use of different access tokens per client provides the ability to selectively revoke user sessions
Expand All @@ -34,7 +34,7 @@ When using OAuth2 a unique access token is generated for each device or third pa
<screenshot>https://raw.githubusercontent.com/owncloud/screenshots/master/oauth2/ownCloud-oauth2-app-auth-request.jpg</screenshot>
<screenshot>https://raw.githubusercontent.com/owncloud/screenshots/master/oauth2/ownCloud-oauth2-app-authorized.jpg</screenshot>
<dependencies>
<owncloud min-version="10.2" max-version="10"/>
<owncloud min-version="10.3" max-version="10"/>
</dependencies>
<types>
<authentication/>
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
],
"config" : {
"platform": {
"php": "7.0.8"
"php": "7.1"
}
},
"require": {
Expand Down
17 changes: 13 additions & 4 deletions composer.lock

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

2 changes: 1 addition & 1 deletion vendor-bin/behat/composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"config" : {
"platform": {
"php": "7.2"
"php": "7.4"
}
},
"require": {
Expand Down