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
2 changes: 1 addition & 1 deletion .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
with:
repository: nextcloud/server
# the newest release appinfo/info.xml declares support for
ref: stable34
ref: stable35
submodules: true
path: server

Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Additionally, the community document server only supports running on x86-64 Linu
<screenshot>https://raw.githubusercontent.com/nextcloud/documentserver_community/master/screenshots/main.png</screenshot>
<screenshot>https://raw.githubusercontent.com/nextcloud/documentserver_community/master/screenshots/new.png</screenshot>
<dependencies>
<nextcloud min-version="21" max-version="34"/>
<nextcloud min-version="21" max-version="35"/>
</dependencies>

<background-jobs>
Expand Down
2 changes: 1 addition & 1 deletion lib/Command/FlushChanges.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ protected function configure() {
parent::configure();
}

protected function execute(InputInterface $input, OutputInterface $output) {
protected function execute(InputInterface $input, OutputInterface $output): int {
$documents = $this->documentStore->getOpenDocuments();

// One document that will not assemble - a converter that chokes on it,
Expand Down
2 changes: 1 addition & 1 deletion lib/Command/Fonts.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ protected function configure() {
parent::configure();
}

protected function execute(InputInterface $input, OutputInterface $output) {
protected function execute(InputInterface $input, OutputInterface $output): int {
$add = $input->getOption('add');
$remove = $input->getOption('remove');
$rebuild = $input->getOption('rebuild');
Expand Down
2 changes: 1 addition & 1 deletion tests/rig/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ services:
retries: 20

app:
image: ${RIG_NC_IMAGE:-nextcloud:34.0.3-apache}
image: ${RIG_NC_IMAGE:-nextcloud:35.0.2-apache}
depends_on:
db:
condition: service_healthy
Expand Down
4 changes: 3 additions & 1 deletion tests/rig/provision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ USER2_NAME=${RIG_USER2_NAME:-bob}
USER2_PASSWORD=${RIG_USER2_PASSWORD:-Kq7-rigTest-3910}
# Pinned rather than "whatever the app store has today": a connector upgrade
# changing how the editor is embedded is a thing to find out about deliberately.
CONNECTOR_VERSION=${RIG_CONNECTOR_VERSION:-10.1.2}
# 10.1.2 tops out at Nextcloud 34; 10.2.0 is the first release that declares
# support for 35.
CONNECTOR_VERSION=${RIG_CONNECTOR_VERSION:-10.2.1}

occ() { docker exec -u www-data "$APP" php occ "$@"; }
in_app() { docker exec "$APP" sh -c "$*"; }
Expand Down
Loading