Revert "Nextcloud 28 support"

.github/workflows/appstore-build-publish.yml

@@ -7,7 +7,7 @@ on:
     types: [published]
 
 env:
-  PHP_VERSION: 8.2
+  PHP_VERSION: 8.1
 
 jobs:
   build_and_publish:
@@ -24,7 +24,7 @@ jobs:
           name: notify-push
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
       - name: Checkout code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       ### Adjustments end ###
@@ -41,7 +41,7 @@ jobs:
           echo "APP_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
 
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
           path: ${{ env.APP_NAME }}
 
@@ -53,19 +53,19 @@ jobs:
           expression: "//info//dependencies//nextcloud/@min-version"
 
       - name: Read package.json node and npm engines version
-        uses: skjnldsv/read-package-engines-version-actions@8205673bab74a63eb9b8093402fd9e0e018663a1 # v2.2
+        uses: skjnldsv/read-package-engines-version-actions@0ce2ed60f6df073a62a77c0a4958dd0fc68e32e7 # v2.1
         id: versions
         # Continue if no package.json
         continue-on-error: true
         with:
           path: ${{ env.APP_NAME }}
-          fallbackNode: '^20'
+          fallbackNode: "^16"
-          fallbackNpm: '^9'
+          fallbackNpm: "^7"
 
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
         # Skip if no package.json
         if: ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v3
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 
@@ -75,7 +75,7 @@ jobs:
         run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
 
       - name: Set up php ${{ env.PHP_VERSION }}
-        uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2
+        uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
         with:
           php-version: ${{ env.PHP_VERSION }}
           coverage: none
@@ -97,8 +97,6 @@ jobs:
       - name: Build ${{ env.APP_NAME }}
         # Skip if no package.json
         if: ${{ steps.versions.outputs.nodeVersion }}
-        env:
-          CYPRESS_INSTALL_BINARY: 0
         run: |
           cd ${{ env.APP_NAME }}
           npm ci
@@ -137,7 +135,7 @@ jobs:
           unzip latest-$NCVERSION.zip
 
       - name: Checkout server master fallback
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         if: ${{ steps.server-checkout.outcome != 'success' }}
         with:
           submodules: true
@@ -160,7 +158,7 @@ jobs:
           tar -zcvf ${{ env.APP_NAME }}.tar.gz ${{ env.APP_NAME }}
 
       - name: Attach tarball to github release
-        uses: svenstaro/upload-release-action@1beeb572c19a9242f4361f4cee78f8e0d9aec5df # v2
+        uses: svenstaro/upload-release-action@2b9d2847a97b04d02ad5c3df2d3a27baa97ce689 # v2
         id: attach_to_release
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lint-php-cs.yml

@@ -22,16 +22,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
-      - name: Get php version
+      - name: Set up php
-        id: versions
+        uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
-        uses: icewind1991/nextcloud-version-matrix@334a77e02e5684ba9da35933db0d7110356bf3ba # v1.1.0
-
-      - name: Set up php${{ steps.versions.outputs.php-max }}
-        uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2
         with:
-          php-version: ${{ steps.versions.outputs.php-max }}
+          php-version: 8.1
           coverage: none
           ini-file: development
         env:

.github/workflows/lint-php.yml

@@ -5,7 +5,13 @@
 
 name: Lint php
 
-on: pull_request
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+      - master
+      - stable*
 
 permissions:
   contents: read
@@ -15,32 +21,20 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  matrix:
-    runs-on: ubuntu-latest
-    outputs:
-      php-versions: ${{ steps.versions.outputs.php-versions }}
-    steps:
-      - name: Checkout app
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - name: Get version matrix
-        id: versions
-        uses: icewind1991/nextcloud-version-matrix@111919cfc7b388b7c02cac3c5d53627137adb89f # v1.0.0
-
   php-lint:
     runs-on: ubuntu-latest
-    needs: matrix
     strategy:
       matrix:
-        php-versions: ${{fromJson(needs.matrix.outputs.php-versions)}}
+        php-versions: [ "8.0", "8.1", "8.2" ]
 
     name: php-lint
 
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2
+        uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
         with:
           php-version: ${{ matrix.php-versions }}
           coverage: none

.github/workflows/phpunit-mysql.yml

@@ -3,9 +3,27 @@
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
 
-name: PHPUnit MySQL
+name: PHPUnit mysql
 
