Add PHP 8.1 support

Behat · Sep 11, 2021 · 997bc29 · 997bc29
1 parent 724fab9
commit 997bc29
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [7.2, 7.3, 7.4, 8.0]
+        php: [7.2, 7.3, 7.4, 8.0, 8.1]
         composer-flags: [ "" ]
         symfony-version: [ "" ]
         include:

diff --git a/src/Behat/Gherkin/Filter/RoleFilter.php b/src/Behat/Gherkin/Filter/RoleFilter.php
@@ -46,7 +46,7 @@ public function __construct($role)
      */
     public function isFeatureMatch(FeatureNode $feature)
     {
-        return 1 === preg_match($this->pattern, $feature->getDescription());
+        return 1 === preg_match($this->pattern, $feature->getDescription() ?? '');
     }
 
     /**

diff --git a/src/Behat/Gherkin/Lexer.php b/src/Behat/Gherkin/Lexer.php
@@ -483,7 +483,7 @@ protected function scanPyStringContent()
 
         $token = $this->scanText();
         // swallow trailing spaces
-        $token['value'] = preg_replace('/^\s{0,' . $this->pyStringSwallow . '}/u', '', $token['value']);
+        $token['value'] = preg_replace('/^\s{0,' . $this->pyStringSwallow . '}/u', '', $token['value'] ?? '');
 
         return $token;
     }

diff --git a/src/Behat/Gherkin/Node/TableNode.php b/src/Behat/Gherkin/Node/TableNode.php
@@ -14,6 +14,7 @@
 use Behat\Gherkin\Exception\NodeException;
 use Iterator;
 use IteratorAggregate;
+use ReturnTypeWillChange;
 
 /**
  * Represents Gherkin Table argument.
@@ -333,6 +334,7 @@ public function __toString()
      *
      * @return Iterator
      */
+    #[ReturnTypeWillChange]
     public function getIterator()
     {
         return new ArrayIterator($this->getHash());

diff --git a/src/Behat/Gherkin/Parser.php b/src/Behat/Gherkin/Parser.php
@@ -235,7 +235,7 @@ protected function parseFeature()
     {
         $token = $this->expectTokenType('Feature');
 
-        $title = trim($token['value']) ?: null;
+        $title = trim($token['value'] ?? '');
         $description = null;
         $tags = $this->popTags();
         $background = null;
@@ -288,7 +288,7 @@ protected function parseFeature()
 
         return new FeatureNode(
             rtrim($title) ?: null,
-            rtrim($description) ?: null,
+            rtrim($description ?? '') ?: null,
             $tags,
             $background,
             $scenarios,
@@ -310,7 +310,7 @@ protected function parseBackground()
     {
         $token = $this->expectTokenType('Background');
 
-        $title = trim($token['value']);
+        $title = trim($token['value'] ?? '');
         $keyword = $token['keyword'];
         $line = $token['line'];
 
@@ -375,7 +375,7 @@ protected function parseScenario()
     {
         $token = $this->expectTokenType('Scenario');
 
-        $title = trim($token['value']);
+        $title = trim($token['value'] ?? '');
         $tags = $this->popTags();
         $keyword = $token['keyword'];
         $line = $token['line'];
@@ -436,7 +436,7 @@ protected function parseOutline()
     {
         $token = $this->expectTokenType('Outline');
 
-        $title = trim($token['value']);
+        $title = trim($token['value'] ?? '');
         $tags = $this->popTags();
         $keyword = $token['keyword'];