Merge branch '2.3' into 2.7

nicolas-grekas · nicolas-grekas · commit 6f1d50682410 · 2015-11-09T17:22:45.000+01:00
* 2.3:
  [ci] Tmp force phpunit/phpunit-mock-objects &lt;= 3.0.0
diff --git a/phpunit b/phpunit
@@ -49,6 +49,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
     $zip->close();
     chdir("phpunit-$PHPUNIT_VERSION");
     passthru("$COMPOSER remove --no-update symfony/yaml");
+    passthru("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"<=3.0.0\"");
     passthru("$COMPOSER require --dev --no-update symfony/phpunit-bridge \">=2.8@dev\"");
     passthru("$COMPOSER install --prefer-source --no-progress --ansi");
     file_put_contents('phpunit', <<<EOPHP
