From 8b08ab17658460b609854dd94fa29dc60b128877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Pr=C3=A9vot?= Date: Thu, 14 Feb 2019 15:51:17 -1000 Subject: [PATCH 1/3] Update for recent version of PHPUnit Bug-Debian: https://bugs.debian.org/882920 Bug-Debian: https://bugs.debian.org/917760 --- tests/argument_test.php | 2 +- tests/arguments_test.php | 2 +- tests/dialog_options_test.php | 2 +- tests/input_test.php | 2 +- tests/menu_dialog_default_validator_test.php | 2 +- tests/menu_dialog_options_test.php | 2 +- tests/menu_dialog_test.php | 2 +- tests/option_rule_test.php | 2 +- tests/option_test.php | 2 +- tests/output_format_test.php | 2 +- tests/output_formats_test.php | 2 +- tests/output_options_test.php | 2 +- tests/output_test.php | 2 +- tests/progressbar_options_test.php | 2 +- tests/progressbar_test.php | 2 +- tests/progressmonitor_options_test.php | 2 +- tests/progressmonitor_test.php | 2 +- tests/question_dialog_collection_validator_test.php | 2 +- tests/question_dialog_mapping_validator_test.php | 2 +- tests/question_dialog_options_test.php | 2 +- tests/question_dialog_regex_validator_test.php | 2 +- tests/question_dialog_test.php | 2 +- tests/question_dialog_type_validator_test.php | 2 +- tests/statusbar_options_test.php | 2 +- tests/statusbar_test.php | 2 +- tests/string_tools_test.php | 2 +- tests/table_cell_test.php | 2 +- tests/table_options_test.php | 2 +- tests/table_row_test.php | 2 +- tests/table_test.php | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/tests/argument_test.php b/tests/argument_test.php index f7fc726..b3fd7e6 100644 --- a/tests/argument_test.php +++ b/tests/argument_test.php @@ -36,7 +36,7 @@ class ezcConsoleArgumentTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleArgumentTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleArgumentTest" ); } protected function setUp() diff --git a/tests/arguments_test.php b/tests/arguments_test.php index 9befa2a..2efa79b 100644 --- a/tests/arguments_test.php +++ b/tests/arguments_test.php @@ -36,7 +36,7 @@ class ezcConsoleArgumentsTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleArgumentsTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleArgumentsTest" ); } protected function setUp() diff --git a/tests/dialog_options_test.php b/tests/dialog_options_test.php index ac80939..5a4f725 100644 --- a/tests/dialog_options_test.php +++ b/tests/dialog_options_test.php @@ -35,7 +35,7 @@ class ezcConsoleDialogOptionsTest extends ezcTestCase { public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleDialogOptionsTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleDialogOptionsTest" ); } public function testGetAccessDefaultSuccess() diff --git a/tests/input_test.php b/tests/input_test.php index 07c84ca..3c810aa 100644 --- a/tests/input_test.php +++ b/tests/input_test.php @@ -191,7 +191,7 @@ class ezcConsoleInputTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleInputTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleInputTest" ); } protected function setUp() diff --git a/tests/menu_dialog_default_validator_test.php b/tests/menu_dialog_default_validator_test.php index da58917..6a800c0 100644 --- a/tests/menu_dialog_default_validator_test.php +++ b/tests/menu_dialog_default_validator_test.php @@ -35,7 +35,7 @@ class ezcConsoleMenuDialogDefaultValidatorTest extends ezcTestCase { public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleMenuDialogDefaultValidatorTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleMenuDialogDefaultValidatorTest" ); } public function testGetAccessDefaultSuccess() diff --git a/tests/menu_dialog_options_test.php b/tests/menu_dialog_options_test.php index 322b108..c81497d 100644 --- a/tests/menu_dialog_options_test.php +++ b/tests/menu_dialog_options_test.php @@ -35,7 +35,7 @@ class ezcConsoleMenuDialogOptionsTest extends ezcTestCase { public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleMenuDialogOptionsTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleMenuDialogOptionsTest" ); } public function testGetAccessDefaultSuccess() diff --git a/tests/menu_dialog_test.php b/tests/menu_dialog_test.php index 6efa24b..fd980db 100644 --- a/tests/menu_dialog_test.php +++ b/tests/menu_dialog_test.php @@ -36,7 +36,7 @@ class ezcConsoleMenuDialogTest extends ezcConsoleDialogTest public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleMenuDialogTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleMenuDialogTest" ); } public function testGetAccessSuccess() diff --git a/tests/option_rule_test.php b/tests/option_rule_test.php index 0e9eafc..5579c01 100644 --- a/tests/option_rule_test.php +++ b/tests/option_rule_test.php @@ -36,7 +36,7 @@ class ezcConsoleOptionRuleTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleOptionRuleTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleOptionRuleTest" ); } public function testGetAccessSuccess() diff --git a/tests/option_test.php b/tests/option_test.php index b314ca2..3e934f1 100644 --- a/tests/option_test.php +++ b/tests/option_test.php @@ -36,7 +36,7 @@ class ezcConsoleOptionTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleOptionTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleOptionTest" ); } public function testConstructionSuccess() diff --git a/tests/output_format_test.php b/tests/output_format_test.php index 2c14933..096d74a 100644 --- a/tests/output_format_test.php +++ b/tests/output_format_test.php @@ -36,7 +36,7 @@ class ezcConsoleOutputFormatTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleOutputFormatTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleOutputFormatTest" ); } public function testConstructor() diff --git a/tests/output_formats_test.php b/tests/output_formats_test.php index 45cae1a..fed9527 100644 --- a/tests/output_formats_test.php +++ b/tests/output_formats_test.php @@ -36,7 +36,7 @@ class ezcConsoleOutputFormatsTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleOutputFormatsTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleOutputFormatsTest" ); } public function testConstructor() diff --git a/tests/output_options_test.php b/tests/output_options_test.php index aa84d09..1a8af18 100644 --- a/tests/output_options_test.php +++ b/tests/output_options_test.php @@ -36,7 +36,7 @@ class ezcConsoleOutputOptionsTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleOutputOptionsTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleOutputOptionsTest" ); } /** diff --git a/tests/output_test.php b/tests/output_test.php index 44f8190..c5d1cbe 100644 --- a/tests/output_test.php +++ b/tests/output_test.php @@ -88,7 +88,7 @@ class ezcConsoleOutputTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleOutputTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleOutputTest" ); } protected function setUp() diff --git a/tests/progressbar_options_test.php b/tests/progressbar_options_test.php index 7a79307..1c2aa44 100644 --- a/tests/progressbar_options_test.php +++ b/tests/progressbar_options_test.php @@ -36,7 +36,7 @@ class ezcConsoleProgressbarOptionsTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleProgressbarOptionsTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleProgressbarOptionsTest" ); } /** diff --git a/tests/progressbar_test.php b/tests/progressbar_test.php index 410a5bd..b8a84c8 100644 --- a/tests/progressbar_test.php +++ b/tests/progressbar_test.php @@ -35,7 +35,7 @@ class ezcConsoleProgressbarTest extends ezcTestCase { public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleProgressbarTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleProgressbarTest" ); } public function testProgress1() diff --git a/tests/progressmonitor_options_test.php b/tests/progressmonitor_options_test.php index ddec69c..a68cc81 100644 --- a/tests/progressmonitor_options_test.php +++ b/tests/progressmonitor_options_test.php @@ -36,7 +36,7 @@ class ezcConsoleProgressMonitorOptionsTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleProgressMonitorOptionsTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleProgressMonitorOptionsTest" ); } /** diff --git a/tests/progressmonitor_test.php b/tests/progressmonitor_test.php index 924138c..9af54cd 100644 --- a/tests/progressmonitor_test.php +++ b/tests/progressmonitor_test.php @@ -48,7 +48,7 @@ class ezcConsoleProgressMonitorTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleProgressMonitorTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleProgressMonitorTest" ); } public function testProgressMonitor1() diff --git a/tests/question_dialog_collection_validator_test.php b/tests/question_dialog_collection_validator_test.php index d16ba81..2e3a9cb 100644 --- a/tests/question_dialog_collection_validator_test.php +++ b/tests/question_dialog_collection_validator_test.php @@ -35,7 +35,7 @@ class ezcConsoleQuestionDialogCollectionValidatorTest extends ezcTestCase { public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleQuestionDialogCollectionValidatorTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleQuestionDialogCollectionValidatorTest" ); } public function testGetAccessDefaultSuccess() diff --git a/tests/question_dialog_mapping_validator_test.php b/tests/question_dialog_mapping_validator_test.php index 6febec0..4af9496 100644 --- a/tests/question_dialog_mapping_validator_test.php +++ b/tests/question_dialog_mapping_validator_test.php @@ -35,7 +35,7 @@ class ezcConsoleQuestionDialogMappingValidatorTest extends ezcTestCase { public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleQuestionDialogMappingValidatorTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleQuestionDialogMappingValidatorTest" ); } public function testGetAccessDefaultSuccess() diff --git a/tests/question_dialog_options_test.php b/tests/question_dialog_options_test.php index 4458f19..0db5926 100644 --- a/tests/question_dialog_options_test.php +++ b/tests/question_dialog_options_test.php @@ -35,7 +35,7 @@ class ezcConsoleQuestionDialogOptionsTest extends ezcTestCase { public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleQuestionDialogOptionsTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleQuestionDialogOptionsTest" ); } public function testGetAccessDefaultSuccess() diff --git a/tests/question_dialog_regex_validator_test.php b/tests/question_dialog_regex_validator_test.php index bb6211f..720414b 100644 --- a/tests/question_dialog_regex_validator_test.php +++ b/tests/question_dialog_regex_validator_test.php @@ -35,7 +35,7 @@ class ezcConsoleQuestionDialogRegexValidatorTest extends ezcTestCase { public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleQuestionDialogRegexValidatorTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleQuestionDialogRegexValidatorTest" ); } public function testGetAccessDefaultSuccess() diff --git a/tests/question_dialog_test.php b/tests/question_dialog_test.php index 2a0a0be..e1e8436 100644 --- a/tests/question_dialog_test.php +++ b/tests/question_dialog_test.php @@ -36,7 +36,7 @@ class ezcConsoleQuestionDialogTest extends ezcConsoleDialogTest public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleQuestionDialogTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleQuestionDialogTest" ); } public function testGetAccessSuccess() diff --git a/tests/question_dialog_type_validator_test.php b/tests/question_dialog_type_validator_test.php index 6824edf..9e1b5fe 100644 --- a/tests/question_dialog_type_validator_test.php +++ b/tests/question_dialog_type_validator_test.php @@ -35,7 +35,7 @@ class ezcConsoleQuestionDialogTypeValidatorTest extends ezcTestCase { public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleQuestionDialogTypeValidatorTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleQuestionDialogTypeValidatorTest" ); } public function testGetAccessDefaultSuccess() diff --git a/tests/statusbar_options_test.php b/tests/statusbar_options_test.php index ebbb4bc..b41dfc5 100644 --- a/tests/statusbar_options_test.php +++ b/tests/statusbar_options_test.php @@ -36,7 +36,7 @@ class ezcConsoleStatusbarOptionsTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleStatusbarOptionsTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleStatusbarOptionsTest" ); } /** diff --git a/tests/statusbar_test.php b/tests/statusbar_test.php index 5108e5b..9a685c0 100644 --- a/tests/statusbar_test.php +++ b/tests/statusbar_test.php @@ -65,7 +65,7 @@ class ezcConsoleStatusbarTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleStatusbarTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleStatusbarTest" ); } public function testStatusbar1() diff --git a/tests/string_tools_test.php b/tests/string_tools_test.php index 70c8202..ef29bf3 100644 --- a/tests/string_tools_test.php +++ b/tests/string_tools_test.php @@ -106,7 +106,7 @@ public function provideTestStrPad() public static function suite() { - return new PHPUnit_Framework_TestSuite( __CLASS__ ); + return new PHPUnit\Framework\TestSuite( __CLASS__ ); } } ?> diff --git a/tests/table_cell_test.php b/tests/table_cell_test.php index 26653bc..9140d57 100644 --- a/tests/table_cell_test.php +++ b/tests/table_cell_test.php @@ -36,7 +36,7 @@ class ezcConsoleTableCellTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleTableCellTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleTableCellTest" ); } public function testConstructorSuccessDefault() diff --git a/tests/table_options_test.php b/tests/table_options_test.php index 6279429..a5d7ae1 100644 --- a/tests/table_options_test.php +++ b/tests/table_options_test.php @@ -36,7 +36,7 @@ class ezcConsoleTableOptionsTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleTableOptionsTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleTableOptionsTest" ); } /** diff --git a/tests/table_row_test.php b/tests/table_row_test.php index 219f43b..06fb332 100644 --- a/tests/table_row_test.php +++ b/tests/table_row_test.php @@ -35,7 +35,7 @@ class ezcConsoleTableRowTest extends ezcTestCase { public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleTableRowTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleTableRowTest" ); } public function testCtorSuccess_1() diff --git a/tests/table_test.php b/tests/table_test.php index a1309f8..8c1a453 100644 --- a/tests/table_test.php +++ b/tests/table_test.php @@ -70,7 +70,7 @@ class ezcConsoleTableTest extends ezcTestCase public static function suite() { - return new PHPUnit_Framework_TestSuite( "ezcConsoleTableTest" ); + return new PHPUnit\Framework\TestSuite( "ezcConsoleTableTest" ); } protected function setUp() From 04d0cdab6a2fe321056563de48d3dc4258d3c2ba Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Sun, 17 Feb 2019 21:32:50 +0000 Subject: [PATCH 2/3] Updated Travis configuration --- .travis.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8bd89cd..1e8590e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,20 @@ language: php php: - - 5.3 - - 5.4 - - 5.5 - 5.6 - - hhvm - + - 7.0 + - 7.1 + - 7.2 + - 7.3 + - nightly + matrix: allow_failures: - - php: hhvm + - php: nightly before_script: -- wget http://getcomposer.org/composer.phar -- php composer.phar --dev install + - composer self-update + - composer update +script: + - vendor/bin/phpunit From b8e6ae6c9478891e24db12ccf04712246401a1d7 Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Sun, 17 Feb 2019 21:35:58 +0000 Subject: [PATCH 3/3] Added missing phpunit dependency --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 67d27b3..872e08d 100644 --- a/composer.json +++ b/composer.json @@ -50,6 +50,7 @@ "zetacomponents/base": "~1.8" }, "require-dev": { + "phpunit/phpunit": "~5.7", "zetacomponents/unit-test": "*" } }