From: =?utf-8?q?David_Pr=C3=A9vot?= Date: Thu, 14 Feb 2019 16:34:01 -1000 Subject: Update for recent version of PHPUnit Bug-Debian: https://bugs.debian.org/882917 Bug-Debian: https://bugs.debian.org/917744 Forwarded: https://github.com/zetacomponents/Base/pull/9 Applied-Upstream: https://github.com/zetacomponents/Base/commit/68004df22086b802c6f8f595b47df475e1cc2d07 --- tests/base_init_test.php | 2 +- tests/base_options_test.php | 2 +- tests/base_test.php | 4 ++-- tests/features_unix_test.php | 2 +- tests/features_windows_test.php | 2 +- tests/file_calculate_relative_path_test.php | 2 +- tests/file_copy_recursive_test.php | 2 +- tests/file_find_recursive_test.php | 2 +- tests/file_is_absolute_path.php | 2 +- tests/file_remove_recursive_test.php | 2 +- tests/metadata_pear_test.php | 2 +- tests/struct_test.php | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/base_init_test.php b/tests/base_init_test.php index c6c8c2d..4de8ada 100644 --- a/tests/base_init_test.php +++ b/tests/base_init_test.php @@ -92,7 +92,7 @@ class ezcBaseInitTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite("ezcBaseInitTest"); + return new PHPUnit\Framework\TestSuite("ezcBaseInitTest"); } } ?> diff --git a/tests/base_options_test.php b/tests/base_options_test.php index eee7815..823307e 100644 --- a/tests/base_options_test.php +++ b/tests/base_options_test.php @@ -34,7 +34,7 @@ class ezcBaseOptionsTest extends ezcTestCase { public static function suite() { - return new PHPUnit_Framework_TestSuite("ezcBaseOptionsTest"); + return new PHPUnit\Framework\TestSuite("ezcBaseOptionsTest"); } public function testGetAccessFailure() diff --git a/tests/base_test.php b/tests/base_test.php index ce410bb..0d39f9f 100644 --- a/tests/base_test.php +++ b/tests/base_test.php @@ -449,7 +449,7 @@ class ezcBaseTest extends ezcTestCase public function testInvalidClass() { - $this->setExpectedException( 'ezcBaseAutoloadException', "Could not find a class to file mapping for 'ezcNoSuchClass'. Searched for no_such_autoload.php, no_autoload.php, autoload.php in:" ); + $this->expectException( 'ezcBaseAutoloadException', "Could not find a class to file mapping for 'ezcNoSuchClass'. Searched for no_such_autoload.php, no_autoload.php, autoload.php in:" ); self::assertEquals( false, class_exists( 'ezcNoSuchClass', true ) ); } @@ -539,7 +539,7 @@ class ezcBaseTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite("ezcBaseTest"); + return new PHPUnit\Framework\TestSuite("ezcBaseTest"); } } ?> diff --git a/tests/features_unix_test.php b/tests/features_unix_test.php index 7ff0372..4576007 100644 --- a/tests/features_unix_test.php +++ b/tests/features_unix_test.php @@ -156,7 +156,7 @@ class ezcBaseFeaturesUnixTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite(__CLASS__); + return new PHPUnit\Framework\TestSuite(__CLASS__); } } ?> diff --git a/tests/features_windows_test.php b/tests/features_windows_test.php index 386b3b6..f2f4060 100644 --- a/tests/features_windows_test.php +++ b/tests/features_windows_test.php @@ -156,7 +156,7 @@ class ezcBaseFeaturesWindowsTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( __CLASS__ ); + return new PHPUnit\Framework\TestSuite( __CLASS__ ); } } ?> diff --git a/tests/file_calculate_relative_path_test.php b/tests/file_calculate_relative_path_test.php index 45fa738..e24ad16 100644 --- a/tests/file_calculate_relative_path_test.php +++ b/tests/file_calculate_relative_path_test.php @@ -103,7 +103,7 @@ class ezcBaseFileCalculateRelativePathTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcBaseFileCalculateRelativePathTest" ); + return new PHPUnit\Framework\TestSuite( "ezcBaseFileCalculateRelativePathTest" ); } } ?> diff --git a/tests/file_copy_recursive_test.php b/tests/file_copy_recursive_test.php index 7d4712d..996d45b 100644 --- a/tests/file_copy_recursive_test.php +++ b/tests/file_copy_recursive_test.php @@ -247,7 +247,7 @@ class ezcBaseFileCopyRecursiveTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( __CLASS__ ); + return new PHPUnit\Framework\TestSuite( __CLASS__ ); } public function testRecursiveCopyDirCalled0() diff --git a/tests/file_find_recursive_test.php b/tests/file_find_recursive_test.php index 3e6e5fe..1286454 100644 --- a/tests/file_find_recursive_test.php +++ b/tests/file_find_recursive_test.php @@ -157,7 +157,7 @@ class ezcBaseFileFindRecursiveTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcBaseFileFindRecursiveTest" ); + return new PHPUnit\Framework\TestSuite( "ezcBaseFileFindRecursiveTest" ); } } ?> diff --git a/tests/file_is_absolute_path.php b/tests/file_is_absolute_path.php index bdcfd64..f6ebb21 100644 --- a/tests/file_is_absolute_path.php +++ b/tests/file_is_absolute_path.php @@ -241,7 +241,7 @@ class ezcBaseFileIsAbsoluteTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcBaseFileIsAbsoluteTest" ); + return new PHPUnit\Framework\TestSuite( "ezcBaseFileIsAbsoluteTest" ); } } ?> diff --git a/tests/file_remove_recursive_test.php b/tests/file_remove_recursive_test.php index 8bcd7b6..a18fdcb 100644 --- a/tests/file_remove_recursive_test.php +++ b/tests/file_remove_recursive_test.php @@ -168,7 +168,7 @@ class ezcBaseFileRemoveRecursiveTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcBaseFileRemoveRecursiveTest" ); + return new PHPUnit\Framework\TestSuite( "ezcBaseFileRemoveRecursiveTest" ); } } ?> diff --git a/tests/metadata_pear_test.php b/tests/metadata_pear_test.php index 86a5dae..ad8ed7d 100644 --- a/tests/metadata_pear_test.php +++ b/tests/metadata_pear_test.php @@ -92,7 +92,7 @@ class ezcBaseMetaDataPearTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( 'ezcBaseMetaDataPearTest' ); + return new PHPUnit\Framework\TestSuite( 'ezcBaseMetaDataPearTest' ); } } ?> diff --git a/tests/struct_test.php b/tests/struct_test.php index 06d99b1..18bf193 100644 --- a/tests/struct_test.php +++ b/tests/struct_test.php @@ -64,7 +64,7 @@ class ezcBaseStructTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcBaseStructTest" ); + return new PHPUnit\Framework\TestSuite( "ezcBaseStructTest" ); } } ?>