Task: minor behat test cleanup

.composer.json

@@ -3,7 +3,14 @@
   "description": "Flow packages in a joined repository for pull requests.",
   "license": ["MIT"],
   "type": "neos-package-collection",
+  "scripts": {
+    "test:behavioral": [
+      "../../flow doctrine:migrate --quiet",
+      "../../bin/behat -f progress -c Neos.Flow/Tests/Behavior/behat.yml"
+    ]
+  },
   "require": {
+    "behat/behat": "^3.5"
   },
   "replace": {
   },

.github/workflows/build.yml

@@ -185,8 +185,8 @@ jobs:
         if: ${{ matrix.static-analysis == 'no' && matrix.dependencies != 'lowest' }}
         #if: env.BEHAT == true
         run: |
-          FLOW_CONTEXT=Testing/Behat ./flow behat:setup && ./flow doctrine:create && ./flow doctrine:migrationversion --add --version all
-          bin/behat --stop-on-failure -f progress -c Packages/Framework/Neos.Flow/Tests/Behavior/behat.yml.dist
+          cd Packages/Framework
+          composer test:behavioral
 
       - name: Setup Flow configuration (PGSQL)
         run: |
@@ -222,8 +222,8 @@ jobs:
         if: ${{ matrix.static-analysis == 'no' && matrix.dependencies != 'lowest' }}
         #if: env.BEHAT == true
         run: |
-          FLOW_CONTEXT=Testing/Behat ./flow behat:setup && ./flow doctrine:create && ./flow doctrine:migrationversion --add --version all
-          bin/behat --stop-on-failure -f progress -c Packages/Framework/Neos.Flow/Tests/Behavior/behat.yml.dist
+          cd Packages/Framework
+          composer test:behavioral
 
   buildall:
     if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[skip travis]')"

.github/workflows/experimental.yml

@@ -169,8 +169,8 @@ jobs:
         if: ${{ matrix.static-analysis == 'no' && matrix.dependencies != 'lowest' }}
         #if: env.BEHAT == true
         run: |
-          FLOW_CONTEXT=Testing/Behat ./flow behat:setup && ./flow doctrine:create && ./flow doctrine:migrationversion --add --version all
-          bin/behat --stop-on-failure -f progress -c Packages/Framework/Neos.Flow/Tests/Behavior/behat.yml.dist
+          cd Packages/Framework
+          composer test:behavioral
 
       - name: Setup Flow configuration (PGSQL)
         run: |
@@ -206,5 +206,5 @@ jobs:
         if: ${{ matrix.static-analysis == 'no' && matrix.dependencies != 'lowest' }}
         #if: env.BEHAT == true
         run: |
-          FLOW_CONTEXT=Testing/Behat ./flow behat:setup && ./flow doctrine:create && ./flow doctrine:migrationversion --add --version all
-          bin/behat --stop-on-failure -f progress -c Packages/Framework/Neos.Flow/Tests/Behavior/behat.yml.dist
+          cd Packages/Framework
+          composer test:behavioral

Neos.Flow/Tests/Behavior/Features/Bootstrap/SecurityOperationsTrait.php

@@ -204,7 +204,7 @@ protected function setupSecurity()
             return;
         }
         $this->privilegeManager = $this->objectManager->get(PrivilegeManagerInterface::class);
-        $this->privilegeManager->setOverrideDecision(null);
+        $this->privilegeManager->reset();
 
         $this->policyService = $this->objectManager->get(PolicyService::class);
         $this->accountRepository = $this->objectManager->get(Security\AccountRepository::class);

Neos.Flow/Tests/Behavior/behat.yml

@@ -0,0 +1,9 @@
+default:
+  autoload:
+    '': "%paths.base%/Features/Bootstrap"
+  suites:
+    flow:
+      paths:
+        - "%paths.base%/Features/Security"
+      contexts:
+        - FeatureContext

Neos.Flow/Tests/Functional/Command/BehatTestHelper.php

@@ -14,17 +14,11 @@
 require_once(FLOW_PATH_PACKAGES . '/Framework/Neos.Flow/Tests/Behavior/Features/Bootstrap/IsolatedBehatStepsTrait.php');
 require_once(FLOW_PATH_PACKAGES . '/Framework/Neos.Flow/Tests/Behavior/Features/Bootstrap/SecurityOperationsTrait.php');
 
-use Neos\Flow\Tests\Behavior\Features\Bootstrap\IsolatedBehatStepsTrait;
-use Neos\Flow\Tests\Behavior\Features\Bootstrap\SecurityOperationsTrait;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Core\Bootstrap;
-use Neos\Flow\Mvc\ActionRequest;
 use Neos\Flow\ObjectManagement\ObjectManagerInterface;
-use Neos\Flow\Security\Authentication\AuthenticationManagerInterface;
-use Neos\Flow\Security\Authentication\Provider\TestingProvider;
-use Neos\Flow\Security\Authorization\PrivilegeManagerInterface;
-use Neos\Flow\Security\Context;
 use Neos\Flow\Security\Policy\PolicyService;
+use Neos\Flow\Tests\Behavior\Features\Bootstrap\SecurityOperationsTrait;
 use Neos\Flow\Utility\Environment;
 
 /**
@@ -35,13 +29,11 @@
  */
 class BehatTestHelper
 {
-    use IsolatedBehatStepsTrait;
-
     use SecurityOperationsTrait;
 
-    /**
-     * @var Bootstrap
-     */
+    protected $isolated = false;
+
+    /** @var Bootstrap */
     protected static $bootstrap;
 
     /**
@@ -56,49 +48,18 @@ class BehatTestHelper
      */
     protected $environment;
 
-    /**
-     * @var ActionRequest
-     */
-    protected $mockActionRequest;
-
-    /**
-     * @var PrivilegeManagerInterface
-     */
-    protected $privilegeManager;
-
     /**
      * @var PolicyService
      * @Flow\Inject
      */
     protected $policyService;
 
-    /**
-     * @var AuthenticationManagerInterface
-     */
-    protected $authenticationManager;
-
-    /**
-     * @var TestingProvider
-     */
-    protected $testingProvider;
-
-    /**
-     * @var Context
-     */
-    protected $securityContext;
-
-    /**
-     * @return void
-     */
-    public function initializeObject()
+    public function initializeObject(): void
     {
         self::$bootstrap = Bootstrap::$staticObjectManager->get(Bootstrap::class);
-        $this->isolated = false;
     }
 
-    /**
-     * @return mixed
-     */
+    /** @return ObjectManagerInterface */
     protected function getObjectManager()
     {
         return $this->objectManager;

composer.json

@@ -5,7 +5,14 @@
         "MIT"
     ],
     "type": "neos-package-collection",
+    "scripts": {
+        "test:behavioral": [
+            "../../flow doctrine:migrate --quiet",
+            "../../bin/behat -f progress -c Neos.Flow/Tests/Behavior/behat.yml"
+        ]
+    },
     "require": {
+        "behat/behat": "^3.5",
         "php": "^8.2",
         "psr/simple-cache": "^2.0 || ^3.0",
         "psr/cache": "^2.0 || ^3.0",
@@ -22,6 +29,7 @@
         "psr/http-server-handler": "^1.0",
         "psr/http-client": "^1.0",
         "ramsey/uuid": "^3.0 || ^4.0",
+        "laminas/laminas-code": "^4.10",
         "doctrine/orm": "^2.12.0",
         "doctrine/migrations": "^3.0",
         "doctrine/dbal": "^2.13",