From 7240d99838113af9f8f6db21b3b57ba2a7d23a0d Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Fri, 20 Oct 2017 15:23:09 +0200
Subject: [PATCH] Fix version checks in tests

---
 ext/intl/tests/breakiter_getPartsIterator_basic.phpt     | 2 +-
 ext/intl/tests/breakiter_getPartsIterator_basic2.phpt    | 2 +-
 ext/intl/tests/breakiter_preceding_basic.phpt            | 2 +-
 ext/intl/tests/breakiter_preceding_basic2.phpt           | 2 +-
 ext/intl/tests/dateformat_create_cal_arg_variant4.phpt   | 2 +-
 ext/intl/tests/dateformat_create_cal_arg_variant5.phpt   | 3 +--
 ext/intl/tests/dateformat_get_set_calendar_variant4.phpt | 2 +-
 ext/intl/tests/dateformat_get_set_calendar_variant5.phpt | 3 +--
 ext/intl/tests/uconverter_oop_callback.phpt              | 2 +-
 ext/intl/tests/uconverter_oop_callback2.phpt             | 2 +-
 10 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/ext/intl/tests/breakiter_getPartsIterator_basic.phpt b/ext/intl/tests/breakiter_getPartsIterator_basic.phpt
index 58516ea745..bbd6a7e07b 100644
--- a/ext/intl/tests/breakiter_getPartsIterator_basic.phpt
+++ b/ext/intl/tests/breakiter_getPartsIterator_basic.phpt
@@ -4,7 +4,7 @@ IntlBreakIterator::getPartsIterator(): basic test, ICU <= 57.1
 <?php
 if (!extension_loaded('intl'))
 	die('skip intl extension not enabled');
-if (version_compare(INTL_ICU_VERSION, '57.1') >= 0) die('skip for ICU <= 57.1');
+if (version_compare(INTL_ICU_VERSION, '57.1') > 0) die('skip for ICU <= 57.1');
 ?>
 --FILE--
 <?php
diff --git a/ext/intl/tests/breakiter_getPartsIterator_basic2.phpt b/ext/intl/tests/breakiter_getPartsIterator_basic2.phpt
index c802f963af..2bbd999904 100644
--- a/ext/intl/tests/breakiter_getPartsIterator_basic2.phpt
+++ b/ext/intl/tests/breakiter_getPartsIterator_basic2.phpt
@@ -4,7 +4,7 @@ IntlBreakIterator::getPartsIterator(): basic test, ICU >= 58.1
 <?php
 if (!extension_loaded('intl'))
 	die('skip intl extension not enabled');
-if (version_compare(INTL_ICU_VERSION, '57.1') < 0) die('skip for ICU >= 58.1');
+if (version_compare(INTL_ICU_VERSION, '57.1') <= 0) die('skip for ICU >= 58.1');
 ?>
 --FILE--
 <?php
diff --git a/ext/intl/tests/breakiter_preceding_basic.phpt b/ext/intl/tests/breakiter_preceding_basic.phpt
index 7ef8804c4f..9cba9b0831 100644
--- a/ext/intl/tests/breakiter_preceding_basic.phpt
+++ b/ext/intl/tests/breakiter_preceding_basic.phpt
@@ -4,7 +4,7 @@ IntlBreakIterator::preceding(): basic test, ICU <= 57.1
 <?php
 if (!extension_loaded('intl'))
 	die('skip intl extension not enabled');
-if (version_compare(INTL_ICU_VERSION, '57.1') >= 0) die('skip for ICU <= 57.1');
+if (version_compare(INTL_ICU_VERSION, '57.1') > 0) die('skip for ICU <= 57.1');
 ?>
 --FILE--
 <?php
diff --git a/ext/intl/tests/breakiter_preceding_basic2.phpt b/ext/intl/tests/breakiter_preceding_basic2.phpt
index e84e5fc469..b964365025 100644
--- a/ext/intl/tests/breakiter_preceding_basic2.phpt
+++ b/ext/intl/tests/breakiter_preceding_basic2.phpt
@@ -4,7 +4,7 @@ IntlBreakIterator::preceding(): basic test, ICU >= 58.1
 <?php
 if (!extension_loaded('intl'))
 	die('skip intl extension not enabled');
-if (version_compare(INTL_ICU_VERSION, '57.1') < 0) die('skip for ICU >= 58.1');
+if (version_compare(INTL_ICU_VERSION, '57.1') <= 0) die('skip for ICU >= 58.1');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/dateformat_create_cal_arg_variant4.phpt b/ext/intl/tests/dateformat_create_cal_arg_variant4.phpt
index 4796b93abd..861ee51965 100644
--- a/ext/intl/tests/dateformat_create_cal_arg_variant4.phpt
+++ b/ext/intl/tests/dateformat_create_cal_arg_variant4.phpt
@@ -4,7 +4,7 @@ IntlDateFormatter: several forms of the calendar arg
 <?php
 if (!extension_loaded('intl'))	die('skip intl extension not enabled'); ?>
 <?php if (version_compare(INTL_ICU_VERSION, '54.1') < 0) die('skip for ICU >= 54.1'); ?>
