From 2671080548b42035762f46259f2ccfe2d3edba55 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 22 Sep 2022 12:06:41 +0200
Subject: [PATCH 1/2] Adjust testing matrix for Nextcloud 25 on stable25

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .github/workflows/phpunit-mysql.yml                   | 2 +-
 .github/workflows/phpunit-oci.yml                     | 2 +-
 .github/workflows/phpunit-pgsql.yml                   | 2 +-
 .github/workflows/phpunit-sqlite.yml                  | 2 +-
 .github/workflows/static-analysis.yml                 | 2 +-
 .github/workflows/update-christophwurst-nextcloud.yml | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
index 650e5defa..90043905f 100644
--- a/.github/workflows/phpunit-mysql.yml
+++ b/.github/workflows/phpunit-mysql.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['7.4', '8.0', '8.1']
-        server-versions: ['master']
+        server-versions: ['stable25']
 
     services:
       mysql:
diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml
index 87297e161..0bb18ad9c 100644
--- a/.github/workflows/phpunit-oci.yml
+++ b/.github/workflows/phpunit-oci.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.0']
-        server-versions: ['master']
+        server-versions: ['stable25']
 
     services:
       oracle:
diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml
index 5d6eca96b..1f4680118 100644
--- a/.github/workflows/phpunit-pgsql.yml
+++ b/.github/workflows/phpunit-pgsql.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.0']
-        server-versions: ['master']
+        server-versions: ['stable25']
 
     services:
       postgres:
diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml
index 649d6e2d6..5c91516f9 100644
--- a/.github/workflows/phpunit-sqlite.yml
+++ b/.github/workflows/phpunit-sqlite.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.0']
-        server-versions: ['master']
+        server-versions: ['stable25']
 
     steps:
       - name: Set app env
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index d6369a089..32fbe6138 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -7,7 +7,7 @@ jobs:
       runs-on: ubuntu-latest
       strategy:
           matrix:
-              ocp-version: [ 'dev-master' ]
+              ocp-version: [ 'dev-stable25' ]
       name: Nextcloud ${{ matrix.ocp-version }}
       steps:
           - name: Checkout
diff --git a/.github/workflows/update-christophwurst-nextcloud.yml b/.github/workflows/update-christophwurst-nextcloud.yml
index e2e5f526f..50c81c6f4 100644
--- a/.github/workflows/update-christophwurst-nextcloud.yml
+++ b/.github/workflows/update-christophwurst-nextcloud.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: ["master", "stable24", "stable23", "stable22"]
+        branches: ["master", "stable25", "stable24", "stable23"]
 
     name: update-christophwurst-nextcloud-${{ matrix.branches }}
 

From ce3085ffb948518ef77ba4be6ba0fec312e6766a Mon Sep 17 00:00:00 2001
From: Carl Schwan <carl@carlschwan.eu>
Date: Thu, 22 Sep 2022 13:18:04 +0200
Subject: [PATCH 2/2] Update static analysis job

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
---
 .github/workflows/static-analysis.yml | 49 +++++++++++++++------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 32fbe6138..7dc1b16d8 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -1,26 +1,33 @@
 name: Static analysis
 
-on: [pull_request]
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - stable*
 
 jobs:
   static-psalm-analysis:
-      runs-on: ubuntu-latest
-      strategy:
-          matrix:
-              ocp-version: [ 'dev-stable25' ]
-      name: Nextcloud ${{ matrix.ocp-version }}
-      steps:
-          - name: Checkout
-            uses: actions/checkout@v2
-          - name: Set up php
-            uses: shivammathur/setup-php@v2
-            with:
-                php-version: 7.4
-                tools: composer:v1
-                coverage: none
-          - name: Install dependencies
-            run: composer i
-          - name: Install dependencies
-            run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }}
-          - name: Run coding standards check
-            run: composer run psalm
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ocp-version: [ 'dev-stable25' ]
+
+    name: Nextcloud ${{ matrix.ocp-version }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+
+      - name: Set up php
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+          coverage: none
+
+      - name: Install dependencies
+        run: composer install --dev
+
+      - name: Run coding standards check
+        run: composer run psalm