Merge branch '4.4' into 4.5

Author: whatthejeff

.travis.yml

@@ -14,9 +14,13 @@ matrix:
     - php: hhvm
     - php: hhvm-nightly
 
+sudo: false
+
+before_install:
+  - composer self-update
+
 install:
   - travis_retry composer install --no-interaction --prefer-source
-  - if [[ "$TRAVIS_PHP_VERSION" == hhvm* ]]; then echo -e '\nhhvm.libxml.ext_entity_whitelist = "file"' | sudo tee -a /etc/hhvm/php.ini; fi
 
 script:
   - ./phpunit

tests/Regression/GitHub/1340.phpt

@@ -4,8 +4,10 @@ GH-1340: Process isolation blocks infinitely upon fatal error
 <?php
 
 $_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][3] = 'Issue1340Test';
-$_SERVER['argv'][4] = dirname(__FILE__).'/1340/Issue1340Test.php';
+$_SERVER['argv'][2] = '-d';
+$_SERVER['argv'][3] = 'error_log=';
+$_SERVER['argv'][4] = 'Issue1340Test';
+$_SERVER['argv'][5] = dirname(__FILE__).'/1340/Issue1340Test.php';
 
 require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();

tests/Regression/GitHub/1340/Issue1340Test.php

@@ -18,7 +18,7 @@ public function testLargeStderrOutputDoesNotBlock()
         // STDERR of a phpt test is not caught/validated at this point, so this
         // error output does not cause this test to fail.
         // @see https://github.com/sebastianbergmann/phpunit/issues/1169
-        error_log("\n" . __FUNCTION__ . ": stderr:" . self::get4KB() . "\n", 4);
+        error_log("\n" . __FUNCTION__ . ": stderr:" . self::get4KB() . "\n");
         $this->assertTrue(true);
     }
 
@@ -27,7 +27,7 @@ public function testLargeStderrOutputDoesNotBlock()
      */
     public function testLargeStderrOutputDoesNotBlockInIsolation()
     {
-        error_log("\n" . __FUNCTION__ . ": stderr:" . self::get4KB() . "\n", 4);
+        error_log("\n" . __FUNCTION__ . ": stderr:" . self::get4KB() . "\n");
         $this->assertTrue(true);
     }
 
@@ -65,6 +65,6 @@ public function testFatalErrorDoesNotPass()
     public static function onShutdown()
     {
         echo "\nshutdown: stdout:", self::get4KB(), "\n";
-        error_log("\nshutdown: stderr:" . self::get4KB(), 4);
+        error_log("\nshutdown: stderr:" . self::get4KB());
     }
 }

tests/Regression/GitHub/1472.phpt

@@ -1,5 +1,12 @@
 --TEST--
 GH-1472: assertEqualXMLStructure modifies the tested elements
+--SKIPIF--
+<?php
+// See: https://github.com/facebook/hhvm/issues/4669
+if (defined('HHVM_VERSION')) {
+    print 'skip: HHVM does not support cloning DOM nodes';
+}
+?>
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';