Merge branch '4.0' into 4.1

Author: sebastianbergmann

src/Util/PHP/Template/TestCaseMethod.tpl.dist

@@ -6,15 +6,15 @@ set_include_path('{include_path}');
 $composerAutoload = {composerAutoload};
 $phar             = {phar};
 
+ob_start();
+
 if ($composerAutoload) {
     require_once $composerAutoload;
     define('PHPUNIT_COMPOSER_INSTALL', $composerAutoload);
 } else if ($phar) {
     require $phar;
 }
 
-ob_start();
-
 function __phpunit_run_isolated_test()
 {
     if (!class_exists('{className}')) {