- Require PHPUnit 3.5.
git-svn-id: https://svn.apache.org/repos/asf/incubator/zetacomponents/trunk@1003528 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/Document/tests/odt/suite.php b/Document/tests/odt/suite.php
index 92e7081..9108df6 100644
--- a/Document/tests/odt/suite.php
+++ b/Document/tests/odt/suite.php
@@ -45,7 +45,7 @@
/**
* This file is not in use, yet, therefore not tested.
*/
-PHPUnit_Util_Filter::addFileToFilter(
+PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist(
dirname( __FILE__ ) . '/../../src/document/xml/odt/filter/element/html_table.php'
);
diff --git a/UnitTest/src/bootstrap.php b/UnitTest/src/bootstrap.php
index 780ec38..1501696 100644
--- a/UnitTest/src/bootstrap.php
+++ b/UnitTest/src/bootstrap.php
@@ -23,13 +23,11 @@
* @version //autogentag//
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
*/
-require_once 'PHPUnit/Util/Filter.php';
-
-PHPUnit_Util_Filter::addFileToFilter( __FILE__, 'PHPUNIT' );
+PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' );
// All errors must be reported
$currentErrorLevel = error_reporting();
-if ( $currentErrorLevel != ( E_ALL | E_STRICT ) )
+if ( ! ( $currentErrorLevel == -1 || $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();
@@ -39,7 +37,7 @@
require_once 'Base/src/base.php';
-function __autoload( $className )
+function ezc_autoload( $className )
{
if ( strpos( $className, '_' ) !== false )
{
@@ -49,4 +47,6 @@
}
ezcBase::autoload( $className );
}
+
+spl_autoload_register( 'ezc_autoload' );
?>
diff --git a/UnitTest/src/constraint/image.php b/UnitTest/src/constraint/image.php
index a2cb1ef..5cfec0e 100644
--- a/UnitTest/src/constraint/image.php
+++ b/UnitTest/src/constraint/image.php
@@ -23,10 +23,7 @@
* @version //autogentag//
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
*/
-
-require_once 'PHPUnit/Util/Filter.php';
-
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
+PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' );
/**
* Constraint class for image comparison.
diff --git a/UnitTest/src/runtests.php b/UnitTest/src/runtests.php
index 51579f1..f238c3b 100755
--- a/UnitTest/src/runtests.php
+++ b/UnitTest/src/runtests.php
@@ -24,18 +24,17 @@
* @version //autogentag//
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
*/
-
-require_once 'PHPUnit/Runner/Version.php';
-require_once 'PHPUnit/Util/Filter.php';
+require_once 'PHPUnit/Autoload.php';
$version = PHPUnit_Runner_Version::id();
-if ( version_compare( $version, '3.4.0' ) == -1 && $version !== '@package_version@' )
+if ( version_compare( $version, '3.5.0' ) == -1 && $version !== '@package_version@' )
{
- die( "PHPUnit 3.4.0 (or later) is required to run this test suite.\n" );
+ die( "PHPUnit 3.5.0 (or later) is required to run this test suite.\n" );
}
-PHPUnit_Util_Filter::addFileToFilter( __FILE__, 'PHPUNIT' );
+require_once 'PHP/CodeCoverage.php';
+PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' );
require_once 'bootstrap.php';
diff --git a/UnitTest/src/test/case.php b/UnitTest/src/test/case.php
index c3ceeb3..f445b82 100644
--- a/UnitTest/src/test/case.php
+++ b/UnitTest/src/test/case.php
@@ -23,10 +23,7 @@
* @version //autogentag//
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
*/
-require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'PHPUnit/Util/Filter.php';
-
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
+PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __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 966bcbb..f0e1931 100644
--- a/UnitTest/src/test/database_settings.php
+++ b/UnitTest/src/test/database_settings.php
@@ -23,10 +23,7 @@
* @version //autogentag//
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
*/
-
-require_once 'PHPUnit/Util/Filter.php';
-
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
+PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __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 6983021..7083ec9 100644
--- a/UnitTest/src/test/image_case.php
+++ b/UnitTest/src/test/image_case.php
@@ -23,10 +23,7 @@
* @version //autogentag//
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
*/
-require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'PHPUnit/Util/Filter.php';
-
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
+PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __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 463e488..6749ddb 100644
--- a/UnitTest/src/test/printer.php
+++ b/UnitTest/src/test/printer.php
@@ -23,10 +23,7 @@
* @version //autogentag//
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
*/
-require_once 'PHPUnit/TextUI/ResultPrinter.php';
-require_once 'PHPUnit/Util/Filter.php';
-
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
+PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' );
/**
* Test printer class.
diff --git a/UnitTest/src/test/runner.php b/UnitTest/src/test/runner.php
index 6212a68..b680d00 100644
--- a/UnitTest/src/test/runner.php
+++ b/UnitTest/src/test/runner.php
@@ -23,12 +23,7 @@
* @version //autogentag//
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
*/
-
-require_once 'PHPUnit/TextUI/Command.php';
-require_once 'PHPUnit/Util/Class.php';
-require_once 'PHPUnit/Util/Filter.php';
-
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
+PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __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 4fe8184..0748251 100644
--- a/UnitTest/src/test/settings.php
+++ b/UnitTest/src/test/settings.php
@@ -23,10 +23,7 @@
* @version //autogentag//
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
*/
-
-require_once 'PHPUnit/Util/Filter.php';
-
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
+PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' );
/**
* This object stores the settings from the TestRunner.
