Merge 8af0ae0 into 3ec465f

minkphp · Dec 12, 2017 · f0cd090 · f0cd090
2 parents 3ec465f + 8af0ae0
commit f0cd090
Show file tree

Hide file tree

Showing 42 changed files with 1,004 additions and 536 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,12 +7,9 @@ cache:
         - $HOME/.composer/cache/files
 
 php:
-    - 5.4
-    - 5.5
-    - 5.6
     - 7.0
     - 7.1
-    - hhvm
+    - 7.2
 
 matrix:
     include:
@@ -25,10 +22,6 @@ matrix:
           before_script: []
           script: sphinx-build -nW -b html -d docs/build/doctrees docs docs/build/html
           after_script: []
-        - php: 5.3
-          dist: precise
-    allow_failures:
-        - php: 7.1
 
 env:
     global:

diff --git a/composer.json b/composer.json
@@ -13,16 +13,16 @@
 	],
 
 	"require": {
-		"php": ">=5.3.2",
+		"php": ">=7.0",
 		"behat/mink": "~1.6@dev",
 		"behat/mink-selenium2-driver": "~1.2",
 		"symfony/event-dispatcher": "~2.4|~3.0",
-		"phpunit/phpunit": ">=4.8.35 <5|>=5.4.3 <6"
+		"phpunit/phpunit": "~6.1"
 	},
 
 	"require-dev": {
 		"aik099/coding-standard": "dev-master",
-		"mockery/mockery": "~0.9"
+		"mockery/mockery": "^1.0"
 	},
 
 	"autoload": {