chore: backport nextcloud-31 bump commits

.github/workflows/nighlty-ci-release-branch.yml

@@ -1,5 +1,8 @@
-name: Nightly CI Release
+name: Nightly CI (Release branch)
 
+# workflow can be scheduled ONLY from DEFAULT branch
+# > This event will only trigger a workflow run if the workflow file is on the default branch.
+# See: https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#schedule
 on:
   schedule:
     - cron: '0 23 * * *' # run at 10 PM UTC

.github/workflows/shared_workflow.yml

@@ -11,15 +11,27 @@ jobs:
     name: unit tests and linting
     strategy:
       matrix:
-        nextcloudVersion: [ stable30 ]
+        nextcloudVersion: [ stable31, master ]
         phpVersion: [ 8.1, 8.2, 8.3 ]
+        isReleaseBranch:
+          - ${{ startsWith(inputs.branch, 'release/') || startsWith(github.base_ref, 'release/') || startsWith(github.ref, 'refs/heads/release/') }}
+        # will be overridden by the include section
+        exclude:
+          - nextcloudVersion: master
+            isReleaseBranch: true
+          - nextcloudVersion: master
+            phpVersion: 8.1
+          - nextcloudVersion: master
+            phpVersion: 8.2
         include:
           - nextcloudVersion: stable27
             phpVersion: 8.0
           - nextcloudVersion: stable28
             phpVersion: 8.1
           - nextcloudVersion: stable29
             phpVersion: 8.1
+          - nextcloudVersion: stable30
+            phpVersion: 8.2
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout for nightly CI
@@ -80,26 +92,21 @@ jobs:
           cd server && git submodule update --init
           ./occ maintenance:install --admin-pass=admin
 
-      - name: PHP code analysis
+      - name: PHP code analysis and linting
         run: |
           # The following if block can be removed once Nextcloud no longer supports PHP 8.0
           if [ "${{matrix.phpVersion}}" -eq 8 ]; then
             # Ignoring the pact test for php 8.0
             sed -i '/<ignoreFiles>/a \ <file name="tests/lib/Service/OpenProjectAPIServiceTest.php"/>' psalm.xml
           fi
           make psalm
-
-      - name: PHP code style
-        run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )
+          make phpcs || ( echo 'Please run `make phpcs-fix` to format your code' && exit 1 )
 
       - name: Install NPM Dependencies
         run: npm install
 
       - name: JS Lint
-        run: npm run lint
-
-      - name: Style Lint
-        run: npm run stylelint
+        run: make lint-js || ( echo 'Please run `make lint-js-fix` to format your code' && exit 1 )
 
       - name: PHP & Vue Unit Tests
         run: |
@@ -180,13 +187,25 @@ jobs:
     name: API tests
     strategy:
       matrix:
-        nextcloudVersion: [ stable30 ]
+        nextcloudVersion: [ stable31, master ]
         phpVersionMajor: [ 8 ]
         phpVersionMinor: [ 1, 2, 3 ]
         database: [ mysql ]
+        isReleaseBranch:
+          - ${{ startsWith(inputs.branch, 'release/') || startsWith(github.base_ref, 'release/') || startsWith(github.ref, 'refs/heads/release/') }}
+        # will be overridden by the include section
+        exclude:
+          - nextcloudVersion: master
+            isReleaseBranch: true
+          - nextcloudVersion: master
+            phpVersionMajor: 8
+            phpVersionMinor: 1
+          - nextcloudVersion: master
+            phpVersionMajor: 8
+            phpVersionMinor: 2
         include:
           # Each database once on the newest Server with preinstalled PHP version
-          - nextcloudVersion: stable30
+          - nextcloudVersion: stable31
             phpVersionMajor: 8
             phpVersionMinor: 1
             database: pgsql
@@ -202,6 +221,11 @@ jobs:
             phpVersionMajor: 8
             phpVersionMinor: 1
             database: mysql
+          - nextcloudVersion: stable30
+            phpVersionMajor: 8
+            phpVersionMinor: 2
+            database: mysql
+
     runs-on: ubuntu-20.04
     container:
       image: public.ecr.aws/lts/ubuntu:20.04

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Changed
+- Support Nextcloud 31
 
 ## 2.7.2 - 2024-12-16
 ### Fixed

appinfo/info.xml

@@ -3,7 +3,8 @@
 	<id>integration_openproject</id>
 	<name>OpenProject Integration</name>
 	<summary>Link Nextcloud files to OpenProject work packages</summary>
-	<description><![CDATA[This application enables seamless integration with open source project management and collaboration software OpenProject.
+	<description>
+		<![CDATA[This application enables seamless integration with open source project management and collaboration software OpenProject.
 
 On the Nextcloud end, it allows users to:
 
@@ -24,7 +25,8 @@ On the OpenProject end, users are able to:
 * Let OpenProject create shared folders per project
 
 For more information on how to set up and use the OpenProject application, please refer to [integration setup guide](https://www.openproject.org/docs/system-admin-guide/integrations/nextcloud/) for administrators and [the user guide](https://www.openproject.org/docs/user-guide/nextcloud-integration/).
-	]]></description>
+	]]>
+	</description>
 	<version>2.7.2</version>
 	<licence>agpl</licence>
 	<author>Julien Veyssier</author>
@@ -41,7 +43,7 @@ For more information on how to set up and use the OpenProject application, pleas
 	<screenshot>https://github.com/nextcloud/integration_openproject/raw/master/img/screenshot1.png</screenshot>
 	<screenshot>https://github.com/nextcloud/integration_openproject/raw/master/img/screenshot2.png</screenshot>
 	<dependencies>
-		<nextcloud min-version="27" max-version="30" />
+		<nextcloud min-version="27" max-version="31" />
 	</dependencies>
 	<background-jobs>
 		<job>OCA\OpenProject\BackgroundJob\RemoveExpiredDirectUploadTokens</job>

bootstrap.php

@@ -4,7 +4,9 @@
 use Composer\Autoload\ClassLoader;
 
 include_once __DIR__.'/vendor/autoload.php';
-if (file_exists(__DIR__ . '/server')) {
+if (getenv('SERVER_PATH')) {
+	$serverPath = getenv('SERVER_PATH');
+} elseif (file_exists(__DIR__ . '/server')) {
 	$serverPath = __DIR__ . '/server';
 } else {
 	$serverPath = __DIR__ . '/../..';

composer.json

@@ -12,7 +12,10 @@
 	},
 	"scripts": {
 		"cs:fix": "php-cs-fixer fix",
-		"cs:check": "php-cs-fixer fix --dry-run --diff"
+		"cs:check": "php-cs-fixer fix --dry-run --diff",
+		"psalm": "psalm",
+		"test:unit": "phpunit",
+		"test:api": "behat -c tests/acceptance/config/behat.yml"
 	},
 	"config": {
 		"allow-plugins": {

dev/keycloak.yaml

@@ -17,6 +17,7 @@ services:
         'start-dev',
         '--proxy edge',
         '--spi-connections-http-client-default-disable-trust-manager=true',
+        '--import-realm'
       ]
     environment:
       KC_DB: postgres
@@ -32,6 +33,7 @@ services:
     networks:
       - nc-op
     volumes:
+      - ./opnc-realm.json:/opt/keycloak/data/import/opnc-realm.json
       - step:/step:ro
       - keycloakdata:/opt/keycloak/data/
     labels: