From 947471a4fcbb5f8c4ca70c6c08168c34cb63689d Mon Sep 17 00:00:00 2001
From: Lars Lauger <lars.lauger@netlogix.de>
Date: Tue, 24 Oct 2023 11:39:53 +0200
Subject: [PATCH] fix: Adjust composer requirements and build matrix

---
 .github/workflows/functionaltests.yml | 26 ++------------------------
 .github/workflows/unittests.yml       | 26 ++------------------------
 composer.json                         |  4 ++--
 3 files changed, 6 insertions(+), 50 deletions(-)

diff --git a/.github/workflows/functionaltests.yml b/.github/workflows/functionaltests.yml
index caa50d0..12b0cf5 100644
--- a/.github/workflows/functionaltests.yml
+++ b/.github/workflows/functionaltests.yml
@@ -10,30 +10,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ 7.2, 7.3, 7.4, 8.0, 8.1 ]
-        flow-version: [ 5.3, 6.3, 7.3, 8.0 ]
-        exclude:
-          # Disable Flow 5.3 and 6.3 on PHP 8.0, as only ^7.2 is supported
-          - php-version: 8.0
-            flow-version: 5.3
-          - php-version: 8.0
-            flow-version: 6.3
-          - php-version: 8.1
-            flow-version: 5.3
-          - php-version: 8.1
-            flow-version: 6.3
-
-          # Disable Flow 7.0 on PHP 7.2, as 7.3 is required
-          - php-version: 7.2
-            flow-version: 7.3
-
-          # Disable Flow 8.0 on PHP 7, as 8.0 is required
-          - php-version: 7.2
-            flow-version: 8.0
-          - php-version: 7.3
-            flow-version: 8.0
-          - php-version: 7.4
-            flow-version: 8.0
+        php-version: [ 7.2, 7.3, 7.4 ]
+        flow-version: [ 5.3, 6.3 ]
 
     env:
       APP_ENV: true
diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
index e7e4898..0548031 100644
--- a/.github/workflows/unittests.yml
+++ b/.github/workflows/unittests.yml
@@ -10,30 +10,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ 7.2, 7.3, 7.4, 8.0, 8.1 ]
-        flow-version: [ 5.3, 6.3, 7.3, 8.0 ]
-        exclude:
-          # Disable Flow 5.3 and 6.3 on PHP 8.0, as only ^7.2 is supported
-          - php-version: 8.0
-            flow-version: 5.3
-          - php-version: 8.0
-            flow-version: 6.3
-          - php-version: 8.1
-            flow-version: 5.3
-          - php-version: 8.1
-            flow-version: 6.3
-
-          # Disable Flow 7.0 on PHP 7.2, as 7.3 is required
-          - php-version: 7.2
-            flow-version: 7.3
-
-          # Disable Flow 8.0 on PHP 7, as 8.0 is required
-          - php-version: 7.2
-            flow-version: 8.0
-          - php-version: 7.3
-            flow-version: 8.0
-          - php-version: 7.4
-            flow-version: 8.0
+        php-version: [ 7.2, 7.3, 7.4 ]
+        flow-version: [ 5.3, 6.3 ]
 
     env:
       APP_ENV: true
diff --git a/composer.json b/composer.json
index 595bcf5..e249291 100644
--- a/composer.json
+++ b/composer.json
@@ -4,8 +4,8 @@
     "type": "neos-package",
     "license": "MIT",
     "require": {
-        "php": "^7.2 || ^8.0",
-        "neos/flow": "^5.3 || ^6.3 || ^7.0 || ^8.0",
+        "php": "^7.2",
+        "neos/flow": "^5.3 || ^6.3",
         "sentry/sdk": "^3.1"
     },
     "autoload": {