Merge pull request #3489 from stof/patch-1

Skip the phar building on HHVM

.travis.yml

@@ -8,10 +8,6 @@ php:
   - 5.6
   - hhvm
 
-matrix:
-  allow_failures:
-    - php: hhvm
-
 before_script:
     - sudo apt-get install parallel
     - rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini

tests/Composer/Test/AllFunctionalTest.php

@@ -60,6 +60,10 @@ class AllFunctionalTest extends \PHPUnit_Framework_TestCase
 
     public function testBuildPhar()
     {
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('Building the phar does not work on HHVM.');
+        }
+        
         $fs = new Filesystem;
         $fs->removeDirectory(dirname(self::$pharPath));
         $fs->ensureDirectoryExists(dirname(self::$pharPath));