From fbe3fb6c5e8eb31c126f1f8de23643b1d7dff5b3 Mon Sep 17 00:00:00 2001
From: Kamil Kokot <kamil@kokot.me>
Date: Tue, 26 Nov 2019 14:55:55 +0100
Subject: [PATCH] Add support for Symfony 4.4 and 5.0; remove for 4.2 and 4.3

---
 .travis.yml                         | 13 +++++++++++--
 README.md                           |  2 +-
 composer.json                       | 15 +++++++--------
 tests/Behat/Context/TestContext.php |  3 +--
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f88a9d8..b114031 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,18 @@ php:
 
 env:
     - SYMFONY_VERSION=3.4.*
-    - SYMFONY_VERSION=4.2.*
-    - SYMFONY_VERSION=4.3.*
     - SYMFONY_VERSION=4.4.*
+    - SYMFONY_VERSION=5.0.*
+
+jobs:
+    exclude:
+        -
+            php: '7.1'
+            env: SYMFONY_VERSION=5.0.*
+    allow_failures:
+        -
+            env: SYMFONY_VERSION=5.0.*
+    fast_finish: true
 
 cache:
     directories:
diff --git a/README.md b/README.md
index 91768e6..cc6c521 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 <h1 align="center">SymfonyExtension</h1>
 
-This Behat extension provides an integration with Symfony (both `^3.4` and `^4.3`) and Mink driver for Symfony application.
+This Behat extension provides an integration with Symfony (both `^3.4`, `^4.3` and `^5.0`) and Mink driver for Symfony application.
 
 It allows for:
 
diff --git a/composer.json b/composer.json
index 6abf8f7..bb70207 100644
--- a/composer.json
+++ b/composer.json
@@ -13,9 +13,9 @@
     "require": {
         "php": "^7.1",
         "behat/behat": "^3.4",
-        "symfony/dependency-injection": "^3.4|^4.2",
-        "symfony/http-kernel": "^3.4|^4.2",
-        "symfony/proxy-manager-bridge": "^3.4|^4.2"
+        "symfony/dependency-injection": "^3.4|^4.4|^5.0",
+        "symfony/http-kernel": "^3.4|^4.4|^5.0",
+        "symfony/proxy-manager-bridge": "^3.4|^4.4|^5.0"
     },
     "require-dev": {
         "behat/mink": "^1.7",
@@ -26,13 +26,12 @@
         "friends-of-behat/service-container-extension": "^1.0",
         "phpstan/phpstan-shim": "^0.11",
         "sylius-labs/coding-standard": "^3.0",
-        "symfony/browser-kit": "^3.4|^4.2",
-        "symfony/framework-bundle": "^3.4|^4.2",
-        "symfony/process": "^3.4|^4.2",
-        "symfony/yaml": "^3.4|^4.2"
+        "symfony/browser-kit": "^3.4|^4.4|^5.0",
+        "symfony/framework-bundle": "^3.4|^4.4|^5.0",
+        "symfony/process": "^3.4|^4.4|^5.0",
+        "symfony/yaml": "^3.4|^4.4|^5.0"
     },
     "conflict": {
-        "symfony/stopwatch": "^5.0",
         "symplify/package-builder": "^7.2",
         "symplify/smart-file-system": "^7.2"
     },
diff --git a/tests/Behat/Context/TestContext.php b/tests/Behat/Context/TestContext.php
index 9b5683b..a7f56fc 100644
--- a/tests/Behat/Context/TestContext.php
+++ b/tests/Behat/Context/TestContext.php
@@ -218,8 +218,7 @@ CON
             $executablePath = $this->thereIsFile('__executable.php', $content);
         }
 
-        $this->process = new Process(sprintf('%s %s --strict -vvv --no-interaction --lang=en', self::$phpBin, escapeshellarg($executablePath)));
-        $this->process->setWorkingDirectory(self::$workingDir);
+        $this->process = new Process([self::$phpBin, $executablePath, '--strict', '-vvv', '--no-interaction', '--lang=en'], self::$workingDir);
         $this->process->start();
         $this->process->wait();
     }