From 18ad7d67d0b6370f070afa3dd7479b4354759158 Mon Sep 17 00:00:00 2001
From: Anna Larch <anna@nextcloud.com>
Date: Thu, 18 Jul 2024 15:29:54 +0200
Subject: [PATCH] feat: update to php8.1

Signed-off-by: Anna Larch <anna@nextcloud.com>
---
 .github/workflows/php-test.yml    | 16 +++-------------
 vendor-bin/cs-fixer/composer.json |  2 +-
 vendor-bin/cs-fixer/composer.lock |  6 +++---
 vendor-bin/phpunit/composer.json  |  2 +-
 vendor-bin/phpunit/composer.lock  |  6 +++---
 vendor-bin/psalm/composer.json    |  2 +-
 vendor-bin/psalm/composer.lock    |  6 +++---
 7 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/php-test.yml b/.github/workflows/php-test.yml
index 95d65bff06..153ec49a6c 100644
--- a/.github/workflows/php-test.yml
+++ b/.github/workflows/php-test.yml
@@ -9,12 +9,7 @@ jobs:
     strategy:
       matrix:
         php-versions: [ '8.1', '8.2', '8.3' ]
-        nextcloud-versions: [ 'master', 'stable29' ]
-        include:
-          - php-versions: '8.0'
-            nextcloud-versions: 'stable27'
-          - php-versions: '8.1'
-            nextcloud-versions: 'stable28'
+        nextcloud-versions: [ 'master' ]
     name: php${{ matrix.php-versions }} on ${{ matrix.nextcloud-versions }} unit tests
     env:
       CI: true
@@ -50,7 +45,7 @@ jobs:
         token: ${{ secrets.CODECOV_TOKEN }}
         file: nextcloud/apps/calendar/clover.unit.xml
         flags: php
-        fail_ci_if_error: ${{ !github.event.pull_request.head.repo.fork }}
+        fail_ci_if_error: true
         verbose: true
 
   integration-tests:
@@ -58,12 +53,7 @@ jobs:
     strategy:
       matrix:
         php-versions: [ '8.1', '8.2', '8.3' ]
-        nextcloud-versions: [ 'master', 'stable29' ]
-        include:
-          - php-versions: '8.0'
-            nextcloud-versions: 'stable27'
-          - php-versions: '8.1'
-            nextcloud-versions: 'stable28'
+        nextcloud-versions: [ 'master' ]
     name: php${{ matrix.php-versions }} on ${{ matrix.nextcloud-versions }} integration tests
     env:
       CI: true
diff --git a/vendor-bin/cs-fixer/composer.json b/vendor-bin/cs-fixer/composer.json
index 7404364d58..d79d056fae 100644
--- a/vendor-bin/cs-fixer/composer.json
+++ b/vendor-bin/cs-fixer/composer.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "platform": {
-            "php": "8.0"
+            "php": "8.1"
         },
         "sort-packages": true
     },
diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock
index cb055698dd..c8670ffc3b 100644
--- a/vendor-bin/cs-fixer/composer.lock
+++ b/vendor-bin/cs-fixer/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1db99a21f71fb454322d63fba47a3c5f",
+    "content-hash": "0847b120ee47ead495a438b8b2caec8e",
     "packages": [],
     "packages-dev": [
         {
@@ -109,7 +109,7 @@
     "platform": [],
     "platform-dev": [],
     "platform-overrides": {
-        "php": "8.0"
+        "php": "8.1"
     },
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.3.0"
 }
diff --git a/vendor-bin/phpunit/composer.json b/vendor-bin/phpunit/composer.json
index 11fd5cf869..1ebb2a41d0 100644
--- a/vendor-bin/phpunit/composer.json
+++ b/vendor-bin/phpunit/composer.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "platform": {
-            "php": "8.0"
+            "php": "8.1"
         },
         "sort-packages": true
     },
diff --git a/vendor-bin/phpunit/composer.lock b/vendor-bin/phpunit/composer.lock
index 5cd025bb0a..03b64e2db1 100644
--- a/vendor-bin/phpunit/composer.lock
+++ b/vendor-bin/phpunit/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "041946a98de22f2592255fb22931eba3",
+    "content-hash": "d338a6750d5321b57e55a8c1a7481604",
     "packages": [],
     "packages-dev": [
         {
@@ -2084,7 +2084,7 @@
     "platform": [],
     "platform-dev": [],
     "platform-overrides": {
-        "php": "7.4"
+        "php": "8.1"
     },
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.3.0"
 }
diff --git a/vendor-bin/psalm/composer.json b/vendor-bin/psalm/composer.json
index 5875ac7891..6cd81c9dcc 100644
--- a/vendor-bin/psalm/composer.json
+++ b/vendor-bin/psalm/composer.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "platform": {
-            "php": "8.0"
+            "php": "8.1"
         }
     },
     "require-dev": {
diff --git a/vendor-bin/psalm/composer.lock b/vendor-bin/psalm/composer.lock
index d9f3b61af4..e2213f7758 100644
--- a/vendor-bin/psalm/composer.lock
+++ b/vendor-bin/psalm/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3f46fd22d8a71a6ac63398f8fd320e23",
+    "content-hash": "f4cf1b5fa725275c560673a34566855a",
     "packages": [],
     "packages-dev": [
         {
@@ -2245,7 +2245,7 @@
     "platform": [],
     "platform-dev": [],
     "platform-overrides": {
-        "php": "8.0"
+        "php": "8.1"
     },
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.3.0"
 }