From: Prach Pongpanich Date: Tue, 22 May 2018 20:31:10 +0700 Subject: [PATCH] Fix FTBFS on recent phpunit --- Cache_Lite-1.8.2/tests/Cache_Lite_File_classical.phpt | 2 -- Cache_Lite-1.8.2/tests/Cache_Lite_Function_classical.phpt | 2 -- Cache_Lite-1.8.2/tests/Cache_Lite_Function_dontcache.phpt | 2 -- Cache_Lite-1.8.2/tests/Cache_Lite_Function_drop.phpt | 2 -- Cache_Lite-1.8.2/tests/Cache_Lite_Output_classical.phpt | 2 -- Cache_Lite-1.8.2/tests/Cache_Lite_automaticCleaning.phpt | 2 -- Cache_Lite-1.8.2/tests/Cache_Lite_classical.phpt | 2 -- Cache_Lite-1.8.2/tests/Cache_Lite_error.phpt | 2 -- Cache_Lite-1.8.2/tests/Cache_Lite_error2.phpt | 2 -- Cache_Lite-1.8.2/tests/Cache_Lite_eternal.phpt | 2 -- Cache_Lite-1.8.2/tests/Cache_Lite_fatest.phpt | 2 -- Cache_Lite-1.8.2/tests/Cache_Lite_hashed.phpt | 2 -- Cache_Lite-1.8.2/tests/Cache_Lite_lifetime.phpt | 2 -- Cache_Lite-1.8.2/tests/Cache_Lite_memorycache.phpt | 2 -- Cache_Lite-1.8.2/tests/Cache_Lite_serialization.phpt | 2 -- Cache_Lite-1.8.2/tests/ErrorDieTest.php | 2 +- Cache_Lite-1.8.2/tests/NestedOutputTest.php | 2 +- Cache_Lite-1.8.2/tests/pearbug18328.phpt | 2 -- Cache_Lite-1.8.2/tests/pearbug19422.phpt | 2 -- Cache_Lite-1.8.2/tests/pearbug19711.phpt | 2 -- Cache_Lite-1.8.2/tests/pearbug513.phpt | 2 -- 21 files changed, 2 insertions(+), 40 deletions(-) diff --git a/Cache_Lite-1.8.2/tests/Cache_Lite_File_classical.phpt b/Cache_Lite-1.8.2/tests/Cache_Lite_File_classical.phpt index a88439e..147aa37 100644 --- a/Cache_Lite-1.8.2/tests/Cache_Lite_File_classical.phpt +++ b/Cache_Lite-1.8.2/tests/Cache_Lite_File_classical.phpt @@ -34,8 +34,6 @@ sleep(1); multipleCallCache3_2('string'); ?> ---GET-- ---POST-- --EXPECT-- ==> First call (cache should be missed) Cache Missed ! diff --git a/Cache_Lite-1.8.2/tests/Cache_Lite_Function_classical.phpt b/Cache_Lite-1.8.2/tests/Cache_Lite_Function_classical.phpt index 435e9c9..8f4faf7 100644 --- a/Cache_Lite-1.8.2/tests/Cache_Lite_Function_classical.phpt +++ b/Cache_Lite-1.8.2/tests/Cache_Lite_Function_classical.phpt @@ -78,8 +78,6 @@ class test } ?> ---GET-- ---POST-- --EXPECT-- This is the output of the function function_to_bench(23, 66) ! This is the result of the function function_to_bench(23, 66) ! diff --git a/Cache_Lite-1.8.2/tests/Cache_Lite_Function_dontcache.phpt b/Cache_Lite-1.8.2/tests/Cache_Lite_Function_dontcache.phpt index dd2e2f5..32acc5b 100644 --- a/Cache_Lite-1.8.2/tests/Cache_Lite_Function_dontcache.phpt +++ b/Cache_Lite-1.8.2/tests/Cache_Lite_Function_dontcache.phpt @@ -95,8 +95,6 @@ function function_test2($arg1, $arg2) } ?> ---GET-- ---POST-- --EXPECT-- Cache missed ! This is the output of the function function_test(23, 66) ! diff --git a/Cache_Lite-1.8.2/tests/Cache_Lite_Function_drop.phpt b/Cache_Lite-1.8.2/tests/Cache_Lite_Function_drop.phpt index 1fecc3f..4a68069 100644 --- a/Cache_Lite-1.8.2/tests/Cache_Lite_Function_drop.phpt +++ b/Cache_Lite-1.8.2/tests/Cache_Lite_Function_drop.phpt @@ -35,8 +35,6 @@ function function_to_bench($arg1, $arg2) } ?> ---GET-- ---POST-- --EXPECT-- hello ! 100 diff --git a/Cache_Lite-1.8.2/tests/Cache_Lite_Output_classical.phpt b/Cache_Lite-1.8.2/tests/Cache_Lite_Output_classical.phpt index 4a7adb2..7ee2621 100644 --- a/Cache_Lite-1.8.2/tests/Cache_Lite_Output_classical.phpt +++ b/Cache_Lite-1.8.2/tests/Cache_Lite_Output_classical.phpt @@ -16,8 +16,6 @@ $Cache_Lite_Output = new Cache_Lite_Output($options); multipleCallCache2(); ?> ---GET-- ---POST-- --EXPECT-- ==> First call (cache should be missed) 0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789Cache Missed ! diff --git a/Cache_Lite-1.8.2/tests/Cache_Lite_automaticCleaning.phpt b/Cache_Lite-1.8.2/tests/Cache_Lite_automaticCleaning.phpt index 41855a9..f64a87d 100644 --- a/Cache_Lite-1.8.2/tests/Cache_Lite_automaticCleaning.phpt +++ b/Cache_Lite-1.8.2/tests/Cache_Lite_automaticCleaning.phpt @@ -39,8 +39,6 @@ $Cache_Lite->remove('31415926'); $Cache_Lite->remove('31415926bis'); ?> ---GET-- ---POST-- --EXPECT-- Cache Missed ! 0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 diff --git a/Cache_Lite-1.8.2/tests/Cache_Lite_classical.phpt b/Cache_Lite-1.8.2/tests/Cache_Lite_classical.phpt index 52521a0..7906633 100644 --- a/Cache_Lite-1.8.2/tests/Cache_Lite_classical.phpt +++ b/Cache_Lite-1.8.2/tests/Cache_Lite_classical.phpt @@ -16,8 +16,6 @@ $Cache_Lite = new Cache_Lite($options); multipleCallCache(); ?> ---GET-- ---POST-- --EXPECT-- ==> First call (cache should be missed) Cache Missed ! diff --git a/Cache_Lite-1.8.2/tests/Cache_Lite_error.phpt b/Cache_Lite-1.8.2/tests/Cache_Lite_error.phpt index 5b7a4ef..f721d24 100644 --- a/Cache_Lite-1.8.2/tests/Cache_Lite_error.phpt +++ b/Cache_Lite-1.8.2/tests/Cache_Lite_error.phpt @@ -17,8 +17,6 @@ $Cache_Lite = new Cache_Lite($options); multipleCallCache(); ?> ---GET-- ---POST-- --EXPECT-- ==> First call (cache should be missed) Cache Missed ! diff --git a/Cache_Lite-1.8.2/tests/Cache_Lite_error2.phpt b/Cache_Lite-1.8.2/tests/Cache_Lite_error2.phpt index bbce595..ce5fde0 100644 --- a/Cache_Lite-1.8.2/tests/Cache_Lite_error2.phpt +++ b/Cache_Lite-1.8.2/tests/Cache_Lite_error2.phpt @@ -19,8 +19,6 @@ $Cache_Lite = new Cache_Lite($options); multipleCallCache(); ?> ---GET-- ---POST-- --EXPECT-- ==> First call (cache should be missed) Cache Missed ! diff --git a/Cache_Lite-1.8.2/tests/Cache_Lite_eternal.phpt b/Cache_Lite-1.8.2/tests/Cache_Lite_eternal.phpt index 828a210..eee4973 100644 --- a/Cache_Lite-1.8.2/tests/Cache_Lite_eternal.phpt +++ b/Cache_Lite-1.8.2/tests/Cache_Lite_eternal.phpt @@ -16,8 +16,6 @@ $Cache_Lite = new Cache_Lite($options); multipleCallCache(); ?> ---GET-- ---POST-- --EXPECT-- ==> First call (cache should be missed) Cache Missed ! diff --git a/Cache_Lite-1.8.2/tests/Cache_Lite_fatest.phpt b/Cache_Lite-1.8.2/tests/Cache_Lite_fatest.phpt index 7eab50d..9b08a4d 100644 --- a/Cache_Lite-1.8.2/tests/Cache_Lite_fatest.phpt +++ b/Cache_Lite-1.8.2/tests/Cache_Lite_fatest.phpt @@ -20,8 +20,6 @@ $Cache_Lite = new Cache_Lite($options); multipleCallCache(); ?> ---GET-- ---POST-- --EXPECT-- ==> First call (cache should be missed) Cache Missed ! diff --git a/Cache_Lite-1.8.2/tests/Cache_Lite_hashed.phpt b/Cache_Lite-1.8.2/tests/Cache_Lite_hashed.phpt index e14693f..193c19b 100644 --- a/Cache_Lite-1.8.2/tests/Cache_Lite_hashed.phpt +++ b/Cache_Lite-1.8.2/tests/Cache_Lite_hashed.phpt @@ -61,8 +61,6 @@ function rm($fileglob) rm(tmpDir() . '/cache_*'); ?> ---GET-- ---POST-- --EXPECT-- ==> First call (cache should be missed) Cache Missed ! diff --git a/Cache_Lite-1.8.2/tests/Cache_Lite_lifetime.phpt b/Cache_Lite-1.8.2/tests/Cache_Lite_lifetime.phpt index 05ff788..db6e3a8 100644 --- a/Cache_Lite-1.8.2/tests/Cache_Lite_lifetime.phpt +++ b/Cache_Lite-1.8.2/tests/Cache_Lite_lifetime.phpt @@ -27,8 +27,6 @@ echo("\n"); $Cache_Lite->remove('31415926'); ?> ---GET-- ---POST-- --EXPECT-- Cache Missed ! 0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 diff --git a/Cache_Lite-1.8.2/tests/Cache_Lite_memorycache.phpt b/Cache_Lite-1.8.2/tests/Cache_Lite_memorycache.phpt index d472198..f9c7249 100644 --- a/Cache_Lite-1.8.2/tests/Cache_Lite_memorycache.phpt +++ b/Cache_Lite-1.8.2/tests/Cache_Lite_memorycache.phpt @@ -17,8 +17,6 @@ $Cache_Lite = new Cache_Lite($options); multipleCallCache(); ?> ---GET-- ---POST-- --EXPECT-- ==> First call (cache should be missed) Cache Missed ! diff --git a/Cache_Lite-1.8.2/tests/Cache_Lite_serialization.phpt b/Cache_Lite-1.8.2/tests/Cache_Lite_serialization.phpt index 7bc6290..d2e8ee7 100644 --- a/Cache_Lite-1.8.2/tests/Cache_Lite_serialization.phpt +++ b/Cache_Lite-1.8.2/tests/Cache_Lite_serialization.phpt @@ -17,8 +17,6 @@ $Cache_Lite = new Cache_Lite($options); multipleCallCache('array'); ?> ---GET-- ---POST-- --EXPECT-- ==> First call (cache should be missed) Cache Missed ! diff --git a/Cache_Lite-1.8.2/tests/ErrorDieTest.php b/Cache_Lite-1.8.2/tests/ErrorDieTest.php index d199a92..91346d4 100644 --- a/Cache_Lite-1.8.2/tests/ErrorDieTest.php +++ b/Cache_Lite-1.8.2/tests/ErrorDieTest.php @@ -11,7 +11,7 @@ require_once __DIR__ . '/tmpdir.inc'; -class ErrorDieTest extends PHPUnit_Framework_TestCase +class ErrorDieTest extends PHPUnit\Framework\TestCase { public function testErrorDie() { diff --git a/Cache_Lite-1.8.2/tests/NestedOutputTest.php b/Cache_Lite-1.8.2/tests/NestedOutputTest.php index 66d5e05..21d563a 100644 --- a/Cache_Lite-1.8.2/tests/NestedOutputTest.php +++ b/Cache_Lite-1.8.2/tests/NestedOutputTest.php @@ -11,7 +11,7 @@ require_once __DIR__ . '/../Cache/Lite/NestedOutput.php'; -class NestedOutputTest extends PHPUnit_Framework_TestCase +class NestedOutputTest extends PHPUnit\Framework\TestCase { /** * "Test" used for documenting the nested output buffering feature of php diff --git a/Cache_Lite-1.8.2/tests/pearbug18328.phpt b/Cache_Lite-1.8.2/tests/pearbug18328.phpt index cc03805..f4bb94f 100644 --- a/Cache_Lite-1.8.2/tests/pearbug18328.phpt +++ b/Cache_Lite-1.8.2/tests/pearbug18328.phpt @@ -16,8 +16,6 @@ var_dump($c->_cacheDir === '.'); $c = new Cache_Lite(array('lifeTime' => 60)); var_dump($c->_cacheDir === (function_exists('sys_get_temp_dir') ? sys_get_temp_dir() . DIRECTORY_SEPARATOR : '/tmp/')); ---GET-- ---POST-- --EXPECT-- bool(true) bool(true) diff --git a/Cache_Lite-1.8.2/tests/pearbug19422.phpt b/Cache_Lite-1.8.2/tests/pearbug19422.phpt index 0bf6918..9ec2e93 100644 --- a/Cache_Lite-1.8.2/tests/pearbug19422.phpt +++ b/Cache_Lite-1.8.2/tests/pearbug19422.phpt @@ -124,8 +124,6 @@ foreach(glob(FsStreamWrapper_CACHE_DIR . 'cache*') as $file) { } @rmdir(FsStreamWrapper_CACHE_DIR); ?> ---GET-- ---POST-- --EXPECT-- bool(true) bool(true) diff --git a/Cache_Lite-1.8.2/tests/pearbug19711.phpt b/Cache_Lite-1.8.2/tests/pearbug19711.phpt index 8b7dd68..04f21f7 100644 --- a/Cache_Lite-1.8.2/tests/pearbug19711.phpt +++ b/Cache_Lite-1.8.2/tests/pearbug19711.phpt @@ -30,7 +30,5 @@ $fetched_data = $Cache_Lite->get('array_cached'); var_dump($data === $fetched_data); ?> ---GET-- ---POST-- --EXPECT-- bool(true) diff --git a/Cache_Lite-1.8.2/tests/pearbug513.phpt b/Cache_Lite-1.8.2/tests/pearbug513.phpt index 6129b8c..51e1393 100644 --- a/Cache_Lite-1.8.2/tests/pearbug513.phpt +++ b/Cache_Lite-1.8.2/tests/pearbug513.phpt @@ -17,8 +17,6 @@ $Cache_Lite = new Cache_Lite($options); multipleCallCache(); ?> ---GET-- ---POST-- --EXPECT-- ==> First call (cache should be missed) Cache Missed ! -- 2.15.0