Merge pull request #1 from pamil/behat.yml

Add behat.yml.dist, ignore behat.yml
FriendsOfBehat · Jul 22, 2016 · eb0163e · eb0163e
2 parents f1e6ff7 + c37d7d6
commit eb0163e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 /vendor
 
-/behat.yml.dist
+/behat.yml
 /composer.lock
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ language: php
 php:
     - 7.0
     - 5.6
-    - hhvm
 
 env:
     global:

diff --git a/behat.yml.dist b/behat.yml.dist
@@ -0,0 +1,3 @@
+default:
+    extensions:
+        FriendsOfBehat\PerformanceExtension: ~
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     "require": {
         "php": "^5.6|^7.0",
 
-        "behat/behat": "^3.0"
+        "behat/behat": "^3.1"
     },
     "autoload": {
         "psr-4": { "FriendsOfBehat\\PerformanceExtension\\": "src/" }
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ language: php @@
     php:
         - 7.0
         - 5.6
-        - hhvm
     env:
         global:
@@ Expand Down @@