Merge pull request #126 from Behat/sf4

Support for Symfony 4
Behat · Dec 13, 2017 · 58ff140 · 58ff140
2 parents 4eec9ec + 529f8b3
commit 58ff140
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,22 +14,19 @@ cache:
 
 matrix:
   include:
-    - php: 5.3
-      env: SYMFONY_VERSION='2.3.*'
-      dist: precise
     - php: 5.5
       env: SYMFONY_VERSION='2.7.*'
     - php: 5.6
       env: SYMFONY_VERSION='2.8.*'
-    - php: 7.0
-      env: DEPS=dev SYMFONY_VERSION='3.0.*'
     - php: 7.1
-      env: DEPS=dev SYMFONY_VERSION='3.0.*'
+      env: SYMFONY_VERSION='3.3.*'
+    - php: 7.1
+      env: DEPS=dev SYMFONY_VERSION='3.4.*'
+    - php: 7.1
+      env: DEVS=dev SYMFONY_VERSION='4.0.*'
   allow_failures:
-    - php: 7.0
-      env: SYMFONY_VERSION='3.0.*'
     - php: 7.1
-      env: SYMFONY_VERSION='3.0.*'
+      env: SYMFONY_VERSION='4.0.x-dev'
 
 before_install:
   - composer self-update

diff --git a/composer.json b/composer.json
@@ -18,16 +18,17 @@
 
     "require": {
         "php":                       ">=5.3.3",
-        "behat/behat":               "~3.0,>=3.0.4",
-        "symfony/framework-bundle":  "~2.0|~3.0"
+        "behat/behat":               "^3.4.3",
+        "symfony/framework-bundle":  "~2.0|~3.0|~4.0"
     },
 
     "require-dev": {
-        "symfony/symfony":               "~2.1|~3.0",
+        "symfony/symfony":               "~2.1|~3.0|~4.0",
         "behat/mink-extension":          "~2.0",
-        "behat/mink-browserkit-driver":  "~1.0",
-        "phpspec/phpspec":               "~2.0",
-        "phpunit/phpunit":               "~4.0"
+        "behat/mink":                    "~1.7@dev",
+        "behat/mink-browserkit-driver":  "~1.3@dev",
+        "phpspec/phpspec":               "~2.0|~3.0|~4.0",
+        "phpunit/phpunit":               "~4.0|~5.0"
     },
 
     "autoload": {

diff --git a/testapp/app/config/config.yml b/testapp/app/config/config.yml
@@ -6,11 +6,10 @@ framework:
     form: true
     validation:      { enable_annotations: true }
     default_locale:  en
-    trusted_proxies: ~
     session:         ~
 
 parameters:
     custom_app: 'behat-test-app'
     collection_param:
         - 'Param 1'
-        - 'Param 2'
+        - 'Param 2'
diff --git a/testapp/behat.yml b/testapp/behat.yml
@@ -24,7 +24,6 @@ default:
                     session:   '@session'
                     services:
                       - '@session'
-                      - '@session.storage.filesystem'
                     params:
                       - "%%kernel.root_dir%%"
                       - "%%kernel.environment%%"