From 2d0fe7a4aa347350ba1211bf1727c62eeb08165a Mon Sep 17 00:00:00 2001 From: AntonyThorpe Date: Mon, 8 Sep 2014 17:46:09 +1200 Subject: [PATCH] Update PhpUnitWrapper.php & TestRunner.php to recommend PHPUnit installation via Composer rather than PEAR Using the PEAR Installer to install PHPUnit is no longer supported. See https://github.com/sebastianbergmann/phpunit/wiki/End-of-Life-for-PEAR-Installation-Method. Replace PEAR in a comment and die output message with Composer. Signed-off-by: AntonyThorpe --- dev/TestRunner.php | 2 +- dev/phpunit/PhpUnitWrapper.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/TestRunner.php b/dev/TestRunner.php index 8cd57b6fe..b2b81d787 100755 --- a/dev/TestRunner.php +++ b/dev/TestRunner.php @@ -112,7 +112,7 @@ class TestRunner extends Controller { if (!self::$default_reporter) self::set_reporter(Director::is_cli() ? 'CliDebugView' : 'DebugView'); if(!PhpUnitWrapper::has_php_unit()) { - die("Please install PHPUnit using pear"); + die("Please install PHPUnit using Composer"); } } diff --git a/dev/phpunit/PhpUnitWrapper.php b/dev/phpunit/PhpUnitWrapper.php index 3765d6478..9d4c3000b 100644 --- a/dev/phpunit/PhpUnitWrapper.php +++ b/dev/phpunit/PhpUnitWrapper.php @@ -260,7 +260,7 @@ class PhpUnitWrapper_Exception extends Exception {} // if(!PhpUnitWrapper::has_php_unit()) { /** - * PHPUnit is a testing framework that can be installed using PEAR. + * PHPUnit is a testing framework that can be installed using Composer. * It's not bundled with SilverStripe, you will need to install it yourself. * * @package framework