Skip to content
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: 3 additions & 3 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ MINIO_MC = "minio/mc:RELEASE.2020-12-18T10-53-53Z"
OC_CI_ALPINE = "owncloudci/alpine:latest"
OC_CI_BAZEL_BUILDIFIER = "owncloudci/bazel-buildifier"
OC_CI_CEPH = "owncloudci/ceph:tag-build-master-jewel-ubuntu-16.04"
OC_CI_CORE = "owncloudci/core"
OC_CI_CORE = "owncloudci/core:php83"
OC_CI_DRONE_SKIP_PIPELINE = "owncloudci/drone-skip-pipeline"
OC_CI_NODEJS = "owncloudci/nodejs:%s"
OC_CI_ORACLE_XE = "owncloudci/oracle-xe:latest"
Expand All @@ -21,7 +21,7 @@ SELENIUM_STANDALONE_CHROME_DEBUG = "selenium/standalone-chrome-debug:3.141.59-ox
SELENIUM_STANDALONE_FIREFOX_DEBUG = "selenium/standalone-firefox-debug:3.8.1"
SONARSOURCE_SONAR_SCANNER_CLI = "sonarsource/sonar-scanner-cli"

DEFAULT_PHP_VERSION = "7.4"
DEFAULT_PHP_VERSION = "8.3"
DEFAULT_NODEJS_VERSION = "14"

# minio mc environment variables
Expand Down Expand Up @@ -843,7 +843,7 @@ def acceptance(ctx):
errorFound = False

default = {
"servers": ["daily-master-qa", "latest"],
"servers": ["daily-master-qa"],
"browsers": ["chrome"],
"phpVersions": [DEFAULT_PHP_VERSION],
"databases": ["mariadb:10.2"],
Expand Down
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: 2
updates:
- package-ecosystem: composer
directory: "/"
schedule:
interval: daily
time: "22:00"
open-pull-requests-limit: 10
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ concurrency:

env:
APP_NAME: oauth2
PHP_VERSIONS: '["7.4"]'
PHP_VERSIONS: '["8.3"]'

jobs:
get-vars:
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,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-authorized.jpg</screenshot>
<dependencies>
<owncloud min-version="11" max-version="11" />
<php min-version="7.4" />
<php min-version="8.3" />
</dependencies>
<types>
<authentication/>
Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
],
"config" : {
"platform": {
"php": "7.3"
"php": "8.3"
},
"allow-plugins": {
"bamarni/composer-bin-plugin": true
Expand All @@ -19,7 +19,8 @@
"rowbot/url": "^1.1"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8"
"bamarni/composer-bin-plugin": "^1.8",
"roave/security-advisories": "dev-latest"
},
"extra": {
"bamarni-bin": {
Expand Down
1,060 changes: 1,046 additions & 14 deletions composer.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions templates/switch-user.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
<br>
<p><?php
print_unescaped($l->t(
'You are logged in as %s but the application requested access for user %s.',
[$_['current_user'], $_['requested_user']]
)); ?>
'You are logged in as %s but the application requested access for user %s.',
[$_['current_user'], $_['requested_user']]
)); ?>
</p>
<br>
<a href="<?php p($_['logout_url']); ?>">
Expand Down
2 changes: 1 addition & 1 deletion vendor-bin/owncloud-codestyle/composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"require": {
"owncloud/coding-standard": "^4.1"
"owncloud/coding-standard": "^5.3"
}
}
Loading