Merge pull request #1965 from alchemy-fr/fix/lock-file

Allow PHP7 build failures

.travis.yml

@@ -8,6 +8,11 @@ branches:
 
 matrix:
   fast_finish: true
+  allow_failures:
+    - php: 7.0
+      env: TEST_SUITE=1
+    - php: 7.0
+      env: TEST_SUITE=2
   include:
     - php: 5.5
       env: TEST_SUITE=1

composer.json

@@ -104,7 +104,7 @@
   },
   "require-dev": {
     "mikey179/vfsStream": "~1.5",
-    "phpunit/phpunit": "^4.8"
+    "phpunit/phpunit": "^4.8|^5.0"
   },
   "autoload": {
     "psr-0": {

composer.lock

@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "b82a456319acd0d8040fe5b5740aca24",
+    "hash": "e87832949ae7b20d258aceb271577c5c",
-    "content-hash": "1f4db68cd1db2bb7484310add4bc208a",
+    "content-hash": "35f87700aa4cbe3c2903fe166676cc74",
     "packages": [
         {
             "name": "alchemy-fr/tcpdf-clone",