From 59229d8f3b0c55b9a8a37182807bc4024d150f9c Mon Sep 17 00:00:00 2001
From: Ferdinand Kuhl <f.kuhl@digital-competence.de>
Date: Sat, 18 Feb 2023 21:12:34 +0100
Subject: [PATCH 1/3] Allowing recent Flow versions

---
 .woodpecker/{test.yml => functional-tests.yml} | 15 +++++++++++----
 composer.json                                  |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)
 rename .woodpecker/{test.yml => functional-tests.yml} (68%)

diff --git a/.woodpecker/test.yml b/.woodpecker/functional-tests.yml
similarity index 68%
rename from .woodpecker/test.yml
rename to .woodpecker/functional-tests.yml
index 8a881da..c45215f 100644
--- a/.woodpecker/test.yml
+++ b/.woodpecker/functional-tests.yml
@@ -3,12 +3,19 @@ workspace:
   path: package
 
 matrix:
-  FLOW_VERSION:
-    - 6.3
+  include:
+    - FLOW_VERSION: 6.3
+      PHP_VERSION: 7.4
+    - FLOW_VERSION: 7.3
+      PHP_VERSION: 7.4
+    - FLOW_VERSION: 8.2
+      PHP_VERSION: 7.4
+    - FLOW_VERSION: 8.2
+      PHP_VERSION: 8.2
 
 pipeline:
   functional-tests:
-    image: thecodingmachine/php:7.4-v4-cli
+    image: "thecodingmachine/php:${PHP_VERSION}-v4-cli"
     environment:
       # Enable the PDO_SQLITE extension
       - "PHP_EXTENSION_PDO_SQLITE=1"
@@ -20,6 +27,6 @@ pipeline:
       - "cd $NEOS_BUILD_DIR"
       - "composer create-project --no-install neos/flow-base-distribution:^$FLOW_VERSION ."
       - "composer config repositories.repo-name path /woodpecker/package"
-      - "composer remove --dev neos/behat"
+      - "composer remove --dev --no-update neos/behat || composer remove --no-update neos/behat"
       - "composer require digicomp/sequence:@dev"
       - "bin/phpunit --configuration Build/BuildEssentials/PhpUnit/FunctionalTests.xml Packages/Application/DigiComp.Sequence/Tests/Functional"
diff --git a/composer.json b/composer.json
index 89a5b5a..deb5ef0 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
     "type": "neos-package",
     "require": {
         "ext-pdo": "*",
-        "neos/flow": "^6.3.5",
+        "neos/flow": "^6.3.5 | ^7.0 | ^8.0",
         "php": ">=7.4"
     },
     "require-dev": {

From 69a860109e6b39c4ed3c77da29eacfb644cb0b76 Mon Sep 17 00:00:00 2001
From: Ferdinand Kuhl <f.kuhl@digital-competence.de>
Date: Sat, 18 Feb 2023 21:13:58 +0100
Subject: [PATCH 2/3] Fixing code-style check

---
 .woodpecker/code-style.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.woodpecker/code-style.yml b/.woodpecker/code-style.yml
index f888059..bfd94b0 100644
--- a/.woodpecker/code-style.yml
+++ b/.woodpecker/code-style.yml
@@ -3,5 +3,6 @@ pipeline:
     image: composer
     commands:
       - composer global config repositories.repo-name vcs https://git.digital-competence.de/Packages/php-codesniffer
+      - composer global config --no-plugins allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
       - composer global require digicomp/php-codesniffer:@dev
-      - composer global exec -- phpcs --runtime-set ignore_warnings_on_exit 1 --standard=DigiComp Classes/ Migrations/ Tests/
+      - composer global exec -- phpcs --runtime-set ignore_warnings_on_exit 1 --standard=DigiComp Classes/ Tests/

From f9629557e479c9c2e303a27eb1743f7460c90bd9 Mon Sep 17 00:00:00 2001
From: Ferdinand Kuhl <f.kuhl@digital-competence.de>
Date: Sat, 18 Feb 2023 21:15:17 +0100
Subject: [PATCH 3/3] Test only flow 7.3 with PHP 7 and 8

---
 .woodpecker/functional-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.woodpecker/functional-tests.yml b/.woodpecker/functional-tests.yml
index c45215f..3b45b3b 100644
--- a/.woodpecker/functional-tests.yml
+++ b/.woodpecker/functional-tests.yml
@@ -8,8 +8,8 @@ matrix:
       PHP_VERSION: 7.4
     - FLOW_VERSION: 7.3
       PHP_VERSION: 7.4
-    - FLOW_VERSION: 8.2
-      PHP_VERSION: 7.4
+    - FLOW_VERSION: 7.3
+      PHP_VERSION: 8.2
     - FLOW_VERSION: 8.2
       PHP_VERSION: 8.2