-<?php if (version_compare(INTL_ICU_VERSION, '57.1') >= 0) die('skip for ICU <= 57.1'); ?>
+<?php if (version_compare(INTL_ICU_VERSION, '58.1') >= 0) die('skip for ICU <= 57.1'); ?>
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/dateformat_create_cal_arg_variant5.phpt b/ext/intl/tests/dateformat_create_cal_arg_variant5.phpt
index b42d0b3dad..1b61df82f0 100644
--- a/ext/intl/tests/dateformat_create_cal_arg_variant5.phpt
+++ b/ext/intl/tests/dateformat_create_cal_arg_variant5.phpt
@@ -3,8 +3,7 @@ IntlDateFormatter: several forms of the calendar arg
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))	die('skip intl extension not enabled'); ?>
-<?php if (version_compare(INTL_ICU_VERSION, '54.1') < 0) die('skip for ICU >= 54.1'); ?>
-<?php if (version_compare(INTL_ICU_VERSION, '57.1') < 0) die('skip for ICU >= 58.1'); ?>
+<?php if (version_compare(INTL_ICU_VERSION, '58.1') < 0) die('skip for ICU >= 58.1'); ?>
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/dateformat_get_set_calendar_variant4.phpt b/ext/intl/tests/dateformat_get_set_calendar_variant4.phpt
index 884f46980d..1d9ab7ecf5 100644
--- a/ext/intl/tests/dateformat_get_set_calendar_variant4.phpt
+++ b/ext/intl/tests/dateformat_get_set_calendar_variant4.phpt
@@ -4,7 +4,7 @@ IntlDateFormatter: setCalendar()/getCalendar()/getCalendarObject()
 <?php
 if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
 <?php if (version_compare(INTL_ICU_VERSION, '54.1') < 0) die('skip for ICU >= 54.1'); ?>
-<?php if (version_compare(INTL_ICU_VERSION, '57.1') >= 0) die('skip for ICU <= 57.1'); ?>
+<?php if (version_compare(INTL_ICU_VERSION, '58.1') >= 0) die('skip for ICU <= 57.1'); ?>
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/dateformat_get_set_calendar_variant5.phpt b/ext/intl/tests/dateformat_get_set_calendar_variant5.phpt
index de16dc89b3..43e9a8516b 100644
--- a/ext/intl/tests/dateformat_get_set_calendar_variant5.phpt
+++ b/ext/intl/tests/dateformat_get_set_calendar_variant5.phpt
@@ -3,8 +3,7 @@ IntlDateFormatter: setCalendar()/getCalendar()/getCalendarObject()
 --SKIPIF--
 <?php
 if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
-<?php if (version_compare(INTL_ICU_VERSION, '54.1') < 0) die('skip for ICU >= 54.1'); ?>
-<?php if (version_compare(INTL_ICU_VERSION, '57.1') < 0) die('skip for ICU >= 58.1'); ?>
+<?php if (version_compare(INTL_ICU_VERSION, '58.1') < 0) die('skip for ICU >= 58.1'); ?>
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/uconverter_oop_callback.phpt b/ext/intl/tests/uconverter_oop_callback.phpt
index 9e79b543b2..4c31babf86 100644
--- a/ext/intl/tests/uconverter_oop_callback.phpt
+++ b/ext/intl/tests/uconverter_oop_callback.phpt
@@ -2,7 +2,7 @@
 UConverter::convert() w/ Callback Reasons
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
-<?php if (version_compare(INTL_ICU_VERSION, '57.1') >= 0) die('skip for ICU <= 57.1'); ?>
+<?php if (version_compare(INTL_ICU_VERSION, '58.1') >= 0) die('skip for ICU <= 57.1'); ?>
 --FILE--
 <?php
 class MyConverter extends UConverter {
diff --git a/ext/intl/tests/uconverter_oop_callback2.phpt b/ext/intl/tests/uconverter_oop_callback2.phpt
index dba70be460..aaa4db0c9a 100644
--- a/ext/intl/tests/uconverter_oop_callback2.phpt
+++ b/ext/intl/tests/uconverter_oop_callback2.phpt
@@ -2,7 +2,7 @@
 UConverter::convert() w/ Callback Reasons
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
-<?php if (version_compare(INTL_ICU_VERSION, '57.1') < 0) die('skip for ICU >= 58.1'); ?>
+<?php if (version_compare(INTL_ICU_VERSION, '58.1') < 0) die('skip for ICU >= 58.1'); ?>
 --FILE--
 <?php
 class MyConverter extends UConverter {
-- 
2.40.0