Skip to content
This repository was archived by the owner on Apr 29, 2025. It is now read-only.

Commit 58ff140

Browse files
authored
Merge pull request #126 from Behat/sf4
Support for Symfony 4
2 parents 4eec9ec + 529f8b3 commit 58ff140

File tree

4 files changed

+14
-18
lines changed

4 files changed

+14
-18
lines changed

.travis.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,19 @@ cache:
1414

1515
matrix:
1616
include:
17-
- php: 5.3
18-
env: SYMFONY_VERSION='2.3.*'
19-
dist: precise
2017
- php: 5.5
2118
env: SYMFONY_VERSION='2.7.*'
2219
- php: 5.6
2320
env: SYMFONY_VERSION='2.8.*'
24-
- php: 7.0
25-
env: DEPS=dev SYMFONY_VERSION='3.0.*'
2621
- php: 7.1
27-
env: DEPS=dev SYMFONY_VERSION='3.0.*'
22+
env: SYMFONY_VERSION='3.3.*'
23+
- php: 7.1
24+
env: DEPS=dev SYMFONY_VERSION='3.4.*'
25+
- php: 7.1
26+
env: DEVS=dev SYMFONY_VERSION='4.0.*'
2827
allow_failures:
29-
- php: 7.0
30-
env: SYMFONY_VERSION='3.0.*'
3128
- php: 7.1
32-
env: SYMFONY_VERSION='3.0.*'
29+
env: SYMFONY_VERSION='4.0.x-dev'
3330

3431
before_install:
3532
- composer self-update

composer.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@
1818

1919
"require": {
2020
"php": ">=5.3.3",
21-
"behat/behat": "~3.0,>=3.0.4",
22-
"symfony/framework-bundle": "~2.0|~3.0"
21+
"behat/behat": "^3.4.3",
22+
"symfony/framework-bundle": "~2.0|~3.0|~4.0"
2323
},
2424

2525
"require-dev": {
26-
"symfony/symfony": "~2.1|~3.0",
26+
"symfony/symfony": "~2.1|~3.0|~4.0",
2727
"behat/mink-extension": "~2.0",
28-
"behat/mink-browserkit-driver": "~1.0",
29-
"phpspec/phpspec": "~2.0",
30-
"phpunit/phpunit": "~4.0"
28+
"behat/mink": "~1.7@dev",
29+
"behat/mink-browserkit-driver": "~1.3@dev",
30+
"phpspec/phpspec": "~2.0|~3.0|~4.0",
31+
"phpunit/phpunit": "~4.0|~5.0"
3132
},
3233

3334
"autoload": {

testapp/app/config/config.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@ framework:
66
form: true
77
validation: { enable_annotations: true }
88
default_locale: en
9-
trusted_proxies: ~
109
session: ~
1110

1211
parameters:
1312
custom_app: 'behat-test-app'
1413
collection_param:
1514
- 'Param 1'
16-
- 'Param 2'
15+
- 'Param 2'

testapp/behat.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ default:
2424
session: '@session'
2525
services:
2626
- '@session'
27-
- '@session.storage.filesystem'
2827
params:
2928
- "%%kernel.root_dir%%"
3029
- "%%kernel.environment%%"

0 commit comments

Comments
 (0)