Skip to content

Commit

Permalink
refactor #100 Add support for Symfony 4.4 and 5.0; remove for 4.2 and…
Browse files Browse the repository at this point in the history
… 4.3 (pamil)

This PR was merged into the 2.1-dev branch.

Discussion
----------

Waiting for Behat to support Symfony 5.

Commits
-------

fbe3fb6 Add support for Symfony 4.4 and 5.0; remove for 4.2 and 4.3
  • Loading branch information
pamil committed Jan 13, 2020
2 parents f2ba93c + fbe3fb6 commit af3f498
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 13 deletions.
13 changes: 11 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
15 changes: 7 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
},
Expand Down
3 changes: 1 addition & 2 deletions tests/Behat/Context/TestContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,7 @@ public function iRunBehat(): void
$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();
}
Expand Down

0 comments on commit af3f498

Please sign in to comment.