From 7027a1643f04f747f32e77885f78b9fdf12fcdb2 Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Fri, 20 Oct 2017 18:26:14 +0200
Subject: [PATCH 1/2] Version checks

---
 ext/intl/tests/timezone_IDforWindowsID_basic2.phpt | 1 -
 ext/intl/tests/timezone_windowsID_basic.phpt       | 4 ++--
 ext/intl/tests/timezone_windowsID_basic2.phpt      | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt b/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt
index 1291dd98e51..d7d865c7a70 100644
--- a/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt
+++ b/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt
@@ -4,7 +4,6 @@ IntlTimeZone::getIDForWindowsID basic test
 <?php
 if (!extension_loaded('intl'))
 	die('skip intl extension not enabled'); ?>
-<?php if (version_compare(INTL_ICU_VERSION, '52') < 0) die('skip for ICU >= 52'); ?>
 <?php if (version_compare(INTL_ICU_VERSION, '58.1') < 0) die('skip for ICU >= 58.1'); ?>
 --FILE--
 <?php
diff --git a/ext/intl/tests/timezone_windowsID_basic.phpt b/ext/intl/tests/timezone_windowsID_basic.phpt
index 0a9fd3be901..370dc45b6c5 100644
--- a/ext/intl/tests/timezone_windowsID_basic.phpt
+++ b/ext/intl/tests/timezone_windowsID_basic.phpt
@@ -4,8 +4,8 @@ IntlTimeZone::getWindowsID basic test
 <?php
 if (!extension_loaded('intl'))
 	die('skip intl extension not enabled'); ?>
-<?php if (version_compare(INTL_ICU_VERSION, '52') < 0) die('skip for ICU >= 52'); ?>
-<?php if (version_compare(INTL_ICU_VERSION, '57.1') >= 0) die('skip for ICU <= 57.1'); ?>
+<?php if (version_compare(INTL_ICU_VERSION, '52') < 0)die('skip for ICU >= 52'); ?>
+<?php if (version_compare(INTL_ICU_VERSION, '58.1') >= 0) die('skip for ICU <= 57.1'); ?>
 --FILE--
 <?php
 
diff --git a/ext/intl/tests/timezone_windowsID_basic2.phpt b/ext/intl/tests/timezone_windowsID_basic2.phpt
index 971c439094c..528eaad7db7 100644
--- a/ext/intl/tests/timezone_windowsID_basic2.phpt
+++ b/ext/intl/tests/timezone_windowsID_basic2.phpt
@@ -4,7 +4,6 @@ IntlTimeZone::getWindowsID basic test
 <?php
 if (!extension_loaded('intl'))
 	die('skip intl extension not enabled'); ?>
-<?php if (version_compare(INTL_ICU_VERSION, '52') < 0) die('skip for ICU >= 52'); ?>
 <?php if (version_compare(INTL_ICU_VERSION, '58.1') < 0) die('skip for ICU >= 58.1'); ?>
 --FILE--
 <?php

From e02c41fc72d36033f89c2ad02614c1e9744c1d10 Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Fri, 20 Oct 2017 18:39:46 +0200
Subject: [PATCH 2/2] Further test fixes for ICU >= 58

---
 ext/intl/tests/formatter_get_locale_variant2.phpt | 1 +
 ext/intl/tests/uconverter_oop_callback2.phpt      | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ext/intl/tests/formatter_get_locale_variant2.phpt b/ext/intl/tests/formatter_get_locale_variant2.phpt
index 9d25d1cf902..a6cd6368f10 100644
--- a/ext/intl/tests/formatter_get_locale_variant2.phpt
+++ b/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
 
diff --git a/ext/intl/tests/uconverter_oop_callback2.phpt b/ext/intl/tests/uconverter_oop_callback2.phpt
index aaa4db0c9a0..6c09947c366 100644
--- a/ext/intl/tests/uconverter_oop_callback2.phpt
+++ b/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, ...)