- Do not require PHPUnit 3.5.
git-svn-id: https://svn.apache.org/repos/asf/incubator/zetacomponents/trunk@987381 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/UnitTest/src/bootstrap.php b/UnitTest/src/bootstrap.php
index 1501696..780ec38 100644
--- a/UnitTest/src/bootstrap.php
+++ b/UnitTest/src/bootstrap.php
@@ -23,11 +23,13 @@
* @version //autogentag//
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
*/
-PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' );
+require_once 'PHPUnit/Util/Filter.php';
+
+PHPUnit_Util_Filter::addFileToFilter( __FILE__, 'PHPUNIT' );
// All errors must be reported
$currentErrorLevel = error_reporting();
-if ( ! ( $currentErrorLevel == -1 || $currentErrorLevel == ( E_ALL | E_STRICT ) ) )
+if ( $currentErrorLevel != ( E_ALL | E_STRICT ) )
{
echo "Your error reporting setting is not E_ALL | E_STRICT, please change\nthis in your php.ini.\n";
die();
@@ -37,7 +39,7 @@
require_once 'Base/src/base.php';
-function ezc_autoload( $className )
+function __autoload( $className )
{
if ( strpos( $className, '_' ) !== false )
{
@@ -47,6 +49,4 @@
}
ezcBase::autoload( $className );
}
-
-spl_autoload_register( 'ezc_autoload' );
?>
diff --git a/UnitTest/src/constraint/image.php b/UnitTest/src/constraint/image.php
index 5cfec0e..a2cb1ef 100644
--- a/UnitTest/src/constraint/image.php
+++ b/UnitTest/src/constraint/image.php
@@ -23,7 +23,10 @@
* @version //autogentag//
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
*/
-PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' );
+
+require_once 'PHPUnit/Util/Filter.php';
+
+PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
/**
* Constraint class for image comparison.
diff --git a/UnitTest/src/runtests.php b/UnitTest/src/runtests.php
index f238c3b..51579f1 100755
--- a/UnitTest/src/runtests.php
+++ b/UnitTest/src/runtests.php
@@ -24,17 +24,18 @@
* @version //autogentag//
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
*/
-require_once 'PHPUnit/Autoload.php';
+
+require_once 'PHPUnit/Runner/Version.php';
+require_once 'PHPUnit/Util/Filter.php';
$version = PHPUnit_Runner_Version::id();
-if ( version_compare( $version, '3.5.0' ) == -1 && $version !== '@package_version@' )
+if ( version_compare( $version, '3.4.0' ) == -1 && $version !== '@package_version@' )
{
- die( "PHPUnit 3.5.0 (or later) is required to run this test suite.\n" );
+ die( "PHPUnit 3.4.0 (or later) is required to run this test suite.\n" );
}
-require_once 'PHP/CodeCoverage.php';
-PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' );
+PHPUnit_Util_Filter::addFileToFilter( __FILE__, 'PHPUNIT' );
require_once 'bootstrap.php';
diff --git a/UnitTest/src/test/case.php b/UnitTest/src/test/case.php
index f445b82..c3ceeb3 100644
--- a/UnitTest/src/test/case.php
+++ b/UnitTest/src/test/case.php
@@ -23,7 +23,10 @@
* @version //autogentag//
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
*/
-PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' );
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Util/Filter.php';
+
+PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
/**
* Abstract base class for all Zeta Components test cases.
diff --git a/UnitTest/src/test/database_settings.php b/UnitTest/src/test/database_settings.php
index f0e1931..966bcbb 100644
--- a/UnitTest/src/test/database_settings.php
+++ b/UnitTest/src/test/database_settings.php
@@ -23,7 +23,10 @@
* @version //autogentag//
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
*/
-PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' );
+
+require_once 'PHPUnit/Util/Filter.php';
+
+PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
/**
* This class represents the structure of all the database settings.
diff --git a/UnitTest/src/test/image_case.php b/UnitTest/src/test/image_case.php
index 7083ec9..6983021 100644
--- a/UnitTest/src/test/image_case.php
+++ b/UnitTest/src/test/image_case.php
@@ -23,7 +23,10 @@
* @version //autogentag//
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
*/
-PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' );
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Util/Filter.php';
+
+PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
/**
* Abstract base class for image related test cases.
diff --git a/UnitTest/src/test/printer.php b/UnitTest/src/test/printer.php
index 6749ddb..463e488 100644
--- a/UnitTest/src/test/printer.php
+++ b/UnitTest/src/test/printer.php
@@ -23,7 +23,10 @@
* @version //autogentag//
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
*/
-PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' );
+require_once 'PHPUnit/TextUI/ResultPrinter.php';
+require_once 'PHPUnit/Util/Filter.php';
+
+PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
/**
* Test printer class.
diff --git a/UnitTest/src/test/runner.php b/UnitTest/src/test/runner.php
index b680d00..6212a68 100644
--- a/UnitTest/src/test/runner.php
+++ b/UnitTest/src/test/runner.php
@@ -23,7 +23,12 @@
* @version //autogentag//
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
*/
-PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' );
+
+require_once 'PHPUnit/TextUI/Command.php';
+require_once 'PHPUnit/Util/Class.php';
+require_once 'PHPUnit/Util/Filter.php';
+
+PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
/**
* Test runner to run the Zeta Components test suite(s).
diff --git a/UnitTest/src/test/settings.php b/UnitTest/src/test/settings.php
index 0748251..4fe8184 100644
--- a/UnitTest/src/test/settings.php
+++ b/UnitTest/src/test/settings.php
@@ -23,7 +23,10 @@
* @version //autogentag//
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
*/
-PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' );
+
+require_once 'PHPUnit/Util/Filter.php';
+
+PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
/**
* This object stores the settings from the TestRunner.
