ext/intl: modernize tests

ext/intl/tests/breakiter___construct.phpt

@@ -4,12 +4,12 @@ IntlBreakIterator::__construct() should not be callable
 intl
 --FILE--
 <?php
-ini_set("intl.error_level", E_WARNING);
 
-new IntlBreakIterator();
+try {
+	new IntlBreakIterator();
+} catch (Throwable $e) {
+	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
 ?>
---EXPECTF--
-Fatal error: Uncaught Error: Call to private IntlBreakIterator::__construct() from global scope in %s:%d
-Stack trace:
-#0 {main}
-  thrown in %s on line %d
+--EXPECT--
+Error: Call to private IntlBreakIterator::__construct() from global scope

ext/intl/tests/breakiter___construct_error.phpt

@@ -5,53 +5,44 @@ intl
 --FILE--
 <?php
 
-function print_exception($e) {
-    echo "\nException: " . $e->getMessage() . " in " . $e->getFile() . " on line " . $e->getLine() . "\n";
-}
-
 //missing ; at the end:
 try {
     var_dump(new IntlRuleBasedBreakIterator('[\p{Letter}\uFFFD]+;[:number:]+'));
-} catch (IntlException $e) {
-    print_exception($e);
+} catch (Throwable $e) {
+	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
 }
 try {
     var_dump(new IntlRuleBasedBreakIterator());
-} catch (TypeError $e) {
-    print_exception($e);
+} catch (Throwable $e) {
+	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
 }
 try {
     var_dump(new IntlRuleBasedBreakIterator(1,2,3));
-} catch (TypeError $e) {
-    print_exception($e);
+} catch (Throwable $e) {
+	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
 }
 try {
     var_dump(new IntlRuleBasedBreakIterator('[\p{Letter}\uFFFD]+;[:number:]+;', array()));
-} catch (TypeError $e) {
-    print_exception($e);
+} catch (Throwable $e) {
+	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
 }
 try {
     var_dump(new IntlRuleBasedBreakIterator('[\p{Letter}\uFFFD]+;[:number:]+;', true));
-} catch (IntlException $e) {
-    print_exception($e);
+} catch (Throwable $e) {
+	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
 }
 
 $rbbi = new IntlRuleBasedBreakIterator(".;");
 try {
     $rbbi->__construct(".;");
-} catch (Error $e) {
-    print_exception($e);
+} catch (Throwable $e) {
+	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
 }
 ?>
---EXPECTF--
-Exception: IntlRuleBasedBreakIterator::__construct(): unable to create RuleBasedBreakIterator from rules (parse error on line 1, offset 31) in %s on line %d
-
-Exception: IntlRuleBasedBreakIterator::__construct() expects at least 1 argument, 0 given in %s on line %d
-
-Exception: IntlRuleBasedBreakIterator::__construct() expects at most 2 arguments, 3 given in %s on line %d
-
-Exception: IntlRuleBasedBreakIterator::__construct(): Argument #2 ($compiled) must be of type bool, array given in %s on line %d
-
-Exception: IntlRuleBasedBreakIterator::__construct(): unable to create instance from compiled rules in %s on line %d
-
-Exception: IntlRuleBasedBreakIterator object is already constructed in %s on line %d
+--EXPECT--
+IntlException: IntlRuleBasedBreakIterator::__construct(): unable to create RuleBasedBreakIterator from rules (parse error on line 1, offset 31)
+ArgumentCountError: IntlRuleBasedBreakIterator::__construct() expects at least 1 argument, 0 given
+ArgumentCountError: IntlRuleBasedBreakIterator::__construct() expects at most 2 arguments, 3 given
+TypeError: IntlRuleBasedBreakIterator::__construct(): Argument #2 ($compiled) must be of type bool, array given
+IntlException: IntlRuleBasedBreakIterator::__construct(): unable to create instance from compiled rules
+Error: IntlRuleBasedBreakIterator object is already constructed

ext/intl/tests/breakiter_clone_basic.phpt

@@ -4,7 +4,6 @@ IntlBreakIterator: clone handler
 intl
 --FILE--
 <?php
-ini_set("intl.error_level", E_WARNING);
 
 $bi = new IntlRuleBasedBreakIterator('[\p{Letter}\uFFFD]+;[:number:]+;');
 $bi_clone = clone $bi;

ext/intl/tests/breakiter_createCodePointInstance_basic.phpt

@@ -2,10 +2,10 @@
 IntlBreakIterator::createCodePointInstance(): basic test
 --EXTENSIONS--
 intl
+--INI--
+intl.default_locale=pt_PT
 --FILE--
 <?php
-ini_set("intl.error_level", E_WARNING);
-ini_set("intl.default_locale", "pt_PT");
 
 $text = 'ตัวอย่างข้อความ';
 

ext/intl/tests/breakiter_current_basic.phpt

@@ -4,8 +4,6 @@ IntlBreakIterator::current(): basic test
 intl
 --FILE--
 <?php
-ini_set("intl.error_level", E_WARNING);
-ini_set("intl.default_locale", "pt_PT");
 
 $bi = IntlBreakIterator::createWordInstance('pt');
 var_dump($bi->current());

ext/intl/tests/breakiter_factories_basic.phpt

@@ -2,10 +2,10 @@
 IntlBreakIterator factories: basic tests
 --EXTENSIONS--
 intl
+--INI--
+intl.default_locale=ja
 --FILE--
 <?php
-ini_set("intl.error_level", E_WARNING);
-ini_set("intl.default_locale", "ja");
 
 $m = array('createWordInstance', 'createLineInstance', 'createCharacterInstance',
     'createSentenceInstance', 'createTitleInstance');

ext/intl/tests/breakiter_first_basic.phpt

@@ -4,7 +4,6 @@ IntlBreakIterator::first(): basic test
 intl
 --FILE--
 <?php
-ini_set("intl.error_level", E_WARNING);
 
 $bi = IntlBreakIterator::createWordInstance('pt');
 $bi->setText('foo bar trans');

ext/intl/tests/breakiter_following_basic.phpt

@@ -4,8 +4,6 @@ IntlBreakIterator::following(): basic test
 intl
 --FILE--
 <?php
-ini_set("intl.error_level", E_WARNING);
-ini_set("intl.default_locale", "pt_PT");
 
 $bi = IntlBreakIterator::createWordInstance('pt');
 $bi->setText('foo bar trans zoo bee');

ext/intl/tests/breakiter_getLocale_basic2.phpt

@@ -6,8 +6,6 @@ intl
 <?php if (version_compare(INTL_ICU_VERSION, '64.0') >= 0) die('skip for ICU < 64.0'); ?>
 --FILE--
 <?php
-ini_set("intl.error_level", E_WARNING);
-ini_set("intl.default_locale", "pt_PT");
 
 $bi = IntlBreakIterator::createSentenceInstance('pt');
 

ext/intl/tests/breakiter_getLocale_basic3.phpt

@@ -6,8 +6,6 @@ intl
 <?php if (version_compare(INTL_ICU_VERSION, '64.0') < 0) die('skip for ICU >= 64.0'); ?>
 --FILE--
 <?php
-ini_set("intl.error_level", E_WARNING);
-ini_set("intl.default_locale", "pt_PT");
 
 $bi = IntlBreakIterator::createSentenceInstance('pt');
 

ext/intl/tests/breakiter_getPartsIterator_basic.phpt

@@ -8,8 +8,6 @@ if (version_compare(INTL_ICU_VERSION, '57.1') > 0) die('skip for ICU <= 57.1');
 ?>
 --FILE--
 <?php
-ini_set("intl.error_level", E_WARNING);
-ini_set("intl.default_locale", "pt_PT");
 
 $bi = IntlBreakIterator::createWordInstance('pt');
 $pi = $bi->getPartsIterator();

ext/intl/tests/breakiter_getPartsIterator_basic2.phpt

@@ -8,8 +8,6 @@ if (version_compare(INTL_ICU_VERSION, '57.1') <= 0) die('skip for ICU > 57.1');
 ?>
 --FILE--
 <?php
-ini_set("intl.error_level", E_WARNING);
-ini_set("intl.default_locale", "pt_PT");
 
 $bi = IntlBreakIterator::createWordInstance('pt');
 $pi = $bi->getPartsIterator();

ext/intl/tests/breakiter_getPartsIterator_error.phpt

@@ -4,7 +4,6 @@ IntlBreakIterator::getPartsIterator(): bad args
 intl
 --FILE--
 <?php
-ini_set("intl.default_locale", "pt_PT");
 
 $it = IntlBreakIterator::createWordInstance(NULL);
 

ext/intl/tests/breakiter_getPartsIterator_var1.phpt

@@ -2,10 +2,10 @@
 IntlBreakIterator::getPartsIterator(): argument variations
 --EXTENSIONS--
 intl
+--INI--
+intl.default_locale=pt_PT
 --FILE--
 <?php
-ini_set("intl.error_level", E_WARNING);
-ini_set("intl.default_locale", "pt_PT");
 
 $text = 'foo bar tao';
 

ext/intl/tests/breakiter_getText_basic.phpt

@@ -4,7 +4,6 @@ IntlBreakIterator::getText(): basic test
 intl
 --FILE--
 <?php
-ini_set("intl.error_level", E_WARNING);
 
 $bi = IntlBreakIterator::createWordInstance('pt');
 var_dump($bi->getText());

ext/intl/tests/breakiter_isBoundary_basic.phpt

@@ -4,8 +4,6 @@ IntlBreakIterator::isBoundary(): basic test
 intl
 --FILE--
 <?php
-ini_set("intl.error_level", E_WARNING);
-ini_set("intl.default_locale", "pt_PT");
 
 $bi = IntlBreakIterator::createWordInstance('pt');
 $bi->setText('foo bar trans zoo bee');

ext/intl/tests/breakiter_last_basic.phpt

@@ -4,7 +4,6 @@ IntlBreakIterator::last(): basic test
 intl
 --FILE--
 <?php
-ini_set("intl.error_level", E_WARNING);
 
 $bi = IntlBreakIterator::createWordInstance('pt');
 $bi->setText('foo bar trans');

ext/intl/tests/breakiter_next_basic.phpt

@@ -4,8 +4,6 @@ IntlBreakIterator::next(): basic test
 intl
 --FILE--
 <?php
-ini_set("intl.error_level", E_WARNING);
-ini_set("intl.default_locale", "pt_PT");
 
 $bi = IntlBreakIterator::createWordInstance('pt');
 $bi->setText('foo bar trans zoo bee');

ext/intl/tests/breakiter_preceding_basic.phpt

@@ -8,8 +8,6 @@ if (version_compare(INTL_ICU_VERSION, '57.1') > 0) die('skip for ICU <= 57.1');
 ?>
 --FILE--
 <?php
-ini_set("intl.error_level", E_WARNING);
-ini_set("intl.default_locale", "pt_PT");
 
 $bi = IntlBreakIterator::createWordInstance('pt');
 $bi->setText('foo bar trans zoo bee');

ext/intl/tests/breakiter_preceding_basic2.phpt

@@ -8,8 +8,6 @@ if (version_compare(INTL_ICU_VERSION, '57.1') <= 0) die('skip for ICU > 57.1');
 ?>
 --FILE--
 <?php
-ini_set("intl.error_level", E_WARNING);
-ini_set("intl.default_locale", "pt_PT");
 
 $bi = IntlBreakIterator::createWordInstance('pt');
 $bi->setText('foo bar trans zoo bee');

ext/intl/tests/breakiter_previous_basic.phpt

@@ -4,8 +4,6 @@ IntlBreakIterator::previous(): basic test
 intl
 --FILE--
 <?php
-ini_set("intl.error_level", E_WARNING);
-ini_set("intl.default_locale", "pt_PT");
 
 $bi = IntlBreakIterator::createWordInstance('pt');
 $bi->setText('foo bar trans');

ext/intl/tests/breakiter_setText_basic.phpt

@@ -4,7 +4,6 @@ IntlBreakIterator::setText(): basic test
 intl
 --FILE--
 <?php
-ini_set("intl.error_level", E_WARNING);
 
 class A {
 function __tostring() { return 'aaa'; }

ext/intl/tests/bug58756_MessageFormatter_variant2.phpt

@@ -2,6 +2,8 @@
 Bug #58756: w.r.t MessageFormatter
 --EXTENSIONS--
 intl
+--INI--
+date.timezone=America/New_York
 --SKIPIF--
 <?php
 if (str_contains(PHP_OS, 'FreeBSD')) {
@@ -10,13 +12,9 @@ if (str_contains(PHP_OS, 'FreeBSD')) {
 ?>
 --FILE--
 <?php
-ini_set("intl.error_level", E_WARNING);
-//ini_set("intl.default_locale", "nl");
 
 $time = 1247013673;
 
-ini_set('date.timezone', 'America/New_York');
-
 $msgf = new MessageFormatter('en_US', '{0,date,full} {0,time,h:m:s a V}');
 
 echo "date:  " . date('l, F j, Y g:i:s A T', $time) . "\n";

ext/intl/tests/bug60192-compare.phpt

@@ -11,11 +11,11 @@ class Collator2 extends Collator{
 }
 
 $c = new Collator2();
-$a = $c->compare('h', 'H');
+try {
+	$a = $c->compare('h', 'H');
+} catch (Throwable $e) {
+	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
 ?>
---EXPECTF--
-Fatal error: Uncaught Error: Object not initialized in %s:%d
-Stack trace:
-#0 %s(%d): Collator->compare('h', 'H')
-#1 {main}
-  thrown in %s on line %d
+--EXPECT--
+Error: Object not initialized

ext/intl/tests/bug60192-getlocale.phpt

@@ -12,11 +12,11 @@ class Collator2 extends Collator{
 }
 
 $c = new Collator2();
-$c->getLocale(Locale::ACTUAL_LOCALE);
+try {
+	$c->getLocale(Locale::ACTUAL_LOCALE);
+} catch (Throwable $e) {
+	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
 ?>
---EXPECTF--
-Fatal error: Uncaught Error: Object not initialized in %s:%d
-Stack trace:
-#0 %s(%d): Collator->getLocale(0)
-#1 {main}
-  thrown in %s on line %d
+--EXPECT--
+Error: Object not initialized

ext/intl/tests/bug60192-getsortkey.phpt

@@ -12,11 +12,11 @@ class Collator2 extends Collator{
 }
 
 $c = new Collator2();
-$c->getSortKey('h');
+try {
+	$c->getSortKey('h');
+} catch (Throwable $e) {
+	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
 ?>
---EXPECTF--
-Fatal error: Uncaught Error: Object not initialized in %s:%d
-Stack trace:
-#0 %s(%d): Collator->getSortKey('h')
-#1 {main}
-  thrown in %s on line %d
+--EXPECT--
+Error: Object not initialized

ext/intl/tests/bug60192-sort.phpt

@@ -13,11 +13,11 @@ class Collator2 extends Collator{
 
 $c = new Collator2();
 $a = array('a', 'b');
-$c->sort($a);
+try {
+	$c->sort($a);
+} catch (Throwable $e) {
+	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
 ?>
---EXPECTF--
-Fatal error: Uncaught Error: Object not initialized in %s:%d
-Stack trace:
-#0 %s(%d): Collator->sort(Array)
-#1 {main}
-  thrown in %s on line %d
+--EXPECT--
+Error: Object not initialized

ext/intl/tests/bug60192-sortwithsortkeys.phpt

@@ -13,11 +13,11 @@ class Collator2 extends Collator{
 
 $c = new Collator2();
 $a = array('a', 'b');
-$c->sortWithSortKeys($a);
+try {
+	$c->sortWithSortKeys($a);
+} catch (Throwable $e) {
+	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
 ?>
---EXPECTF--
-Fatal error: Uncaught Error: Object not initialized in %s:%d
-Stack trace:
-#0 %s(%d): Collator->sortWithSortKeys(Array)
-#1 {main}
-  thrown in %s on line %d
+--EXPECT--
+Error: Object not initialized