From 5a3ebd5ea639aaee0326762de480e0d91d7ed3e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Sun, 17 Mar 2013 19:54:55 +0100 Subject: [PATCH] MDL-38364 rework PHPUnit autoloading This is related to BC incompatibility introduced in https://github.com/sebastianbergmann/phpunit/issues/848 --- admin/tool/phpunit/cli/util.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/admin/tool/phpunit/cli/util.php b/admin/tool/phpunit/cli/util.php index 5cfd1285690..efd1bc76e50 100644 --- a/admin/tool/phpunit/cli/util.php +++ b/admin/tool/phpunit/cli/util.php @@ -47,14 +47,16 @@ list($options, $unrecognized) = cli_get_params( ) ); -if (file_exists(__DIR__.'/../../../../vendor/autoload.php')) { +if (file_exists(__DIR__.'/../../../../vendor/phpunit/phpunit/PHPUnit/autoload.php')) { // Composer packages present. require_once(__DIR__.'/../../../../vendor/autoload.php'); -} + require_once(__DIR__.'/../../../../vendor/phpunit/phpunit/PHPUnit/autoload.php'); -// Verify PHPUnit libs can be loaded. -if (!include_once('PHPUnit/Autoload.php')) { - phpunit_bootstrap_error(PHPUNIT_EXITCODE_PHPUNITMISSING); +} else { + // Verify PHPUnit PEAR libs can be loaded. + if (!include('PHPUnit/Autoload.php')) { + phpunit_bootstrap_error(PHPUNIT_EXITCODE_PHPUNITMISSING); + } } if ($options['run']) {