Merge pull request #76 from alexander-schranz/bugfix/travis-ci

Fix travis ci runner
goodby · Feb 11, 2018 · e52b8cf · e52b8cf
2 parents e71217b + ea64bd8
commit e52b8cf
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,23 @@
 language: php
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
+
+matrix:
+    include:
+      - php: 5.3
+        dist: precise
+      - php: 5.4
+        dist: trusty
+      - php: 5.5
+        dist: trusty
+      - php: 5.6
+        dist: trusty
+      - php: 7.0
+        dist: trusty
+      - php: 7.1
+        dist: trusty
+# PHP 7.2 can currently not been tested because of incompatibility with PHPUnit 3
+# atleast PHPUnit 7.0 would be needed which don't support 5.3
+#      - php: 7.2
+#        dist: trusty
 
 before_script:
   - ./scripts/bundle-devtools.sh .

diff --git a/composer.json b/composer.json
@@ -24,9 +24,9 @@
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
-        "mockery/mockery": ">=0.7.2",
-        "suin/php-expose": ">=1.0",
-        "mikey179/vfsStream": ">=1.1.0"
+        "mockery/mockery": "^0.7.2",
+        "suin/php-expose": "^1.0",
+        "mikey179/vfsStream": "^1.1"
     },
     "autoload": {
         "psr-0": {

diff --git a/scripts/bundle-devtools.sh b/scripts/bundle-devtools.sh
@@ -33,4 +33,4 @@ wget http://getcomposer.org/composer.phar
 
 chmod +x composer.phar
 
-./composer.phar install --dev
+./composer.phar install
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,4 +33,4 @@ wget http://getcomposer.org/composer.phar

		chmod +x composer.phar

		./composer.phar install --dev
		./composer.phar install