.woodpecker/code-style.yml

@@ -1,8 +0,0 @@
-pipeline:
-  code-style:
-    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/ Tests/

.woodpecker/functional-tests.yml

@@ -1,31 +0,0 @@
-workspace:
-  base: /woodpecker
-  path: package
-
-matrix:
-  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:${PHP_VERSION}-v4-cli"
-    environment:
-      # Enable the PDO_SQLITE extension
-      - "PHP_EXTENSION_PDO_SQLITE=1"
-      - "FLOW_VERSION=${FLOW_VERSION}"
-      - "NEOS_BUILD_DIR=/woodpecker/Build-${FLOW_VERSION}"
-    commands:
-      - "sudo mkdir $NEOS_BUILD_DIR"
-      - "sudo chown -R docker:docker $NEOS_BUILD_DIR"
-      - "cd $NEOS_BUILD_DIR"
-      - "composer create-project --no-install neos/flow-base-distribution:^$FLOW_VERSION ."
-      - "composer config repositories.repo-name path /woodpecker/package"
-      - "composer config --no-plugins allow-plugins.neos/composer-plugin true"
-      - "composer require digicomp/flowsessionlock:@dev"
-      - "bin/phpunit --configuration Build/BuildEssentials/PhpUnit/FunctionalTests.xml Packages/Application/DigiComp.FlowSessionLock/Tests/Functional"

Classes/Annotations/ReadOnly.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace DigiComp\FlowSessionLock\Annotations;
+
+/**
+ * @Annotation
+ * @Target("METHOD")
+ */
+final class ReadOnly
+{
+}

Classes/Annotations/Unlock.php

@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DigiComp\FlowSessionLock\Annotations;
-
-/**
- * @Annotation
- * @Target({"METHOD"})
- */
-#[\Attribute(\Attribute::TARGET_METHOD)]
-final class Unlock
-{
-}

Classes/Aspects/ReadOnlyAspect.php

@@ -1,10 +1,8 @@
 <?php
 
-declare(strict_types=1);
-
 namespace DigiComp\FlowSessionLock\Aspects;
 
-use DigiComp\FlowSessionLock\Http\SessionLockRequestMiddleware;
+use DigiComp\FlowSessionLock\Http\SessionLockRequestComponent;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Aop\JoinPointInterface;
 use Neos\Flow\Core\Bootstrap;
