Merge branch 'w13_MDL-44510_m27_phpunit4' of https://github.com/skoda…

…k/moodle
moodle · Mar 25, 2014 · c56e019 · c56e019
2 parents 66113ef + 9e00d46
commit c56e019
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/admin/tool/phpunit/cli/util.php b/admin/tool/phpunit/cli/util.php
@@ -50,16 +50,13 @@
     )
 );
 
-if (file_exists(__DIR__.'/../../../../vendor/phpunit/phpunit/PHPUnit/Autoload.php')) {
+if (file_exists(__DIR__.'/../../../../vendor/phpunit/phpunit/composer.json')) {
     // Composer packages present.
     require_once(__DIR__.'/../../../../vendor/autoload.php');
-    require_once(__DIR__.'/../../../../vendor/phpunit/phpunit/PHPUnit/Autoload.php');
 
 } else {
-    // Verify PHPUnit PEAR libs can be loaded.
-    if (!include('PHPUnit/Autoload.php')) {
-        phpunit_bootstrap_error(PHPUNIT_EXITCODE_PHPUNITMISSING);
-    }
+    // Note: installation via PEAR is not supported any more.
+    phpunit_bootstrap_error(PHPUNIT_EXITCODE_PHPUNITMISSING);
 }
 
 if ($options['install'] or $options['drop']) {

diff --git a/lib/phpunit/lib.php b/lib/phpunit/lib.php
@@ -25,9 +25,6 @@
 
 // NOTE: MOODLE_INTERNAL is not verified here because we load this before setup.php!
 
-require_once('PHPUnit/Autoload.php');
-require_once('PHPUnit/Extensions/Database/Autoload.php');
-
 require_once(__DIR__.'/classes/util.php');
 require_once(__DIR__.'/classes/event_mock.php');
 require_once(__DIR__.'/classes/event_sink.php');

diff --git a/lib/upgrade.txt b/lib/upgrade.txt
@@ -3,6 +3,7 @@ information provided here is intended especially for developers.
 
 === 2.7 ===
 
+* PHPUnit cannot be installed via PEAR any more, please use composer package manager instead.
 * $core_renderer->block_move_target() changed to support more verbose move-block-here descriptions.
 
 Events and Logging: