From 0b1c5f39c1c654ccb20cd4323d8114539981d9dd Mon Sep 17 00:00:00 2001
From: Sascha Grossenbacher <saschagros@gmail.com>
Date: Sun, 24 Apr 2022 11:42:48 +0200
Subject: [PATCH] Remove d8 testing, php 8.1 fixes, use friends-of-behat mink
 extension fork

---
 .travis.yml                                                     | 1 -
 composer.json                                                   | 2 +-
 ...ost_adress.yml => field.storage.node.field_post_address.yml} | 0
 src/Drupal/DrupalExtension/Context/RawDrupalContext.php         | 2 +-
 4 files changed, 2 insertions(+), 3 deletions(-)
 rename fixtures/drupal8/modules/behat_test/config/install/{field.storage.node.field_post_adress.yml => field.storage.node.field_post_address.yml} (100%)

diff --git a/.travis.yml b/.travis.yml
index 122f3aed..3d7a8a37 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,6 @@ env:
     - TRAVIS_NODE_VERSION="4.0.0"
   matrix:
     - DRUPAL_VERSION=7
-    - DRUPAL_VERSION=8
     - DRUPAL_VERSION=9
 
 # Enable Travis containers.
diff --git a/composer.json b/composer.json
index f5bb2c70..c2b1c3c4 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
   "require": {
     "behat/behat": "~3.2",
     "behat/mink": "~1.5",
-    "behat/mink-extension": "~2.0",
+    "friends-of-behat/mink-extension": "^2",
     "behat/mink-goutte-driver": "~1.0",
     "behat/mink-selenium2-driver": "~1.1",
     "drupal/drupal-driver": "^2.1.0",
diff --git a/fixtures/drupal8/modules/behat_test/config/install/field.storage.node.field_post_adress.yml b/fixtures/drupal8/modules/behat_test/config/install/field.storage.node.field_post_address.yml
similarity index 100%
rename from fixtures/drupal8/modules/behat_test/config/install/field.storage.node.field_post_adress.yml
rename to fixtures/drupal8/modules/behat_test/config/install/field.storage.node.field_post_address.yml
diff --git a/src/Drupal/DrupalExtension/Context/RawDrupalContext.php b/src/Drupal/DrupalExtension/Context/RawDrupalContext.php
index bf9754fe..81e5d2e0 100644
--- a/src/Drupal/DrupalExtension/Context/RawDrupalContext.php
+++ b/src/Drupal/DrupalExtension/Context/RawDrupalContext.php
@@ -423,7 +423,7 @@ public function parseEntityFields($entity_type, \stdClass $entity)
                 // Split up multiple values in multi-value fields.
                 $values = [];
                 foreach (str_getcsv($field_value) as $key => $value) {
-                    $value = trim($value);
+                    $value = trim((string) $value);
                     $columns = $value;
                     // Split up field columns if the ' - ' separator is present.
                     if (strstr($value, ' - ') !== false) {