@@ -36,44 +34,39 @@ class ReadOnlyAspect
     protected bool $readOnly = false;
 
     /**
-     * @Flow\Around("methodAnnotatedWith(DigiComp\FlowSessionLock\Annotations\Unlock) || filter(DigiComp\FlowSessionLock\Aspects\ReadOnlyFilter)")
+     * @Flow\Around("methodAnnotatedWith(DigiComp\FlowSessionLock\Annotations\ReadOnly) || filter(DigiComp\FlowSessionLock\Aspects\ReadOnlyFilter)")
      * @param JoinPointInterface $joinPoint
-     * @return mixed
+     *
+     * @return void
      */
     public function demoteLockToReadOnly(JoinPointInterface $joinPoint)
     {
-        $activeRequestHandler = $this->bootstrap->getActiveRequestHandler();
-        if (!$activeRequestHandler instanceof HttpRequestHandlerInterface) {
-            $this->logger->debug('SessionLock: ' . \get_class($activeRequestHandler));
-
+        $handler = $this->bootstrap->getActiveRequestHandler();
+        if (! $handler instanceof HttpRequestHandlerInterface) {
+            $this->logger->debug(\get_class($handler));
             return $joinPoint->getAdviceChain()->proceed($joinPoint);
         }
-
+        $componentContext = $handler->getComponentContext();
+        /** @var Lock $lock */
+        $lock = $componentContext->getParameter(SessionLockRequestComponent::class, 'sessionLock');
         $this->readOnly = true;
-
-        /** @var Lock|null $lock */
-        $lock = $activeRequestHandler->getHttpRequest()->getAttribute(
-            SessionLockRequestMiddleware::class . '.' . SessionLockRequestMiddleware::PARAMETER_NAME
-        );
-        if ($lock !== null) {
-            $this->logger->debug('SessionLock: Release, as this is marked read only.');
+        if ($lock) {
+            $this->logger->debug('SessionLock: Release, as this is marked read only');
             $lock->release();
         }
-
         return $joinPoint->getAdviceChain()->proceed($joinPoint);
     }
 
     /**
      * @Flow\Around("method(Neos\Flow\Session\Session->shutdownObject())")
+     *
      * @param JoinPointInterface $joinPoint
-     * @return mixed|void
      */
     public function doNotSaveSession(JoinPointInterface $joinPoint)
     {
         if ($this->readOnly) {
             return;
         }
-
-        return $joinPoint->getAdviceChain()->proceed($joinPoint);
+        $joinPoint->getAdviceChain()->proceed($joinPoint);
     }
 }

Classes/Aspects/ReadOnlyFilter.php

@@ -1,17 +1,12 @@
 <?php
 
-declare(strict_types=1);
-
 namespace DigiComp\FlowSessionLock\Aspects;
 
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Aop\Builder\ClassNameIndex;
-use Neos\Flow\Aop\Exception as NeosFlowAopException;
-use Neos\Flow\Aop\Exception\InvalidPointcutExpressionException;
 use Neos\Flow\Aop\Pointcut\PointcutFilterComposite;
 use Neos\Flow\Aop\Pointcut\PointcutFilterInterface;
 use Neos\Flow\Configuration\ConfigurationManager;
-use Neos\Flow\Configuration\Exception\InvalidConfigurationTypeException;
 use Neos\Flow\Security\Authorization\Privilege\Method\MethodTargetExpressionParser;
 
 /**
@@ -20,32 +15,20 @@ use Neos\Flow\Security\Authorization\Privilege\Method\MethodTargetExpressionPars
  */
 class ReadOnlyFilter implements PointcutFilterInterface
 {
-    /**
-     * @var ConfigurationManager
-     */
     protected ConfigurationManager $configurationManager;
 
-    /**
-     * @var MethodTargetExpressionParser
-     */
     protected MethodTargetExpressionParser $methodTargetExpressionParser;
 
     /**
      * @var PointcutFilterComposite[]
      */
-    protected ?array $pointcutFilterComposites = null;
+    protected ?array $filters = null;
 
-    /**
-     * @param ConfigurationManager $configurationManager
-     */
     public function injectConfigurationManager(ConfigurationManager $configurationManager): void
     {
         $this->configurationManager = $configurationManager;
     }
 
-    /**
-     * @param MethodTargetExpressionParser $methodTargetExpressionParser
-     */
     public function injectMethodTargetExpressionParser(MethodTargetExpressionParser $methodTargetExpressionParser): void
     {
         $this->methodTargetExpressionParser = $methodTargetExpressionParser;
@@ -53,28 +36,30 @@ class ReadOnlyFilter implements PointcutFilterInterface
 
     /**
      * @inheritDoc
-     * @throws InvalidConfigurationTypeException
-     * @throws InvalidPointcutExpressionException
-     * @throws NeosFlowAopException
      */
     public function matches($className, $methodName, $methodDeclaringClassName, $pointcutQueryIdentifier): bool
     {
-        $this->buildPointcutFilters();
-
-        foreach ($this->pointcutFilterComposites as $pointcutFilterComposite) {
-            if (
-                $pointcutFilterComposite->matches(
-                    $className,
-                    $methodName,
-                    $methodDeclaringClassName,
-                    $pointcutQueryIdentifier
-                )
-            ) {
-                return true;
-            }
+        if ($this->filters === null) {
+            $this->buildPointcutFilters();
         }
 
-        return false;
+        $matchingFilters = \array_filter(
+            $this->filters,
+            function (PointcutFilterInterface $filter) use (
+                $className,
+                $methodName,
+                $methodDeclaringClassName,
+                $pointcutQueryIdentifier
+            ): bool {
+                return $filter->matches($className, $methodName, $methodDeclaringClassName, $pointcutQueryIdentifier);
+            }
+        );
+
+        if ($matchingFilters === []) {
+            return false;
+        }
+
+        return true;
     }
 
     /**
@@ -95,47 +80,33 @@ class ReadOnlyFilter implements PointcutFilterInterface
 
     /**
      * @inheritDoc
-     * @throws InvalidConfigurationTypeException
-     * @throws InvalidPointcutExpressionException
-     * @throws NeosFlowAopException
      */
     public function reduceTargetClassNames(ClassNameIndex $classNameIndex): ClassNameIndex
     {
-        $this->buildPointcutFilters();
-
-        $result = new ClassNameIndex();
-
-        foreach ($this->pointcutFilterComposites as $pointcutFilterComposite) {
-            $result->applyUnion($pointcutFilterComposite->reduceTargetClassNames($classNameIndex));
+        if ($this->filters === null) {
+            $this->buildPointcutFilters();
         }
 
+        $result = new ClassNameIndex();
+        foreach ($this->filters as $filter) {
+            $result->applyUnion($filter->reduceTargetClassNames($classNameIndex));
+        }
         return $result;
     }
 
-    /**
-     * @throws InvalidConfigurationTypeException
-     * @throws InvalidPointcutExpressionException
-     * @throws NeosFlowAopException
-     */
     protected function buildPointcutFilters(): void
     {
-        if ($this->pointcutFilterComposites !== null) {
-            return;
-        }
-
-        $this->pointcutFilterComposites = [];
-        foreach (
-            $this->configurationManager->getConfiguration(
-                ConfigurationManager::CONFIGURATION_TYPE_SETTINGS,
-                'DigiComp.FlowSessionLock.readOnlyExpressions'
-            ) as $key => $pointcutExpression
-        ) {
-            if ($pointcutExpression === null) {
+        $this->filters = [];
+        $readOnlyExpressions = $this->configurationManager->getConfiguration(
+            ConfigurationManager::CONFIGURATION_TYPE_SETTINGS,
+            'DigiComp.FlowSessionLock.readOnlyExpressions'
+        ) ?? [];
+        foreach ($readOnlyExpressions as $key => $pointcut) {
+            if ($pointcut === null) {
                 continue;
             }
-
-            $this->pointcutFilterComposites[] = $this->methodTargetExpressionParser->parse(
-                $pointcutExpression,
+            $this->filters[] = $this->methodTargetExpressionParser->parse(
+                $pointcut,
                 'Settings.yaml at "DigiComp.FlowSessionLock.readOnlyExpressions", key: "' . $key . '"'
             );
         }

Classes/Http/SessionLockRequestComponent.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace DigiComp\FlowSessionLock\Http;
+
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Http\Component\ComponentContext;
+use Neos\Flow\Http\Component\ComponentInterface;
+use Neos\Flow\Utility\Environment;
+use Neos\Utility\Files;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Lock\Key;
+use Symfony\Component\Lock\LockFactory;
+
+class SessionLockRequestComponent implements ComponentInterface
+{
+    /**
+     * @Flow\InjectConfiguration(package="Neos.Flow", path="session")
+     * @var array
+     */
+    protected $sessionSettings;
+
+    /**
+     * @Flow\Inject(lazy=false)
+     * @var LoggerInterface
+     */
+    protected $logger;
+
+    /**
+     * @Flow\Inject(name="DigiComp.FlowSessionLock:LockFactory")
+     * @var LockFactory
+     */
+    protected $lockFactory;
+
+    /**
+     * @inheritDoc
+     */
+    public function handle(ComponentContext $componentContext)
+    {
+        $sessionCookieName = $this->sessionSettings['name'];
+        $request = $componentContext->getHttpRequest();
+        $cookies = $request->getCookieParams();
+
+        if (!isset($cookies[$sessionCookieName])) {
+            return;
+        }
+
+        $sessionIdentifier = $cookies[$sessionCookieName];
+
+        $key = new Key(
+            'session-' . $sessionIdentifier
+        ); //TODO: sessionIdentifier might be wrong, probably it should probably be storage identifier
+
+        $lock = $this->lockFactory->createLockFromKey($key, 300, false);
+
+        $componentContext->setParameter(SessionLockRequestComponent::class, 'sessionLock', $lock);
+
+        $this->logger->debug('SessionLock: Get ' . $key);
+        $lock->acquire(true);
+        $this->logger->debug('SessionLock: Acquired ' . $key);
+    }
+}

Classes/Http/SessionLockRequestMiddleware.php

@@ -1,90 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DigiComp\FlowSessionLock\Http;
-
-use Neos\Flow\Annotations as Flow;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-use Psr\Log\LoggerInterface;
-use Symfony\Component\Lock\Exception\LockAcquiringException;
-use Symfony\Component\Lock\Key;
-use Symfony\Component\Lock\LockFactory;
-
-class SessionLockRequestMiddleware implements MiddlewareInterface
-{
-    public const PARAMETER_NAME = 'sessionLock';
-
-    /**
-     * @Flow\Inject
-     * @var LoggerInterface
-     */
-    protected $logger;
-
-    /**
-     * @Flow\Inject(name="DigiComp.FlowSessionLock:LockFactory")
-     * @var LockFactory
-     */
-    protected $lockFactory;
-
-    /**
-     * @Flow\InjectConfiguration(package="Neos.Flow", path="session")
-     * @var array
-     */
-    protected array $sessionSettings;
-
-    /**
-     * @Flow\InjectConfiguration(package="DigiComp.FlowSessionLock", path="timeToLive")
-     * @var float
-     */
-    protected float $timeToLive;
-
-    /**
-     * @Flow\InjectConfiguration(package="DigiComp.FlowSessionLock", path="autoRelease")
-     * @var bool
-     */
-    protected bool $autoRelease;
-
-    /**
-     * @Flow\InjectConfiguration(package="DigiComp.FlowSessionLock", path="secondsToWait")
-     * @var int
-     */
-    protected int $secondsToWait;
-
-    /**
-     * @inheritDoc
-     */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-        $sessionCookieName = $this->sessionSettings['name'];
-
-        $cookies = $request->getCookieParams();
-        if (!isset($cookies[$sessionCookieName])) {
-            return $handler->handle($request);
-        }
-
-        // TODO: sessionIdentifier might be wrong, probably it should probably be storage identifier
-        $key = new Key('session-' . $cookies[$sessionCookieName]);
-
-        $lock = $this->lockFactory->createLockFromKey($key, $this->timeToLive, $this->autoRelease);
-
-        $request = $request->withAttribute(SessionLockRequestMiddleware::class . '.' . static::PARAMETER_NAME, $lock);
-
-        $this->logger->debug('SessionLock: Try to get "' . $key . '"');
-        $timedOut = \time() + $this->secondsToWait;
-        while (!$lock->acquire()) {
-            if (\time() >= $timedOut) {
-                throw new LockAcquiringException(
-                    'Could not acquire the lock for "' . $key . '" in ' . $this->secondsToWait . ' seconds.',
-                    1652687960
-                );
-            }
-            \usleep(100000);
-        }
-        $this->logger->debug('SessionLock: Acquired "' . $key . '"');
-        return $handler->handle($request);
-    }
-}

Classes/Package.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace DigiComp\FlowSessionLock;
+
+use Neos\Flow\Configuration\ConfigurationManager;
+use Neos\Flow\Core\Bootstrap;
+use Neos\Flow\Package\Package as BasePackage;
+use Neos\Utility\Files;
+
+class Package extends BasePackage
+{
+    public function boot(Bootstrap $bootstrap)
+    {
+        parent::boot($bootstrap);
+        $dispatcher = $bootstrap->getSignalSlotDispatcher();
+
+        $dispatcher->connect(
+            ConfigurationManager::class,
+            'configurationManagerReady',
+            function (ConfigurationManager $configurationManager) {
+                $lockStoreDir = $configurationManager->getConfiguration(
+                    ConfigurationManager::CONFIGURATION_TYPE_SETTINGS,
+                    'DigiComp.FlowSessionLock.lockStoreDir'
+                );
+                if (is_string($lockStoreDir)) {
+                    Files::createDirectoryRecursively($lockStoreDir);
+                }
+            }
+        );
+    }
+}

Configuration/Development/Settings.yaml

@@ -1,3 +1,3 @@
 DigiComp:
   FlowSessionLock:
-    lockStoreConnection: "flock://%FLOW_PATH_DATA%Temporary/Development/SessionLocks/"
+    lockStoreDir: '%FLOW_PATH_DATA%Temporary/Development/SessionLocks'

Configuration/Objects.yaml

@@ -1,10 +1,12 @@
 DigiComp.FlowSessionLock:LockFactory:
-  className: "Symfony\\Component\\Lock\\LockFactory"
+  className: 'Symfony\Component\Lock\LockFactory'
   arguments:
     1:
-      object:
-        factoryObjectName: "Symfony\\Component\\Lock\\Store\\StoreFactory"
-        factoryMethodName: "createStore"
-        arguments:
-          1:
-            setting: "DigiComp.FlowSessionLock.lockStoreConnection"
+      object: 'DigiComp.FlowSessionLock:LockStore'
+
+DigiComp.FlowSessionLock:LockStore:
+  className: 'Symfony\Component\Lock\Store\FlockStore'
+  scope: 'singleton'
+  arguments:
+    1:
+      setting: 'DigiComp.FlowSessionLock.lockStoreDir'

Configuration/Settings.yaml

@@ -1,15 +1,14 @@
-DigiComp:
-  FlowSessionLock:
-    lockStoreConnection: "flock://%FLOW_PATH_DATA%Temporary/Production/SessionLocks/"
-    timeToLive: 300.0
-    autoRelease: true
-    secondsToWait: 30
-    readOnlyExpressions: {}
-
 Neos:
   Flow:
     http:
-      middlewares:
-        lockSession:
-          position: "before session"
-          middleware: "DigiComp\\FlowSessionLock\\Http\\SessionLockRequestMiddleware"
+      chain:
+        preprocess:
+          chain:
+            lockSession:
+              position: 'before getSessionCookieFromRequest'
+              component: 'DigiComp\FlowSessionLock\Http\SessionLockRequestComponent'
+
+DigiComp:
+  FlowSessionLock:
+    lockStoreDir: '%FLOW_PATH_DATA%Temporary/Production/SessionLocks'
+    readOnlyExpressions: []

Configuration/Testing/Settings.yaml

@@ -1,5 +0,0 @@
-DigiComp:
-  FlowSessionLock:
-    lockStoreConnection: "flock://%FLOW_PATH_DATA%Temporary/Testing/SessionLocks/"
-    readOnlyExpressions:
-      TestUnprotected: "method(DigiComp\\FlowSessionLock\\Tests\\Functional\\Fixtures\\Controller\\ExampleController->unprotectedByConfigurationAction())"

README.md

@@ -1,18 +1,13 @@
 DigiComp.FlowSessionLock
 ------------------------
 
-![Build status](https://ci.digital-competence.de/api/badges/Packages/DigiComp.FlowSessionLock/status.svg)
+By default the session established by Flow is not "protected" in any way.
+This package restricts every request to load the session only, if there are no other requests having it in access currently.
+It allows to set custom pointcut which will set the session in "ReadOnly" mode, which allows concurrent requests to read, but disallows the current request to write the session.
 
-By default, the session established by Flow is not "protected" in any way. This package restricts every request to load
-the session only, if there are no other requests having it in access currently. It allows to set custom pointcut which 
-will set the session in "ReadOnly" mode, which allows concurrent requests to read, but disallows the current request to 
-write the session.
-
-If you want to allow concurrent access somewhere, you can add your trigger pointcut in `Settings.yaml` like such:
-
-```yaml
-DigiComp:
-  FlowSessionLock:
-    readOnlyExpressions:
-      MyLock: "method(My\\Package\\Controller\\MyController->myAction())"
-```
+If you want to allow concurrent access somewhere, you can add your trigger pointcut in Settings.yaml like such:
+  
+    DigiComp:
+      FlowSessionLock:
+        readOnlyExpressions:
+          'AcmeLock': 'method(Acme/SuperPackage/Controller/ConcurrentController->concurrentAction())'

Tests/Functional/Fixtures/Controller/ExampleController.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace DigiComp\FlowSessionLock\Tests\Functional\Fixtures\Controller;
-
-use DigiComp\FlowSessionLock\Annotations as FlowSessionLock;
-use Neos\Flow\Annotations as Flow;
-use Neos\Flow\Mvc\Controller\ActionController;
-
-class ExampleController extends ActionController
-{
-    public const CONTROLLER_TIME = 200;
-
-    /**
-     * @Flow\Session(autoStart=true);
-     * @return string
-     */
-    public function protectedAction()
-    {
-        \usleep(static::CONTROLLER_TIME * 1000);
-        return 'Hello World!';
-    }
-
-    /**
-     * @Flow\Session(autoStart=true);
-     * @FlowSessionLock\Unlock
-     * @return string
-     */
-    public function unprotectedByAnnotationAction()
-    {
-        \usleep(static::CONTROLLER_TIME * 1000);
-        return 'Hello World!';
-    }
-
-    /**
-     * @Flow\Session(autoStart=true);
-     * @return string
-     */
-    public function unprotectedByConfigurationAction()
-    {
-        \usleep(static::CONTROLLER_TIME * 1000);
-        return 'Hello World!';
-    }
-}

Tests/Functional/SessionLockRequestComponentTest.php

@@ -1,103 +0,0 @@
-<?php
-
-namespace DigiComp\FlowSessionLock\Tests\Functional;
-
-use DigiComp\FlowSessionLock\Tests\Functional\Fixtures\Controller\ExampleController;
-use GuzzleHttp\Psr7\Uri;
-use Neos\Flow\Http\Cookie;
-use Neos\Flow\Mvc\Routing\Route;
-use Neos\Flow\Tests\FunctionalTestCase;
-use Psr\Http\Message\ServerRequestFactoryInterface;
-
-class SessionLockRequestComponentTest extends FunctionalTestCase
-{
-    protected ServerRequestFactoryInterface $serverRequestFactory;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-        $this->serverRequestFactory = $this->objectManager->get(ServerRequestFactoryInterface::class);
-        $route = new Route();
-        $route->setName('Functional Test - SessionRequestComponent::Restricted');
-        $route->setUriPattern('test/sessionlock/{@action}');
-        $route->setDefaults([
-            '@package' => 'DigiComp.FlowSessionLock',
-            '@subpackage' => 'Tests\Functional\Fixtures',
-            '@controller' => 'Example',
-            '@action' => 'protected',
-            '@format' => 'html',
-        ]);
-        $route->setAppendExceedingArguments(true);
-        $this->router->addRoute($route);
-    }
-
-    public function expectedDuration(): array
-    {
-        $parallelChecker = function ($allRequests, $oneRequest) {
-            self::assertGreaterThan(ExampleController::CONTROLLER_TIME, $oneRequest * 1000);
-            self::assertLessThan(ExampleController::CONTROLLER_TIME * 4, $allRequests * 1000);
-        };
-        return [
-            [
-                'http://localhost/test/sessionlock/protected',
-                function ($allRequests, $oneRequest) {
-                    self::assertGreaterThan(ExampleController::CONTROLLER_TIME, $oneRequest * 1000);
-                    self::assertGreaterThan(ExampleController::CONTROLLER_TIME * 4, $allRequests * 1000);
-                },
-            ],
-            [
-                'http://localhost/test/sessionlock/unprotectedbyannotation',
-                $parallelChecker,
-            ],
-            [
-                'http://localhost/test/sessionlock/unprotectedbyconfiguration',
-                $parallelChecker,
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider expectedDuration
-     * @test
-     */
-    public function itDoesNotAllowToEnterMoreThanOneWithTheSameSession(string $url, \Closure $checker): void
-    {
-        // Functional tests are currently broken, until a version containing
-        // https://github.com/neos/flow-development-collection/commit/bebfc4e6566bc4ba2ba28330344105adb2d6ada0
-        // gets released
-        $request = $this->serverRequestFactory
-            ->createServerRequest('GET', new Uri($url));
-        $start = \microtime(true);
-        $response = $this->browser->sendRequest($request);
-        $neededForOne = \microtime(true) - $start;
-
-        $sessionCookies = \array_map(static function ($cookie) {
-            return Cookie::createFromRawSetCookieHeader($cookie);
-        }, $response->getHeader('Set-Cookie'));
-        self::assertNotEmpty($sessionCookies);
-
-        $cookies = \array_reduce($sessionCookies, static function ($out, $cookie) {
-            $out[$cookie->getName()] = $cookie->getValue();
-            return $out;
-        }, []);
-        $nextRequest = $this->serverRequestFactory
-            ->createServerRequest('GET', new Uri($url))
-            ->withCookieParams($cookies);
-        $childs = [];
-        $start = \microtime(true);
-        for ($i = 0; $i < 4; $i++) {
-            $child = \pcntl_fork();
-            if ($child === 0) {
-                $this->browser->sendRequest($nextRequest);
-                exit();
-            }
-            $childs[] = $child;
-        }
-        foreach ($childs as $child) {
-            \pcntl_waitpid($child, $status);
-        }
-        $neededForAll = \microtime(true) - $start;
-
-        $checker($neededForAll, $neededForOne);
-    }
-}

composer.json

@@ -1,14 +1,25 @@
 {
     "name": "digicomp/flowsessionlock",
-    "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",
+    "description": "Sesion locking for Neos Flow - it secures the session becoming corrupted by concurrent access to the same session by different requests",
+    "keywords": [
+        "flow",
+        "neos"
+    ],
+    "authors": [
+        {
+            "name": "Ferdinand Kuhl",
+            "email": "f.kuhl@digital-competence.de",
+            "homepage": "http://www.digital-competence.de",
+            "role": "Developer"
+        }
+    ],
+    "license": "MIT",
+    "homepage": "https://github.com/digicomp/DigiComp.FlowSessionLock",
     "require": {
-        "neos/flow": "^7.3.0 | ^8.2",
-        "php": "^7.4 | ^8.1",
-        "symfony/lock": "^5.2.0 | ^6.2.0"
-    },
-    "require-dev": {
-        "ext-pcntl": "*"
+        "neos/flow": "^6.2",
+        "php": "^7.4",
+        "symfony/lock": "^5.2"
     },
     "autoload": {
         "psr-4": {
@@ -20,33 +31,7 @@
             "package-key": "DigiComp.FlowSessionLock"
         },
         "branch-alias": {
-            "dev-develop": "4.0.x-dev",
-            "dev-version/2.x-dev": "2.1.x-dev"
-        },
-        "applied-flow-migrations": [
-            "Neos.SwiftMailer-20161130105617",
-            "Neos.Flow-20180415105700",
-            "Neos.Flow-20190425144900",
-            "Neos.Flow-20190515215000",
-            "Neos.Flow-20200813181400",
-            "Neos.Flow-20201003165200",
-            "Neos.Flow-20201109224100",
-            "Neos.Flow-20201205172733",
-            "Neos.Flow-20201207104500"
-        ]
-    },
-    "authors": [
-        {
-            "name": "Ferdinand Kuhl",
-            "email": "f.kuhl@digital-competence.de",
-            "homepage": "https://www.digital-competence.de",
-            "role": "Developer"
+            "dev-develop": "1.0.x-dev"
         }
-    ],
-    "license": "MIT",
-    "homepage": "https://github.com/digital-competence/FlowSessionLock",
-    "keywords": [
-        "Neos",
-        "Flow"
-    ]
+    }
 }