tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Renamed PHPUnit wrappers not to use underscores in classnames, as this confuses ManifestBuilder prior to the 2.4 release

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@111836 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-10-08 23:04:37 +00:00 committed by Sam Minnee
parent 1176bab306
commit 9994a9c948
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dev/phpunit/PhpUnitWrapper.php
View File

@ -136,13 +136,12 @@ class PhpUnitWrapper implements IPhpUnitWrapper {
* @return PhpUnitWrapper Instance of the php-wrapper class
*/
static function inst() {
if (self::$phpunit_wrapper == null) {
if (fileExistsInIncludePath("/PHPUnit/Autoload.php")) {
self::$phpunit_wrapper = new PhpUnitWrapper_3_5();
self::$phpunit_wrapper = new PhpUnitWrapper35();
} else
if (fileExistsInIncludePath("/PHPUnit/Framework.php")) {
self::$phpunit_wrapper = new PhpUnitWrapper_3_4();
self::$phpunit_wrapper = new PhpUnitWrapper34();
} else {
self::$phpunit_wrapper = new PhpUnitWrapper();
}

2
dev/phpunit/PhpUnitWrapper_3_4.php → dev/phpunit/PhpUnitWrapper34.php
View File

@ -7,7 +7,7 @@
/**
* PHPUnit Wrapper class. Implements the correct behaviour for PHPUnit V3.4.
*/
class PhpUnitWrapper_3_4 extends PhpUnitWrapper {
class PhpUnitWrapper34 extends PhpUnitWrapper {
protected $version = 'PhpUnit V3.4';

2
dev/phpunit/PhpUnitWrapper_3_5.php → dev/phpunit/PhpUnitWrapper35.php
View File

@ -4,7 +4,7 @@
* @subpackage dev
*/
class PhpUnitWrapper_3_5 extends PhpUnitWrapper {
class PhpUnitWrapper35 extends PhpUnitWrapper {
protected $version = 'PhpUnit V3.5';