Merge branch 'hotfix/1.0.1'

iiifx-production · May 13, 2016 · 64cebdc · 64cebdc
2 parents d71e32d + 0a3c45f
commit 64cebdc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ php:
 
 install:
   - composer self-update
-  - composer install --no-interaction
+  - composer install --no-interaction --prefer-dist
 
 script:
   - composer test

diff --git a/tests/LazyInitHelperTest.php b/tests/LazyInitHelperTest.php
@@ -26,8 +26,10 @@ public function testBacktraceDataException ()
 
     public function testDependencyKey ()
     {
-        $this->setExpectedException( 'PHPUnit_Framework_Error' );
-        FailLazyInitHelper::createDependencyKey( '' );
+        if ( version_compare( PHP_VERSION, '5.6', '<=' ) ) {
+            $this->setExpectedException( 'PHPUnit_Framework_Error' );
+            FailLazyInitHelper::createDependencyKey( '' );
+        }
     }
 
     public function testInitClosure ()