Merge branch '2.7' into 2.8

fabpot · fabpot · commit b938a7f1fcf2 · 2015-10-01T10:37:26.000+02:00
* 2.7:
  Use PHPUnit 5.0 for PHP 7
  [DomCrawler] always pass base href to subcrawlers
diff --git a/phpunit b/phpunit
@@ -3,9 +3,14 @@
 
 error_reporting(-1);
 
-$PHPUNIT_VERSION = 4.8;
+$PHPUNIT_VERSION = '4.8';
 $PHPUNIT_DIR = __DIR__.'/.phpunit';
 
+// PHPUnit 4.8 does not support PHP 7, while 5.0 requires PHP 5.6+
+if (PHP_VERSION_ID >= 70000) {
+    $PHPUNIT_DIR = '5.0';
+}
+
 if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit")) {
     // Build a standalone phpunit without symfony/yaml
 
