From 15608f156a5cc2ca9db05236b0b626e971664c83 Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Tue, 19 Mar 2024 17:11:58 +0100
Subject: [PATCH] make composer install work over a larger range

not locking is fine since we only have dev-dependencies

Signed-off-by: Robin Appelman <robin@icewind.nl>
---
 .github/workflows/phpunit-mysql.yml       |  5 ++++-
 .github/workflows/phpunit-mysql.yml.patch | 16 ++++++++++++++++
 .github/workflows/psalm-matrix.yml        |  2 +-
 .github/workflows/psalm-matrix.yml.patch  | 13 +++++++++++++
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/phpunit-mysql.yml.patch

diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
index cfa4237..2dd16f5 100644
--- a/.github/workflows/phpunit-mysql.yml
+++ b/.github/workflows/phpunit-mysql.yml
@@ -117,7 +117,10 @@ jobs:
         # Only run if phpunit config file exists
         if: steps.check_composer.outputs.files_exists == 'true'
         working-directory: apps/${{ env.APP_NAME }}
-        run: composer i
+        run: |
+          rm composer.lock
+          composer delete nextcloud/ocp
+          composer i
 
       - name: Set up Nextcloud
         env:
diff --git a/.github/workflows/phpunit-mysql.yml.patch b/.github/workflows/phpunit-mysql.yml.patch
new file mode 100644
index 0000000..64ada0d
--- /dev/null
+++ b/.github/workflows/phpunit-mysql.yml.patch
@@ -0,0 +1,16 @@
+diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
+index 3ca2bd2..2dd16f5 100644
+--- a/.github/workflows/phpunit-mysql.yml
++++ b/.github/workflows/phpunit-mysql.yml
+@@ -117,7 +117,10 @@ jobs:
+         # Only run if phpunit config file exists
+         if: steps.check_composer.outputs.files_exists == 'true'
+         working-directory: apps/${{ env.APP_NAME }}
+-        run: composer i
++        run: |
++          rm composer.lock
++          composer delete nextcloud/ocp
++          composer i
+ 
+       - name: Set up Nextcloud
+         env:
diff --git a/.github/workflows/psalm-matrix.yml b/.github/workflows/psalm-matrix.yml
index 4ee30b7..82a540b 100644
--- a/.github/workflows/psalm-matrix.yml
+++ b/.github/workflows/psalm-matrix.yml
@@ -50,7 +50,7 @@ jobs:
         run: composer i
 
       - name: Install dependencies
-        run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} --ignore-platform-reqs --with-dependencies
+        run: rm composer.lock && composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} --ignore-platform-reqs --with-dependencies
 
       - name: Run coding standards check
         run: composer run psalm
diff --git a/.github/workflows/psalm-matrix.yml.patch b/.github/workflows/psalm-matrix.yml.patch
index 4f1b1c4..5715751 100644
--- a/.github/workflows/psalm-matrix.yml.patch
+++ b/.github/workflows/psalm-matrix.yml.patch
@@ -11,3 +11,16 @@ index 8e3d42f..4ee30b7 100644
            coverage: none
            ini-file: development
          env:
+diff --git a/.github/workflows/psalm-matrix.yml b/.github/workflows/psalm-matrix.yml
+index 4ee30b7..82a540b 100644
+--- a/.github/workflows/psalm-matrix.yml
++++ b/.github/workflows/psalm-matrix.yml
+@@ -50,7 +50,7 @@ jobs:
+         run: composer i
+ 
+       - name: Install dependencies
+-        run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} --ignore-platform-reqs --with-dependencies
++        run: rm composer.lock && composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} --ignore-platform-reqs --with-dependencies
+ 
+       - name: Run coding standards check
+         run: composer run psalm