-on: pull_request
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/**'
+      - 'appinfo/**'
+      - 'lib/**'
+      - 'templates/**'
+      - 'tests/**'
+      - 'vendor/**'
+      - 'vendor-bin/**'
+      - '.php-cs-fixer.dist.php'
+      - 'composer.json'
+      - 'composer.lock'
+
+  push:
+    branches:
+      - main
+      - master
+      - stable*
 
 permissions:
   contents: read
@@ -15,57 +33,17 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  matrix:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.versions.outputs.matrix }}
-    steps:
-      - name: Checkout app
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - name: Get version matrix
-        id: versions
-        uses: icewind1991/nextcloud-version-matrix@8238a96541a763c633c093b203f3c8a33fcee037 # v1.0.0
-        with:
-          matrix: '{"mysql-versions": ["8.1"]}'
-
-  changes:
-    runs-on: ubuntu-latest
-
-    outputs:
-      src: ${{ steps.changes.outputs.src}}
-
-    steps:
-      - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
-        id: changes
-        continue-on-error: true
-        with:
-          filters: |
-            src:
-              - '.github/workflows/**'
-              - 'appinfo/**'
-              - 'lib/**'
-              - 'templates/**'
-              - 'tests/**'
-              - 'vendor/**'
-              - 'vendor-bin/**'
-              - '.php-cs-fixer.dist.php'
-              - 'composer.json'
-              - 'composer.lock'
-
   phpunit-mysql:
     runs-on: ubuntu-latest
 
-    needs: [changes, matrix]
-    if: needs.changes.outputs.src != 'false'
-
     strategy:
-      matrix: ${{ fromJson(needs.matrix.outputs.matrix) }}
+      matrix:
-
+        php-versions: ['8.0', '8.1', '8.2']
-    name: MySQL ${{ matrix.mysql-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
+        server-versions: ['master']
 
     services:
       mysql:
-        image: ghcr.io/nextcloud/continuous-integration-mysql-${{ matrix.mysql-versions }}:latest
+        image: ghcr.io/nextcloud/continuous-integration-mariadb-10.6:latest
         ports:
           - 4444:3306/tcp
         env:
@@ -78,20 +56,26 @@ jobs:
           # Split and keep last
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
+      - name: Enable ONLY_FULL_GROUP_BY MySQL option
+        run: |
+          sleep 20
+          echo "SET GLOBAL sql_mode=(SELECT CONCAT(@@sql_mode,',ONLY_FULL_GROUP_BY'));" | mysql -h 127.0.0.1 -P 4444 -u root -prootpassword
+          echo "SELECT @@sql_mode;" | mysql -h 127.0.0.1 -P 4444 -u root -prootpassword
+
       - name: Checkout server
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
           submodules: true
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
 
       - name: Checkout app
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2
+        uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -101,11 +85,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Enable ONLY_FULL_GROUP_BY MySQL option
-        run: |
-          echo "SET GLOBAL sql_mode=(SELECT CONCAT(@@sql_mode,',ONLY_FULL_GROUP_BY'));" | mysql -h 127.0.0.1 -P 4444 -u root -prootpassword
-          echo "SELECT @@sql_mode;" | mysql -h 127.0.0.1 -P 4444 -u root -prootpassword
-
       - name: Check composer file existence
         id: check_composer
         uses: andstor/file-existence-action@20b4d2e596410855db8f9ca21e96fbe18e12930b # v2
@@ -116,7 +95,7 @@ jobs:
         # Only run if phpunit config file exists
         if: steps.check_composer.outputs.files_exists == 'true'
         working-directory: apps/${{ env.APP_NAME }}
-        run: rm composer.lock && composer i
+        run: composer i
 
       - name: Set up Nextcloud
         env:
@@ -173,7 +152,7 @@ jobs:
     permissions:
       contents: none
     runs-on: ubuntu-latest
-    needs: [changes, phpunit-mysql]
+    needs: phpunit-mysql
 
     if: always()
 
@@ -181,4 +160,4 @@ jobs:
 
     steps:
       - name: Summary status
-        run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-mysql.result != 'success' }}; then exit 1; fi
+        run: if ${{ needs.phpunit-mysql.result != 'success' }}; then exit 1; fi

.github/workflows/phpunit-oci.yml

@@ -5,7 +5,25 @@
 
 name: PHPUnit OCI
 
-on: pull_request
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/**'
+      - 'appinfo/**'
+      - 'lib/**'
+      - 'templates/**'
+      - 'tests/**'
+      - 'vendor/**'
+      - 'vendor-bin/**'
+      - '.php-cs-fixer.dist.php'
+      - 'composer.json'
+      - 'composer.lock'
+
+  push:
+    branches:
+      - main
+      - master
+      - stable*
 
 permissions:
   contents: read
@@ -15,52 +33,13 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  matrix:
-    runs-on: ubuntu-latest
-    outputs:
-      php-max: ${{ steps.versions.outputs.php-max-list }}
-      server-max: ${{ steps.versions.outputs.branches-max-list }}
-    steps:
-      - name: Checkout app
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - name: Get version matrix
-        id: versions
-        uses: icewind1991/nextcloud-version-matrix@c2bf575a3516752db5ce2915499d3f694885e2c7 # v1.0.0
-
-  changes:
-    runs-on: ubuntu-latest
-
-    outputs:
-      src: ${{ steps.changes.outputs.src}}
-
-    steps:
-      - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
-        id: changes
-        continue-on-error: true
-        with:
-          filters: |
-            src:
-              - '.github/workflows/**'
-              - 'appinfo/**'
-              - 'lib/**'
-              - 'templates/**'
-              - 'tests/**'
-              - 'vendor/**'
-              - 'vendor-bin/**'
-              - '.php-cs-fixer.dist.php'
-              - 'composer.json'
-              - 'composer.lock'
-
   phpunit-oci:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
-
-    needs: [changes, matrix]
-    if: needs.changes.outputs.src != 'false'
 
     strategy:
       matrix:
-        php-versions: ${{ fromJson(needs.matrix.outputs.php-max) }}
+        php-versions: ['8.0']
-        server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
+        server-versions: ['master']
 
     services:
       oracle:
@@ -90,19 +69,19 @@ jobs:
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Checkout server
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
           submodules: true
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
 
       - name: Checkout app
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2
+        uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -179,7 +158,7 @@ jobs:
     permissions:
       contents: none
     runs-on: ubuntu-latest
-    needs: [changes, phpunit-oci]
+    needs: phpunit-oci
 
     if: always()
 
@@ -187,4 +166,4 @@ jobs:
 
     steps:
       - name: Summary status
-        run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-oci.result != 'success' }}; then exit 1; fi
+        run: if ${{ needs.phpunit-oci.result != 'success' }}; then exit 1; fi

.github/workflows/phpunit-pgsql.yml

@@ -5,7 +5,25 @@
 
 name: PHPUnit pgsql
 
-on: pull_request
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/**'
+      - 'appinfo/**'
+      - 'lib/**'
+      - 'templates/**'
+      - 'tests/**'
+      - 'vendor/**'
+      - 'vendor-bin/**'
+      - '.php-cs-fixer.dist.php'
+      - 'composer.json'
+      - 'composer.lock'
+
+  push:
+    branches:
+      - main
+      - master
+      - stable*
 
 permissions:
   contents: read
@@ -15,52 +33,13 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  matrix:
-    runs-on: ubuntu-latest
-    outputs:
-      php-max: ${{ steps.versions.outputs.php-max-list }}
-      server-max: ${{ steps.versions.outputs.branches-max-list }}
-    steps:
-      - name: Checkout app
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - name: Get version matrix
-        id: versions
-        uses: icewind1991/nextcloud-version-matrix@c2bf575a3516752db5ce2915499d3f694885e2c7 # v1.0.0
-
-  changes:
-    runs-on: ubuntu-latest
-
-    outputs:
-      src: ${{ steps.changes.outputs.src}}
-
-    steps:
-      - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
-        id: changes
-        continue-on-error: true
-        with:
-          filters: |
-            src:
-              - '.github/workflows/**'
-              - 'appinfo/**'
-              - 'lib/**'
-              - 'templates/**'
-              - 'tests/**'
-              - 'vendor/**'
-              - 'vendor-bin/**'
-              - '.php-cs-fixer.dist.php'
-              - 'composer.json'
-              - 'composer.lock'
-
   phpunit-pgsql:
     runs-on: ubuntu-latest
 
-    needs: [changes, matrix]
-    if: needs.changes.outputs.src != 'false'
-
     strategy:
       matrix:
-        php-versions: ${{ fromJson(needs.matrix.outputs.php-max) }}
+        php-versions: ['8.0']
-        server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
+        server-versions: ['master']
 
     services:
       postgres:
@@ -80,19 +59,19 @@ jobs:
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Checkout server
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
           submodules: true
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
 
       - name: Checkout app
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2
+        uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -169,7 +148,7 @@ jobs:
     permissions:
       contents: none
     runs-on: ubuntu-latest
-    needs: [changes, phpunit-pgsql]
+    needs: phpunit-pgsql
 
     if: always()
 
@@ -177,4 +156,4 @@ jobs:
 
     steps:
       - name: Summary status
-        run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-pgsql.result != 'success' }}; then exit 1; fi
+        run: if ${{ needs.phpunit-pgsql.result != 'success' }}; then exit 1; fi

.github/workflows/phpunit-sqlite.yml

@@ -5,7 +5,25 @@
 
 name: PHPUnit sqlite
 
-on: pull_request
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/**'
+      - 'appinfo/**'
+      - 'lib/**'
+      - 'templates/**'
+      - 'tests/**'
+      - 'vendor/**'
+      - 'vendor-bin/**'
+      - '.php-cs-fixer.dist.php'
+      - 'composer.json'
+      - 'composer.lock'
+
+  push:
+    branches:
+      - main
+      - master
+      - stable*
 
 permissions:
   contents: read
@@ -15,52 +33,13 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  matrix:
-    runs-on: ubuntu-latest
-    outputs:
-      php-max: ${{ steps.versions.outputs.php-max-list }}
-      server-max: ${{ steps.versions.outputs.branches-max-list }}
-    steps:
-      - name: Checkout app
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - name: Get version matrix
-        id: versions
-        uses: icewind1991/nextcloud-version-matrix@c2bf575a3516752db5ce2915499d3f694885e2c7 # v1.0.0
-
-  changes:
-    runs-on: ubuntu-latest
-
-    outputs:
-      src: ${{ steps.changes.outputs.src}}
-
-    steps:
-      - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
-        id: changes
-        continue-on-error: true
-        with:
-          filters: |
-            src:
-              - '.github/workflows/**'
-              - 'appinfo/**'
-              - 'lib/**'
-              - 'templates/**'
-              - 'tests/**'
-              - 'vendor/**'
-              - 'vendor-bin/**'
-              - '.php-cs-fixer.dist.php'
-              - 'composer.json'
-              - 'composer.lock'
-
   phpunit-sqlite:
     runs-on: ubuntu-latest
 
-    needs: [changes, matrix]
-    if: needs.changes.outputs.src != 'false'
-
     strategy:
       matrix:
-        php-versions: ${{ fromJson(needs.matrix.outputs.php-max) }}
+        php-versions: ['8.0']
-        server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
+        server-versions: ['master']
 
     steps:
       - name: Set app env
@@ -69,19 +48,19 @@ jobs:
           echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Checkout server
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
           submodules: true
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
 
       - name: Checkout app
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2
+        uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -158,7 +137,7 @@ jobs:
     permissions:
       contents: none
     runs-on: ubuntu-latest
-    needs: [changes, phpunit-sqlite]
+    needs: phpunit-sqlite
 
     if: always()
 
@@ -166,4 +145,4 @@ jobs:
 
     steps:
       - name: Summary status
-        run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-sqlite.result != 'success' }}; then exit 1; fi
+        run: if ${{ needs.phpunit-sqlite.result != 'success' }}; then exit 1; fi

.github/workflows/psalm-matrix.yml

@@ -5,41 +5,36 @@
 
 name: Static analysis
 
-on: pull_request
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - main
+      - stable*
 
 concurrency:
   group: psalm-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
-  matrix:
-    runs-on: ubuntu-latest
-    outputs:
-      ocp-matrix: ${{ steps.versions.outputs.ocp-matrix }}
-    steps:
-      - name: Checkout app
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - name: Get version matrix
-        id: versions
-        uses: icewind1991/nextcloud-version-matrix@334a77e02e5684ba9da35933db0d7110356bf3ba # v1.1.0
-
   static-analysis:
     runs-on: ubuntu-latest
-    needs: matrix
     strategy:
       # do not stop on another job's failure
       fail-fast: false
-      matrix: ${{ fromJson(needs.matrix.outputs.ocp-matrix) }}
+      matrix:
+        ocp-version: [ 'dev-master', 'dev-stable27', 'dev-stable26', 'dev-stable25']
 
     name: Nextcloud ${{ matrix.ocp-version }}
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
-      - name: Set up php${{ matrix.php-versions }}
+      - name: Set up php
-        uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2
+        uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
         with:
-          php-version: ${{ matrix.php-versions }}
+          php-version: 8.0
           coverage: none
           ini-file: development
           extensions: redis
@@ -47,7 +42,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install dependencies
-        run: rm composer.lock && composer i
+        run: composer i
 
       - name: Install dependencies
         run: rm composer.lock && composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} --ignore-platform-reqs --with-dependencies

Cargo.toml

@@ -3,30 +3,30 @@ name = "notify_push"
 version = "0.1.0" # this version number is unused, the version number for the binary will be extracted from the appinfo/info.xml during build
 authors = ["Robin Appelman <robin@icewind.nl>"]
 edition = "2021"
-rust-version = "1.66.0"
+rust-version = "1.64.0"
 
 [dependencies]
 redis = { version = "0.23.3", default-features = false, features = ["tokio-comp", "aio", "cluster", "cluster-async"] }
-serde = { version = "1.0.190", features = ["derive"] }
+serde = { version = "1.0.183", features = ["derive"] }
-serde_json = "1.0.108"
+serde_json = "1.0.107"
-thiserror = "1.0.50"
+thiserror = "1.0.48"
-warp = { version = "0.3.6", features = ["tls"] }
+warp = { version = "0.3.5", features = ["tls"] }
-tokio = { version = "1.33.0", features = ["macros", "rt-multi-thread", "signal"] }
+tokio = { version = "1.32.0", features = ["macros", "rt-multi-thread", "signal"] }
-futures = "0.3.29"
+futures = "0.3.28"
-log = "0.4.20"
+log = "0.4.19"
 sqlx = { version = "0.6.3", features = ["runtime-tokio-rustls", "any", "mysql", "sqlite", "postgres"] }
 dotenv = "0.15.0"
-dashmap = "5.5.3"
+dashmap = "5.5.0"
 once_cell = "1.18.0"
 miette = { version = "5.10.0", features = ["fancy"] }
-smallvec = { version = "1.11.1", features = ["serde"] }
+smallvec = { version = "1.11.0", features = ["serde"] }
-reqwest = { version = "0.11.22", default-features = false, features = ["rustls-tls", "json"] }
+reqwest = { version = "0.11.20", default-features = false, features = ["rustls-tls", "json"] }
 warp-real-ip = "0.2.0"
 parse-display = "0.8.2"
 percent-encoding = "2.3.0"
 rand = { version = "0.8.5", features = ["small_rng"] }
-ahash = "0.8.6"
+ahash = "0.8.3"
-flexi_logger = { version = "0.27.2", features = ["colors", "is-terminal"] }
+flexi_logger = { version = "0.25.6", features = ["colors", "is-terminal"] }
 tokio-stream = { version = "0.1.14", features = ["net"] }
 structopt = "0.3.26"
 derivative = "2.2.0"
@@ -35,7 +35,7 @@ url = "2.4.1"
 
 [dev-dependencies]
 mini-redis = "0.4.1"
-tokio-tungstenite = "0.20.1"
+tokio-tungstenite = "0.20.0"
 http-auth-basic = "0.3.3"
 test_client = { path = "test_client" }
 

DEVELOPING.md

@@ -118,7 +118,7 @@ listen('my_message_type', (message_type, optional_body) => {
 
 ## Building
 
-The server binary is built using rust and cargo, and requires a minimum of rust `1.66`.
+The server binary is built using rust and cargo, and requires a minimum of rust `1.64`.
 
 - Install `rust` through your package manager or [rustup](https://rustup.rs/)
 - Run `cargo build`

README.md

@@ -291,8 +291,6 @@ by setting the `METRICS_PORT` environment variable.
 
 Once set the metrics are available in a prometheus compatible format at `/metrics` on the configured port.
 
-Additionally you can manually check the metrics by running the `occ notify_push:metrics` command, this will function even if you haven't setup `METRICS_PORT`.
-
 ### Self-signed certificates
 
 If your nextcloud is using a self-signed certificate then you either need to set the `NEXTCLOUD_URL` to a non-https, local url,

appinfo/info.xml

@@ -7,7 +7,7 @@
 	<description><![CDATA[Push update support for desktop app.
 
 Once the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions]]></description>
-	<version>0.6.4</version>
+	<version>0.6.3</version>
 	<licence>agpl</licence>
 	<author>Robin Appelman</author>
 	<namespace>NotifyPush</namespace>
@@ -23,7 +23,7 @@ Once the app is installed, the push binary needs to be setup. You can either use
 	<bugs>https://github.com/nextcloud/notify_push/issues</bugs>
 
 	<dependencies>
-		<nextcloud min-version="25" max-version="28"/>
+		<nextcloud min-version="24" max-version="27"/>
 	</dependencies>
 
 	<repair-steps>

composer.json

@@ -4,9 +4,9 @@
 	"require-dev": {
 		"roave/security-advisories": "dev-master",
 		"php-parallel-lint/php-parallel-lint": "^1.0.0",
-		"phpunit/phpunit": "^9.6.13",
+		"phpunit/phpunit": "^8",
 		"nextcloud/coding-standard": "^v1.1.1",
-		"nextcloud/ocp": "dev-stable25",
+		"nextcloud/ocp": "dev-master",
 		"psalm/phar": "^4.3",
 		"symfony/console": "5.4.19"
 	},

flake.nix

@@ -72,9 +72,8 @@
       checks = ["check" "clippy" "test"];
 
       msrv = (fromTOML (readFile ./Cargo.toml)).package.rust-version;
-      msrvToolchain = pkgs.rust-bin.stable."${msrv}".default;
       naerskMsrv = let
-        toolchain = msrvToolchain;
+        toolchain = pkgs.rust-bin.stable."${msrv}".default;
       in
         pkgs.callPackage naersk {
           cargo = toolchain;
@@ -112,23 +111,13 @@
         }) clientTargets;
       };
 
-      devShells = {
+      devShells.default = cross-naersk'.mkShell targets {
-	    default = cross-naersk'.mkShell targets {
+        nativeBuildInputs = with pkgs; [
-          nativeBuildInputs = with pkgs; [
+          (rust-bin.beta.latest.default.override {targets = targets ++ [hostTarget];})
-            (rust-bin.beta.latest.default.override {targets = targets ++ [hostTarget];})
+          krankerl
-            krankerl
+          cargo-edit
-            cargo-edit
+          bacon
-            cargo-outdated
+        ];
-            bacon
-            php
-            phpPackages.composer
-          ];
-        };
-	    msrv = cross-naersk'.mkShell targets {
-          nativeBuildInputs = with pkgs; [
-            msrvToolchain
-          ];
-        };
       };
     });
 }

lib/Command/Setup.php

@@ -112,6 +112,7 @@ class Setup extends Command {
 				$output->writeln("<error>🗴 bundled binary not working on your system.</error>");
 				if ($this->setupWizard->hasSELinux()) {
 					$output->writeln("  It looks like your system has SELinux enabled which might be blocking execution of the binary.");
+					$output->writeln("  It looks like your system has SELinux enabled which might be blocking execution of the binary.");
 				}
 				$this->readmeLink($output);
 				return 1;
@@ -119,7 +120,6 @@ class Setup extends Command {
 
 			if (!$this->setupWizard->hasSystemd()) {
 				$output->writeln("<error>🗴 your system doesn't seem to be using systemd.</error>");
-				$output->writeln("  You can still use the app without systemd by following the manual setup instructions.");
 				$this->readmeLink($output);
 				return 1;
 			}

test_client/Cargo.toml

@@ -5,11 +5,11 @@ authors = ["Robin Appelman <robin@icewind.nl>"]
 edition = "2018"
 
 [dependencies]
-tungstenite = { version = "0.20.1", features = ["rustls-tls-webpki-roots"] }
+tungstenite = { version = "0.20.0", features = ["rustls-tls-webpki-roots"] }
-serde_json = "1.0.108"
+serde_json = "1.0.107"
-ureq = "2.8.0"
+ureq = "2.7.1"
-flexi_logger = { version = "0.27.2", features = ["colors"] }
+flexi_logger = { version = "0.25.6", features = ["colors"] }
-log = "0.4.20"
+log = "0.4.19"
-base64 = "0.21.5"
+base64 = "0.21.4"
 miette = { version = "5.10.0", features = ["fancy"] }
 url = "2.4.1"