ext/intl: applied fixers to improve test robustness

Author: NickSdot

ext/intl/tests/breakiter___construct.phpt

@@ -8,7 +8,7 @@ intl
 try {
 	new IntlBreakIterator();
 } catch (Throwable $e) {
-	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+	echo $e::class, ': ', $e->getMessage(), \PHP_EOL;
 }
 ?>
 --EXPECT--

ext/intl/tests/breakiter___construct_error.phpt

@@ -9,34 +9,34 @@ intl
 try {
     var_dump(new IntlRuleBasedBreakIterator('[\p{Letter}\uFFFD]+;[:number:]+'));
 } catch (Throwable $e) {
-	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+	echo $e::class, ': ', $e->getMessage(), \PHP_EOL;
 }
 try {
     var_dump(new IntlRuleBasedBreakIterator());
 } catch (Throwable $e) {
-	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+	echo $e::class, ': ', $e->getMessage(), \PHP_EOL;
 }
 try {
     var_dump(new IntlRuleBasedBreakIterator(1,2,3));
 } catch (Throwable $e) {
-	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+	echo $e::class, ': ', $e->getMessage(), \PHP_EOL;
 }
 try {
     var_dump(new IntlRuleBasedBreakIterator('[\p{Letter}\uFFFD]+;[:number:]+;', array()));
 } catch (Throwable $e) {
-	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+	echo $e::class, ': ', $e->getMessage(), \PHP_EOL;
 }
 try {
     var_dump(new IntlRuleBasedBreakIterator('[\p{Letter}\uFFFD]+;[:number:]+;', true));
 } catch (Throwable $e) {
-	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+	echo $e::class, ': ', $e->getMessage(), \PHP_EOL;
 }
 
 $rbbi = new IntlRuleBasedBreakIterator(".;");
 try {
     $rbbi->__construct(".;");
 } catch (Throwable $e) {
-	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+	echo $e::class, ': ', $e->getMessage(), \PHP_EOL;
 }
 ?>
 --EXPECT--

ext/intl/tests/breakiter_getPartsIterator_error.phpt

@@ -10,9 +10,9 @@ $it = IntlBreakIterator::createWordInstance(NULL);
 try {
     var_dump($it->getPartsIterator(-1));
 } catch(\ValueError $e) {
-    echo $e->getMessage() . \PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), \PHP_EOL;
 }
 
 ?>
 --EXPECT--
-IntlBreakIterator::getPartsIterator(): Argument #1 ($type) must be one of IntlPartsIterator::KEY_SEQUENTIAL, IntlPartsIterator::KEY_LEFT, or IntlPartsIterator::KEY_RIGHT
+ValueError: IntlBreakIterator::getPartsIterator(): Argument #1 ($type) must be one of IntlPartsIterator::KEY_SEQUENTIAL, IntlPartsIterator::KEY_LEFT, or IntlPartsIterator::KEY_RIGHT

ext/intl/tests/bug48227.phpt

@@ -10,15 +10,15 @@ foreach (['', 1, NULL, $x] as $value) {
     try {
         var_dump($x->format($value));
     } catch (TypeError $ex) {
-        echo $ex->getMessage(), PHP_EOL;
+        echo $ex::class, ': ', $ex->getMessage(), \PHP_EOL;
     }
 }
 
 ?>
 --EXPECTF--
-NumberFormatter::format(): Argument #1 ($num) must be of type int|float, string given
+TypeError: NumberFormatter::format(): Argument #1 ($num) must be of type int|float, string given
 string(1) "1"
 
 Deprecated: NumberFormatter::format(): Passing null to parameter #1 ($num) of type int|float is deprecated in %s on line %d
 string(1) "0"
-NumberFormatter::format(): Argument #1 ($num) must be of type int|float, NumberFormatter given
+TypeError: NumberFormatter::format(): Argument #1 ($num) must be of type int|float, NumberFormatter given

ext/intl/tests/bug60192-compare.phpt

@@ -14,7 +14,7 @@ $c = new Collator2();
 try {
 	$a = $c->compare('h', 'H');
 } catch (Throwable $e) {
-	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+	echo $e::class, ': ', $e->getMessage(), \PHP_EOL;
 }
 ?>
 --EXPECT--

ext/intl/tests/bug60192-getlocale.phpt

@@ -15,7 +15,7 @@ $c = new Collator2();
 try {
 	$c->getLocale(Locale::ACTUAL_LOCALE);
 } catch (Throwable $e) {
-	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+	echo $e::class, ': ', $e->getMessage(), \PHP_EOL;
 }
 ?>
 --EXPECT--

ext/intl/tests/bug60192-getsortkey.phpt

@@ -15,7 +15,7 @@ $c = new Collator2();
 try {
 	$c->getSortKey('h');
 } catch (Throwable $e) {
-	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+	echo $e::class, ': ', $e->getMessage(), \PHP_EOL;
 }
 ?>
 --EXPECT--

ext/intl/tests/bug60192-sort.phpt

@@ -16,7 +16,7 @@ $a = array('a', 'b');
 try {
 	$c->sort($a);
 } catch (Throwable $e) {
-	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+	echo $e::class, ': ', $e->getMessage(), \PHP_EOL;
 }
 ?>
 --EXPECT--

ext/intl/tests/bug60192-sortwithsortkeys.phpt

@@ -16,7 +16,7 @@ $a = array('a', 'b');
 try {
 	$c->sortWithSortKeys($a);
 } catch (Throwable $e) {
-	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+	echo $e::class, ': ', $e->getMessage(), \PHP_EOL;
 }
 ?>
 --EXPECT--

ext/intl/tests/bug61487.phpt

@@ -10,15 +10,15 @@ intl
 try {
     grapheme_stripos(1,1,2147483648);
 } catch (ValueError $exception) {
-    echo $exception->getMessage() . "\n";
+    echo $exception::class, ': ', $exception->getMessage(), \PHP_EOL;
 }
 
 try {
     grapheme_strpos(1,1,2147483648);
 } catch (ValueError $exception) {
-    echo $exception->getMessage() . "\n";
+    echo $exception::class, ': ', $exception->getMessage(), \PHP_EOL;
 }
 ?>
 --EXPECT--
-grapheme_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
-grapheme_strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
+ValueError: grapheme_stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
+ValueError: grapheme_strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)