Merge pull request #196 from allejo/v1.x-php-53-74-testing

Backport 7.4 support to 1.6.x branch Co-authored-by: Boris Momčilović <boris@firstbeatmedia.com>
bovigo · Jul 30, 2019 · b4dd949 · b4dd949
2 parents 095238a + bc0019b
commit b4dd949
Show file tree

Hide file tree

Showing 43 changed files with 131 additions and 1,043 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,17 +2,25 @@ sudo: false
 language: php
 
 php:
+  - 7.4snapshot
+  - 7.3
+  - 7.2
   - 7.1
   - 7.0
   - 5.6
-  - 5.4
-  - 5.5
 
 matrix:
   fast_finish: true
   include:
+    - php: 5.5
+      dist: precise
+    - php: 5.4
+      dist: precise
     - php: 5.3
       dist: precise
+  allow_failures:
+    - php: nightly
+    - php: 7.4snapshot
 
 install:
   - composer install

diff --git a/appveyor.yml b/appveyor.yml
@@ -3,7 +3,6 @@ shallow_clone: true
 
 cache:
   - .\php -> appveyor.yml
-  - vendor -> composer.lock
 
 init:
   - set PATH=%PATH%;.\php

diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         "php": ">=5.3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.5"
+        "phpunit/phpunit": "^4.5|^5.0"
     },
     "autoload": {
         "psr-0": { "org\\bovigo\\vfs\\": "src/main/php" }