Merge branch 'release/4.0.2'

trying to understand matrix building
Allow Flow 8.2
2023-01-26 13:04:13 +01:00 · 2023-01-26 13:02:02 +01:00 · 2023-01-26 12:43:03 +01:00 · 2023-01-10 13:37:28 +01:00 · 2023-01-10 13:37:24 +01:00 · 2023-01-10 13:25:31 +01:00
5 changed files with 17 additions and 10 deletions
--- a/.woodpecker/functional-tests.yml
+++ b/.woodpecker/functional-tests.yml
@ -3,12 +3,18 @@ workspace:
  path: package

 matrix:
-  FLOW_VERSION:
-    - 7.3
+  include:
+    - FLOW_VERSION: 7.3
+      PHP_VERSION: 7.4
+    - FLOW_VERSION: 7.3
+      PHP_VERSION: 8.1
+    - FLOW_VERSION: 8.2
+      PHP_VERSION: 8.1
+

 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"
--- a/Classes/Annotations/ReadOnly.php
+++ b/Classes/Annotations/ReadOnly.php
@ -8,6 +8,7 @@ namespace DigiComp\FlowSessionLock\Annotations;
 * @Annotation
 * @Target({"METHOD"})
 */
-final class ReadOnly
+#[\Attribute(\Attribute::TARGET_METHOD)]
+final class Unlock
 {
 }
--- a/Classes/Aspects/ReadOnlyAspect.php
+++ b/Classes/Aspects/ReadOnlyAspect.php
@ -36,7 +36,7 @@ class ReadOnlyAspect
    protected bool $readOnly = false;

    /**
-     * @Flow\Around("methodAnnotatedWith(DigiComp\FlowSessionLock\Annotations\ReadOnly) || filter(DigiComp\FlowSessionLock\Aspects\ReadOnlyFilter)")
+     * @Flow\Around("methodAnnotatedWith(DigiComp\FlowSessionLock\Annotations\Unlock) || filter(DigiComp\FlowSessionLock\Aspects\ReadOnlyFilter)")
     * @param JoinPointInterface $joinPoint
     * @return mixed
     */
--- a/Tests/Functional/Fixtures/Controller/ExampleController.php
+++ b/Tests/Functional/Fixtures/Controller/ExampleController.php
@ -22,7 +22,7 @@ class ExampleController extends ActionController

    /**
     * @Flow\Session(autoStart=true);
-     * @FlowSessionLock\ReadOnly
+     * @FlowSessionLock\Unlock
     * @return string
     */
    public function unprotectedByAnnotationAction()
--- a/composer.json
+++ b/composer.json
@ -3,9 +3,9 @@
    "description": "Session locking for Neos Flow - it secures the session becoming corrupted by concurrent access to the same session by different requests",
    "type": "neos-package",
    "require": {
-        "neos/flow": "^7.3.0",
-        "php": ">=7.4",
-        "symfony/lock": "^5.2.0"
+        "neos/flow": "^7.3.0 | ^8.2",
+        "php": "^7.4 | ^8.1",
+        "symfony/lock": "^5.2.0 | ^6.2.0"
    },
    "require-dev": {
        "ext-pcntl": "*"
@ -20,7 +20,7 @@
            "package-key": "DigiComp.FlowSessionLock"
        },
        "branch-alias": {
-            "dev-develop": "3.0.x-dev",
+            "dev-develop": "4.0.x-dev",
            "dev-version/2.x-dev": "2.1.x-dev"
        },
        "applied-flow-migrations": [
Author	SHA1	Message	Date
Ferdinand Kuhl	22f19da3e5	Merge branch 'release/4.0.2' All checks were successful ci/woodpecker/manual/code-style Pipeline was successful Details ci/woodpecker/manual/functional-tests Pipeline was successful Details ci/woodpecker/push/code-style Pipeline was successful Details ci/woodpecker/push/functional-tests Pipeline was successful Details	2023-01-26 13:04:13 +01:00
Ferdinand Kuhl	c29106fb9f	trying to understand matrix building All checks were successful ci/woodpecker/push/code-style Pipeline was successful Details ci/woodpecker/push/functional-tests Pipeline was successful Details	2023-01-26 13:02:02 +01:00
Ferdinand Kuhl	0a24e50d08	Allow Flow 8.2 All checks were successful ci/woodpecker/push/code-style Pipeline was successful Details ci/woodpecker/push/functional-tests Pipeline was successful Details	2023-01-26 12:43:03 +01:00
Ferdinand Kuhl	978200451a	Merge tag '4.0.1' into develop All checks were successful ci/woodpecker/push/code-style Pipeline was successful Details ci/woodpecker/push/functional-tests Pipeline was successful Details Tagging 4.0.1	2023-01-10 13:37:28 +01:00
Ferdinand Kuhl	1ccc533984	Merge branch 'release/4.0.1' All checks were successful ci/woodpecker/push/code-style Pipeline was successful Details ci/woodpecker/push/functional-tests Pipeline was successful Details	2023-01-10 13:37:24 +01:00
Ferdinand Kuhl	872f799ec9	Allow symfony/lock 6.2.0 All checks were successful ci/woodpecker/push/code-style Pipeline was successful Details ci/woodpecker/push/functional-tests Pipeline was successful Details	2023-01-10 13:25:31 +01:00
Ferdinand Kuhl	c09d5e0d1b	Merge tag '4.0.0' into develop All checks were successful ci/woodpecker/push/code-style Pipeline was successful Details ci/woodpecker/push/functional-tests Pipeline was successful Details Tagging 4.0.0	2023-01-10 12:03:39 +01:00
Ferdinand Kuhl	e541b6f0e5	Merge branch 'release/4.0.0' All checks were successful ci/woodpecker/push/code-style Pipeline was successful Details ci/woodpecker/push/functional-tests Pipeline was successful Details	2023-01-10 12:03:35 +01:00
Ferdinand Kuhl	afc89b5cbd	Merge branch 'feature/php8.1' into develop	2023-01-10 12:03:18 +01:00
Ferdinand Kuhl	719de0e53f	- Allow PHP 7.4 again, as no PHP 8.1 features are necessary to work All checks were successful ci/woodpecker/push/code-style Pipeline was successful Details ci/woodpecker/push/functional-tests Pipeline was successful Details	2023-01-10 12:00:53 +01:00
Ferdinand Kuhl	12d048e0ca	- try to fix CI trouble without error message All checks were successful ci/woodpecker/push/code-style Pipeline was successful Details ci/woodpecker/push/functional-tests Pipeline was successful Details	2023-01-10 11:59:18 +01:00
Ferdinand Kuhl	6e1079a81c	Allow PHP 8.1 Some checks failed ci/woodpecker/push/functional-tests Pipeline failed Details ci/woodpecker/push/code-style Pipeline was successful Details - for that resolve a keyword conflict with the ReadOnly class	2023-01-10 11:55:58 +01:00
Ferdinand Kuhl	190db833fc	Merge tag '3.0.0' into develop All checks were successful ci/woodpecker/push/code-style Pipeline was successful Details ci/woodpecker/push/functional-tests Pipeline was successful Details Tagging 3.0.0	2022-08-30 14:46:14 +02:00