diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index d25e109..5fb13c0 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -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 diff --git a/appinfo/info.xml b/appinfo/info.xml index dab6c44..a0e0d41 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -33,7 +33,7 @@ Additionally, the community document server only supports running on x86-64 Linu https://raw.githubusercontent.com/nextcloud/documentserver_community/master/screenshots/main.png https://raw.githubusercontent.com/nextcloud/documentserver_community/master/screenshots/new.png - + diff --git a/lib/Command/FlushChanges.php b/lib/Command/FlushChanges.php index 3518851..02a8fc1 100644 --- a/lib/Command/FlushChanges.php +++ b/lib/Command/FlushChanges.php @@ -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, diff --git a/lib/Command/Fonts.php b/lib/Command/Fonts.php index ed98582..b485e60 100644 --- a/lib/Command/Fonts.php +++ b/lib/Command/Fonts.php @@ -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'); diff --git a/tests/rig/docker-compose.yml b/tests/rig/docker-compose.yml index 9c4eb3e..80da6f3 100644 --- a/tests/rig/docker-compose.yml +++ b/tests/rig/docker-compose.yml @@ -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 diff --git a/tests/rig/provision.sh b/tests/rig/provision.sh index 61b47b5..b2f119e 100755 --- a/tests/rig/provision.sh +++ b/tests/rig/provision.sh @@ -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 "$*"; }