Further test fixes for ICU >= 58

Author: weltling

ext/intl/tests/formatter_get_locale_variant2.phpt

@@ -3,6 +3,7 @@ numfmt_get_locale()
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
 <?php if (version_compare(INTL_ICU_VERSION, '51.2') < 0) die('skip for ICU >= 51.2'); ?>
+<?php if (version_compare(INTL_ICU_VERSION, '58.1') >=  0) die('skip for ICU < 58.1'); ?>
 --FILE--
 <?php
 

ext/intl/tests/uconverter_oop_callback2.phpt

@@ -35,12 +35,16 @@ fromUCallback(REASON_RESET, ...)
 fromUCallback(REASON_RESET, ...)
 toUCallback(REASON_RESET, ...)
 toUCallback(REASON_ILLEGAL, ...)
+toUCallback(REASON_ILLEGAL, ...)
 toUCallback(REASON_RESET, ...)
 toUCallback(REASON_ILLEGAL, ...)
+toUCallback(REASON_ILLEGAL, ...)
 fromUCallback(REASON_RESET, ...)
 fromUCallback(REASON_UNASSIGNED, ...)
+fromUCallback(REASON_UNASSIGNED, ...)
 fromUCallback(REASON_RESET, ...)
 fromUCallback(REASON_UNASSIGNED, ...)
+fromUCallback(REASON_UNASSIGNED, ...)
 toUCallback(REASON_RESET, ...)
 toUCallback(REASON_RESET, ...)
 fromUCallback(REASON_RESET, ...)
@@ -51,7 +55,3 @@ toUCallback(REASON_CLOSE, ...)
 fromUCallback(REASON_CLOSE, ...)
 toUCallback(REASON_CLOSE, ...)
 fromUCallback(REASON_CLOSE, ...)
-toUCallback(REASON_ILLEGAL, ...)
-toUCallback(REASON_ILLEGAL, ...)
-fromUCallback(REASON_UNASSIGNED, ...)
-fromUCallback(REASON_UNASSIGNED, ...)