From c52a13db0343ef479939eebcef496bdee6486347 Mon Sep 17 00:00:00 2001
From: Yevhen Korniievskyi <y.korniievskyi@dev-branch.com>
Date: Mon, 18 Nov 2024 11:07:17 +0200
Subject: [PATCH 01/23] #1118: Added PhpUnit 10 and Symfony 7 requirements for
 composer.json. Updated CI tests to test PHPUnit 10 version for latest PHP 8.x
 versions.

---
 .github/workflows/ci.yml | 6 ++++++
 composer.json            | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 32d94d0..55ff60e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,6 +16,12 @@ jobs:
             php: 8.0
           - phpunit: 9.5.26
             php: 8.1
+          - phpunit: 10.5.38
+            php: 8.1
+          - phpunit: 10.5.38
+            php: 8.2
+          - phpunit: 10.5.38
+            php: 8.3
 
     steps:
       - uses: actions/checkout@v3
diff --git a/composer.json b/composer.json
index ab287a1..fdb8936 100644
--- a/composer.json
+++ b/composer.json
@@ -12,9 +12,9 @@
   ],  
   "require": {
       "php": "^7.0 || ^8.0",
-      "phpunit/phpunit": "^6.0 || ^7.0 || ^8.0 || ^9.0",
+      "phpunit/phpunit": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10",
       "behat/behat": "^3.0.0",
-      "symfony/dependency-injection": "^4.0 || ^5.0 || ^6.0"
+      "symfony/dependency-injection": "^4.0 || ^5.0 || ^6.0 || ^7.0"
   },
   "autoload": {
       "psr-4": {

From 5fc4f2f3c76097771674b84d667ab861495f3af5 Mon Sep 17 00:00:00 2001
From: AstonVictor <victor93g@gmail.com>
Date: Tue, 19 Nov 2024 12:16:04 +0200
Subject: [PATCH 02/23] 1118 - Add new property

---
 src/Behat/Testwork/Environment/PHPUnitEnvironment.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Behat/Testwork/Environment/PHPUnitEnvironment.php b/src/Behat/Testwork/Environment/PHPUnitEnvironment.php
index 9260f1d..a7fda01 100644
--- a/src/Behat/Testwork/Environment/PHPUnitEnvironment.php
+++ b/src/Behat/Testwork/Environment/PHPUnitEnvironment.php
@@ -34,6 +34,11 @@ class PHPUnitEnvironment implements ContextEnvironment
      */
     protected $contextClasses = array();
 
+    /**
+     * @var Suite
+     */
+    protected $suite;
+
     /**
      * Specifies the current PhpUnit test case.
      *

From 4727c867df13cdc0e1becbf4bc4666e60a10991e Mon Sep 17 00:00:00 2001
From: AstonVictor <victor93g@gmail.com>
Date: Tue, 19 Nov 2024 12:17:41 +0200
Subject: [PATCH 03/23] 1118 - Add new property

---
 src/Behat/Testwork/Environment/PHPUnitEnvironment.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Behat/Testwork/Environment/PHPUnitEnvironment.php b/src/Behat/Testwork/Environment/PHPUnitEnvironment.php
index a7fda01..a358f4d 100644
--- a/src/Behat/Testwork/Environment/PHPUnitEnvironment.php
+++ b/src/Behat/Testwork/Environment/PHPUnitEnvironment.php
@@ -39,6 +39,11 @@ class PHPUnitEnvironment implements ContextEnvironment
      */
     protected $suite;
 
+    /**
+     * @var TestCase
+     */
+    protected $testCase;
+
     /**
      * Specifies the current PhpUnit test case.
      *

From b01097f3da82599ccda44e3b595e2a0c4210fd90 Mon Sep 17 00:00:00 2001
From: AstonVictor <victor93g@gmail.com>
Date: Tue, 19 Nov 2024 12:22:09 +0200
Subject: [PATCH 04/23] 1118 - Add new property

---
 .../Framework/Constraint/HasScenarioPassedConstraint.php   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/PHPUnit/Framework/Constraint/HasScenarioPassedConstraint.php b/src/PHPUnit/Framework/Constraint/HasScenarioPassedConstraint.php
index 8f09e04..62d1223 100644
--- a/src/PHPUnit/Framework/Constraint/HasScenarioPassedConstraint.php
+++ b/src/PHPUnit/Framework/Constraint/HasScenarioPassedConstraint.php
@@ -16,6 +16,13 @@
 class HasScenarioPassedConstraint extends Constraint
 {
 
+  /**
+   * The behat environment.
+   *
+   * @var \PHPUnitBehat\Behat\Testwork\Environment\PHPUnitEnvironment
+   */
+  protected $environment;
+
   /**
    * The behat scenario.
    *

From 66dea1de5973c4332ebf848ffdb427cebd840cf9 Mon Sep 17 00:00:00 2001
From: AstonVictor <victor93g@gmail.com>
Date: Tue, 19 Nov 2024 12:36:51 +0200
Subject: [PATCH 05/23] 1118 - Add new property

---
 src/TestTraits/BehatProvidingTrait.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/TestTraits/BehatProvidingTrait.php b/src/TestTraits/BehatProvidingTrait.php
index a2e376a..5f7ca20 100644
--- a/src/TestTraits/BehatProvidingTrait.php
+++ b/src/TestTraits/BehatProvidingTrait.php
@@ -108,7 +108,13 @@ public function getBehatDefaultKeywords() {
    * @return \Behat\Gherkin\Node\KeywordNodeInterface
    */
   protected function getProvidedFeature() {
-    $data = $this->getProvidedData();
+    $data = NULL;
+    if (method_exists($this, 'getProvidedData')) {
+      $data = $this->getProvidedData();
+    }
+    elseif (method_exists($this, 'providedData')) {
+      $data = $this->providedData();
+    }
     if (is_array($data) && $feature = $data[1]) {
       if ($feature instanceof KeywordNodeInterface) {
         return $feature;
@@ -128,7 +134,13 @@ protected function getProvidedFeature() {
    *   The current scenario or example.
    */
   protected function getProvidedScenario() {
-    $data = $this->getProvidedData();
+    $data = NULL;
+    if (method_exists($this, 'getProvidedData')) {
+      $data = $this->getProvidedData();
+    }
+    elseif (method_exists($this, 'providedData')) {
+      $data = $this->providedData();
+    }
     if (is_array($data) && $scenario = $data[0]) {
       if ($scenario instanceof ScenarioInterface) {
         return $scenario;

From b0114d4f01ee1ed5137170d03ea94dfa9d187011 Mon Sep 17 00:00:00 2001
From: AstonVictor <victor93g@gmail.com>
Date: Tue, 19 Nov 2024 12:44:46 +0200
Subject: [PATCH 06/23] 1118 - Add new property

---
 tests/AssertionFailedWrapperErrorTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/AssertionFailedWrapperErrorTest.php b/tests/AssertionFailedWrapperErrorTest.php
index b391951..c4a9ac4 100644
--- a/tests/AssertionFailedWrapperErrorTest.php
+++ b/tests/AssertionFailedWrapperErrorTest.php
@@ -8,7 +8,7 @@
 /**
  *
  */
-class AssertionFailedWrappedErrorTest extends TestCase {
+class AssertionFailedWrapperErrorTest extends TestCase {
 
   use TestDefinitionsTrait;
 

From b87676282620295fb13d0adfb62a608580b60243 Mon Sep 17 00:00:00 2001
From: AstonVictor <victor93g@gmail.com>
Date: Wed, 20 Nov 2024 16:27:37 +0200
Subject: [PATCH 07/23] 1118 - Support new phpunit

---
 .github/workflows/ci.yml | 6 ++++++
 composer.json            | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 55ff60e..8cdf4ae 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,6 +22,12 @@ jobs:
             php: 8.2
           - phpunit: 10.5.38
             php: 8.3
+          - phpunit: 11.4.3
+            php: 8.1
+          - phpunit: 11.4.3
+            php: 8.2
+          - phpunit: 11.4.3
+            php: 8.3
 
     steps:
       - uses: actions/checkout@v3
diff --git a/composer.json b/composer.json
index fdb8936..38e121d 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
   ],  
   "require": {
       "php": "^7.0 || ^8.0",
-      "phpunit/phpunit": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10",
+      "phpunit/phpunit": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10 || ^11",
       "behat/behat": "^3.0.0",
       "symfony/dependency-injection": "^4.0 || ^5.0 || ^6.0 || ^7.0"
   },

From 94c91319fa0014914b932da12cefb504b5749474 Mon Sep 17 00:00:00 2001
From: AstonVictor <victor93g@gmail.com>
Date: Wed, 20 Nov 2024 16:33:18 +0200
Subject: [PATCH 08/23] 1118 - Support new phpunit

---
 src/TestTraits/BehatTestTrait.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/TestTraits/BehatTestTrait.php b/src/TestTraits/BehatTestTrait.php
index 84f73ec..5e4abf0 100644
--- a/src/TestTraits/BehatTestTrait.php
+++ b/src/TestTraits/BehatTestTrait.php
@@ -13,9 +13,9 @@ trait BehatTestTrait  {
    * Parses the ::feature property as a Behat feature,
    * breaking it down into individual scenarios for testing.
    */
-  public function providerTestBehatScenario() {
-    $feature = $this->parseBehatFeature($this->feature);
-    return $this->provideBehatFeature($feature);
+  public static function providerTestBehatScenario() {
+    $feature = self::parseBehatFeature(self::feature);
+    return self::provideBehatFeature($feature);
   }
 
   /**

From 7b649a91ad6b7ccc42715540e6cfee2dd6510922 Mon Sep 17 00:00:00 2001
From: AstonVictor <victor93g@gmail.com>
Date: Wed, 20 Nov 2024 16:35:42 +0200
Subject: [PATCH 09/23] 1118 - Support new phpunit

---
 .github/workflows/ci.yml | 2 +-
 composer.json            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8cdf4ae..65a4511 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        phpunit: [6.5.13, 7.5.18, 8.5.31, 9.5.26]
+        phpunit: [8.5.31, 9.5.26]
         php: [7.3, 7.4]
         include:
           - phpunit: 8.5.31
diff --git a/composer.json b/composer.json
index 38e121d..5df28e8 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
   ],  
   "require": {
       "php": "^7.0 || ^8.0",
-      "phpunit/phpunit": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10 || ^11",
+      "phpunit/phpunit": "^8.0 || ^9.0 || ^10 || ^11",
       "behat/behat": "^3.0.0",
       "symfony/dependency-injection": "^4.0 || ^5.0 || ^6.0 || ^7.0"
   },

From 1dc1f038f5979d5d1e73500d9c06ecf690ee6267 Mon Sep 17 00:00:00 2001
From: AstonVictor <victor93g@gmail.com>
Date: Wed, 20 Nov 2024 16:38:43 +0200
Subject: [PATCH 10/23] 1118 - Support new phpunit

---
 .github/workflows/ci.yml | 23 ++---------------------
 composer.json            |  4 ++--
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 65a4511..76584d5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,27 +7,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        phpunit: [8.5.31, 9.5.26]
-        php: [7.3, 7.4]
-        include:
-          - phpunit: 8.5.31
-            php: 8.0
-          - phpunit: 9.5.26
-            php: 8.0
-          - phpunit: 9.5.26
-            php: 8.1
-          - phpunit: 10.5.38
-            php: 8.1
-          - phpunit: 10.5.38
-            php: 8.2
-          - phpunit: 10.5.38
-            php: 8.3
-          - phpunit: 11.4.3
-            php: 8.1
-          - phpunit: 11.4.3
-            php: 8.2
-          - phpunit: 11.4.3
-            php: 8.3
+        phpunit: [11.4.3]
+        php: [8.2, 8.3]
 
     steps:
       - uses: actions/checkout@v3
diff --git a/composer.json b/composer.json
index 5df28e8..a6c2d2b 100644
--- a/composer.json
+++ b/composer.json
@@ -11,8 +11,8 @@
     }
   ],  
   "require": {
-      "php": "^7.0 || ^8.0",
-      "phpunit/phpunit": "^8.0 || ^9.0 || ^10 || ^11",
+      "php": "^8.2 || ^8.3",
+      "phpunit/phpunit": "^11",
       "behat/behat": "^3.0.0",
       "symfony/dependency-injection": "^4.0 || ^5.0 || ^6.0 || ^7.0"
   },

From 65f6d7e2cec2bb5fee84c3d386643c0cb5472f5f Mon Sep 17 00:00:00 2001
From: AstonVictor <victor93g@gmail.com>
Date: Wed, 20 Nov 2024 16:42:36 +0200
Subject: [PATCH 11/23] 1118 - Support new phpunit

---
 .github/workflows/ci.yml               |  2 +-
 composer.json                          |  2 +-
 src/TestTraits/BehatProvidingTrait.php | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 76584d5..81df096 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        phpunit: [11.4.3]
+        phpunit: [9.5.26, 10.5.38, 11.4.3]
         php: [8.2, 8.3]
 
     steps:
diff --git a/composer.json b/composer.json
index a6c2d2b..cea8466 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
   ],  
   "require": {
       "php": "^8.2 || ^8.3",
-      "phpunit/phpunit": "^11",
+      "phpunit/phpunit": "^9.0 || ^10 || ^11",
       "behat/behat": "^3.0.0",
       "symfony/dependency-injection": "^4.0 || ^5.0 || ^6.0 || ^7.0"
   },
diff --git a/src/TestTraits/BehatProvidingTrait.php b/src/TestTraits/BehatProvidingTrait.php
index 5f7ca20..4332399 100644
--- a/src/TestTraits/BehatProvidingTrait.php
+++ b/src/TestTraits/BehatProvidingTrait.php
@@ -24,8 +24,8 @@ trait BehatProvidingTrait  {
    * @return Behat\Gherkin\Node\FeatureNode
    *   A Behat feature.
    */
-  public function parseBehatFeature($featureString, $keywords = NULL) {
-    $lexer  = new Lexer($this->getBehatKeywords($keywords));
+  public static function parseBehatFeature($featureString, $keywords = NULL) {
+    $lexer  = new Lexer(self::getBehatKeywords($keywords));
     $parser = new Parser($lexer);
     $feature = $parser->parse($featureString);
     return $feature;
@@ -69,9 +69,9 @@ public function provideBehatFeature(FeatureNode $feature) {
    * 
    * @return \Behat\Gherkin\Keywords\ArrayKeywords
    */
-  protected function getBehatKeywords($keywords = NULL) {
+  protected static function getBehatKeywords($keywords = NULL) {
     if (is_null($keywords)) {
-      $keywords = $this->getBehatDefaultKeywords();
+      $keywords = self::getBehatDefaultKeywords();
     }
     return $keywords;
   }
@@ -81,7 +81,7 @@ protected function getBehatKeywords($keywords = NULL) {
    *
    * @return \Behat\Gherkin\Keywords\ArrayKeywords
    */
-  public function getBehatDefaultKeywords() {
+  public static function getBehatDefaultKeywords() {
     return new ArrayKeywords([
         'en' => [
             'feature'          => 'Feature',

From 1c999bbaeb7ab50313f18b0a1a232abd9f3e985e Mon Sep 17 00:00:00 2001
From: AstonVictor <victor93g@gmail.com>
Date: Wed, 20 Nov 2024 16:46:09 +0200
Subject: [PATCH 12/23] 1118 - Support new phpunit

---
 src/TestTraits/BehatTestTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TestTraits/BehatTestTrait.php b/src/TestTraits/BehatTestTrait.php
index 5e4abf0..6e7a48b 100644
--- a/src/TestTraits/BehatTestTrait.php
+++ b/src/TestTraits/BehatTestTrait.php
@@ -14,7 +14,7 @@ trait BehatTestTrait  {
    * breaking it down into individual scenarios for testing.
    */
   public static function providerTestBehatScenario() {
-    $feature = self::parseBehatFeature(self::feature);
+    $feature = self::parseBehatFeature(self::$feature);
     return self::provideBehatFeature($feature);
   }
 

From d3059e0273608a60fe38e515b07c77016d08bfe2 Mon Sep 17 00:00:00 2001
From: AstonVictor <victor93g@gmail.com>
Date: Wed, 20 Nov 2024 16:47:57 +0200
Subject: [PATCH 13/23] 1118 - Support new phpunit

---
 tests/BehatProvidingTraitTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/BehatProvidingTraitTest.php b/tests/BehatProvidingTraitTest.php
index 4259518..f3bd301 100644
--- a/tests/BehatProvidingTraitTest.php
+++ b/tests/BehatProvidingTraitTest.php
@@ -14,7 +14,7 @@ class BehatProvidingTraitTest extends TestCase {
 
   use BehatTestTrait;
 
-  protected $feature = <<<'FEATURE'
+  protected static $feature = <<<'FEATURE'
 Feature: BehatProvidingTrait
     In order to test a feature
     We need to able provide it to phpunit 

From a9bf49f0d59f3006f3030ec340cfbcdfae321fcc Mon Sep 17 00:00:00 2001
From: AstonVictor <victor93g@gmail.com>
Date: Wed, 20 Nov 2024 16:49:49 +0200
Subject: [PATCH 14/23] 1118 - Support new phpunit

---
 src/TestTraits/BehatProvidingTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TestTraits/BehatProvidingTrait.php b/src/TestTraits/BehatProvidingTrait.php
index 4332399..e80d939 100644
--- a/src/TestTraits/BehatProvidingTrait.php
+++ b/src/TestTraits/BehatProvidingTrait.php
@@ -46,7 +46,7 @@ public static function parseBehatFeature($featureString, $keywords = NULL) {
    * @return array
    *   An array of scenarios, each an array of title, scenario, and feature.
    */
-  public function provideBehatFeature(FeatureNode $feature) {
+  public static function provideBehatFeature(FeatureNode $feature) {
     $scenarios = [];
     foreach ($feature->getScenarios() as $scenario) {
         if ($scenario instanceof OutlineNode)  {

From f4a2bcfeb8505c9fa15cb7884937d9da90c36880 Mon Sep 17 00:00:00 2001
From: AstonVictor <victor93g@gmail.com>
Date: Wed, 20 Nov 2024 17:04:42 +0200
Subject: [PATCH 15/23] 1118 - Support new phpunit

---
 .github/workflows/ci.yml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 81df096..2db9234 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,8 +7,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        phpunit: [9.5.26, 10.5.38, 11.4.3]
-        php: [8.2, 8.3]
+        include:
+          - phpunit: 9.5.26
+            php: 8.2
+          - phpunit: 9.5.26
+            php: 8.3
+          - phpunit: 10.5.38
+            php: 8.2
+          - phpunit: 10.5.38
+            php: 8.3
+          - phpunit: 11.4.3
+            php: 8.2
+          - phpunit: 11.4.3
+            php: 8.3
 
     steps:
       - uses: actions/checkout@v3

From 8f7853b40b627180f0b816e2a20de7d8612ee79e Mon Sep 17 00:00:00 2001
From: AstonVictor <victor93g@gmail.com>
Date: Wed, 20 Nov 2024 17:09:16 +0200
Subject: [PATCH 16/23] 1118 - Support new phpunit

---
 .github/workflows/ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2db9234..9394807 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,8 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  - push
+  - pull_request
 
 jobs:
   build-test:

From de6784fa6ca8b0013086c0c58a39d87b7a85f20d Mon Sep 17 00:00:00 2001
From: AstonVictor <victor93g@gmail.com>
Date: Wed, 20 Nov 2024 17:24:28 +0200
Subject: [PATCH 17/23] 1118 - Support new phpunit

---
 .github/workflows/ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9394807..6e284ca 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,8 +20,12 @@ jobs:
             php: 8.3
           - phpunit: 11.4.3
             php: 8.2
+            with:
+              test_suffix: "Test.php"
           - phpunit: 11.4.3
             php: 8.3
+            with:
+              test_suffix: "Test.php"
 
     steps:
       - uses: actions/checkout@v3

From f7fd4865ece1260151a490b74fd907b426685e07 Mon Sep 17 00:00:00 2001
From: AstonVictor <victor93g@gmail.com>
Date: Wed, 20 Nov 2024 17:26:38 +0200
Subject: [PATCH 18/23] 1118 - Support new phpunit

---
 .github/workflows/ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6e284ca..460f892 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,12 +20,12 @@ jobs:
             php: 8.3
           - phpunit: 11.4.3
             php: 8.2
-            with:
-              test_suffix: "Test.php"
+            env:
+              ACTION_TEST_SUFFIX: "Test.php"
           - phpunit: 11.4.3
             php: 8.3
-            with:
-              test_suffix: "Test.php"
+            env:
+              ACTION_TEST_SUFFIX: "Test.php"
 
     steps:
       - uses: actions/checkout@v3

From 6a86f8fa666342c3a5951702809bda2e23220e2a Mon Sep 17 00:00:00 2001
From: AstonVictor <victor93g@gmail.com>
Date: Wed, 20 Nov 2024 17:31:49 +0200
Subject: [PATCH 19/23] 1118 - Support new phpunit

---
 .env | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .env

diff --git a/.env b/.env
new file mode 100644
index 0000000..9d1eb46
--- /dev/null
+++ b/.env
@@ -0,0 +1 @@
+ACTION_TEST_SUFFIX: Test.php

From a6ed27671b6074593dc617dd399ad25f38442034 Mon Sep 17 00:00:00 2001
From: AstonVictor <victor93g@gmail.com>
Date: Wed, 20 Nov 2024 17:33:53 +0200
Subject: [PATCH 20/23] 1118 - Support new phpunit

---
 .env                     |  1 -
 .github/workflows/ci.yml | 10 ++++++----
 2 files changed, 6 insertions(+), 5 deletions(-)
 delete mode 100644 .env

diff --git a/.env b/.env
deleted file mode 100644
index 9d1eb46..0000000
--- a/.env
+++ /dev/null
@@ -1 +0,0 @@
-ACTION_TEST_SUFFIX: Test.php
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 460f892..a1d183b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,12 +20,14 @@ jobs:
             php: 8.3
           - phpunit: 11.4.3
             php: 8.2
-            env:
-              ACTION_TEST_SUFFIX: "Test.php"
+            uses: php-actions/phpunit@v3
+            with:
+              test_suffix: "Test.php"
           - phpunit: 11.4.3
             php: 8.3
-            env:
-              ACTION_TEST_SUFFIX: "Test.php"
+            uses: php-actions/phpunit@v3
+            with:
+              test_suffix: "Test.php"
 
     steps:
       - uses: actions/checkout@v3

From f02c1a93bca6df09ddc0c701534e31de2195b166 Mon Sep 17 00:00:00 2001
From: AstonVictor <victor93g@gmail.com>
Date: Wed, 20 Nov 2024 17:37:00 +0200
Subject: [PATCH 21/23] 1118 - Support new phpunit

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a1d183b..3a64641 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,3 +41,4 @@ jobs:
         with:
           php_version: ${{ matrix.php }}
           version: ${{ matrix.phpunit }}
+          test_suffix: "Test.php"

From dc30c8d71cab7f24a3ae1a2a6324886988543f18 Mon Sep 17 00:00:00 2001
From: AstonVictor <victor93g@gmail.com>
Date: Wed, 20 Nov 2024 17:38:09 +0200
Subject: [PATCH 22/23] 1118 - Support new phpunit

---
 .github/workflows/ci.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3a64641..2f496b2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,14 +20,8 @@ jobs:
             php: 8.3
           - phpunit: 11.4.3
             php: 8.2
-            uses: php-actions/phpunit@v3
-            with:
-              test_suffix: "Test.php"
           - phpunit: 11.4.3
             php: 8.3
-            uses: php-actions/phpunit@v3
-            with:
-              test_suffix: "Test.php"
 
     steps:
       - uses: actions/checkout@v3

From 04bc165db787e1f84a6fe4f0743a6998731aa73f Mon Sep 17 00:00:00 2001
From: AstonVictor <victor93g@gmail.com>
Date: Tue, 21 Jan 2025 09:18:47 +0200
Subject: [PATCH 23/23] 1118 - Fix features

---
 src/TestTraits/BehatTestTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TestTraits/BehatTestTrait.php b/src/TestTraits/BehatTestTrait.php
index 6e7a48b..193ed9c 100644
--- a/src/TestTraits/BehatTestTrait.php
+++ b/src/TestTraits/BehatTestTrait.php
@@ -14,7 +14,7 @@ trait BehatTestTrait  {
    * breaking it down into individual scenarios for testing.
    */
   public static function providerTestBehatScenario() {
-    $feature = self::parseBehatFeature(self::$feature);
+    $feature = self::parseBehatFeature(static::$feature);
     return self::provideBehatFeature($feature);
   }