From c5401854fcea27ff9aabfd0682ff4d81bbb3c888 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 18 Sep 2020 14:28:32 +0200 Subject: Run tidy This should fix most of the remaining issues with tabs and spaces being mixed in tests. --- ext/intl/tests/breakiter___construct.phpt | 2 +- ext/intl/tests/breakiter_clone_basic.phpt | 2 +- ext/intl/tests/breakiter_createCodePointInstance_basic.phpt | 2 +- ext/intl/tests/breakiter_current_basic.phpt | 2 +- ext/intl/tests/breakiter_factories_basic.phpt | 2 +- ext/intl/tests/breakiter_first_basic.phpt | 2 +- ext/intl/tests/breakiter_following_basic.phpt | 2 +- ext/intl/tests/breakiter_getPartsIterator_basic.phpt | 2 +- ext/intl/tests/breakiter_getPartsIterator_basic2.phpt | 2 +- ext/intl/tests/breakiter_getPartsIterator_error.phpt | 2 +- ext/intl/tests/breakiter_getPartsIterator_var1.phpt | 2 +- ext/intl/tests/breakiter_getText_basic.phpt | 2 +- ext/intl/tests/breakiter_isBoundary_basic.phpt | 2 +- ext/intl/tests/breakiter_last_basic.phpt | 2 +- ext/intl/tests/breakiter_next_basic.phpt | 2 +- ext/intl/tests/breakiter_preceding_basic.phpt | 2 +- ext/intl/tests/breakiter_preceding_basic2.phpt | 2 +- ext/intl/tests/breakiter_previous_basic.phpt | 2 +- ext/intl/tests/breakiter_setText_basic.phpt | 2 +- ext/intl/tests/bug58756_MessageFormatter.phpt | 4 ++-- ext/intl/tests/bug58756_MessageFormatter_variant2.phpt | 4 ++-- ext/intl/tests/bug60192-compare.phpt | 2 +- ext/intl/tests/bug60192-getlocale.phpt | 2 +- ext/intl/tests/bug60192-getsortkey.phpt | 2 +- ext/intl/tests/bug60192-sort.phpt | 2 +- ext/intl/tests/bug60192-sortwithsortkeys.phpt | 2 +- ext/intl/tests/bug62017.phpt | 2 +- ext/intl/tests/bug62081.phpt | 2 +- ext/intl/tests/bug62082.phpt | 2 +- ext/intl/tests/bug62083.phpt | 2 +- ext/intl/tests/bug62915-2.phpt | 4 ++-- ext/intl/tests/bug62915.phpt | 2 +- ext/intl/tests/bug74484_MessageFormatter.phpt | 2 +- ext/intl/tests/calendar_add_basic.phpt | 2 +- ext/intl/tests/calendar_add_error.phpt | 2 +- ext/intl/tests/calendar_before_after_error.phpt | 2 +- ext/intl/tests/calendar_clear_basic.phpt | 2 +- ext/intl/tests/calendar_clear_error.phpt | 2 +- ext/intl/tests/calendar_clear_variation1.phpt | 2 +- ext/intl/tests/calendar_const_field_field_count.phpt | 2 +- ext/intl/tests/calendar_createInstance_basic.phpt | 2 +- ext/intl/tests/calendar_createInstance_error.phpt | 2 +- ext/intl/tests/calendar_createInstance_variation1.phpt | 2 +- ext/intl/tests/calendar_equals_before_after_basic.phpt | 2 +- ext/intl/tests/calendar_equals_error.phpt | 2 +- ext/intl/tests/calendar_fieldDifference_basic.phpt | 2 +- ext/intl/tests/calendar_fieldDifference_error.phpt | 2 +- ext/intl/tests/calendar_fromDateTime_basic.phpt | 2 +- ext/intl/tests/calendar_fromDateTime_error.phpt | 2 +- ext/intl/tests/calendar_getAvailableLocales_basic.phpt | 2 +- ext/intl/tests/calendar_getDayOfWeekType_basic.phpt | 4 ++-- ext/intl/tests/calendar_getDayOfWeekType_basic2.phpt | 4 ++-- ext/intl/tests/calendar_getDayOfWeekType_error.phpt | 2 +- ext/intl/tests/calendar_getErrorCode_error.phpt | 2 +- ext/intl/tests/calendar_getErrorCode_getErrorMessage_basic.phpt | 2 +- ext/intl/tests/calendar_getErrorMessage_error.phpt | 2 +- ext/intl/tests/calendar_getFirstDayOfWeek_basic.phpt | 2 +- ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt | 2 +- ext/intl/tests/calendar_getKeywordValuesForLocale_basic.phpt | 2 +- ext/intl/tests/calendar_getLocale_basic.phpt | 2 +- ext/intl/tests/calendar_getLocale_error.phpt | 2 +- ext/intl/tests/calendar_getMinimalDaysInFirstWeek_basic.phpt | 2 +- ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt | 2 +- ext/intl/tests/calendar_getNow_basic.phpt | 2 +- .../tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt | 2 +- ext/intl/tests/calendar_getTimeZone_basic.phpt | 2 +- ext/intl/tests/calendar_getTimeZone_error.phpt | 2 +- ext/intl/tests/calendar_getTime_basic.phpt | 2 +- ext/intl/tests/calendar_getTime_error.phpt | 2 +- ext/intl/tests/calendar_getType_basic.phpt | 2 +- ext/intl/tests/calendar_getType_error.phpt | 2 +- ext/intl/tests/calendar_getWeekendTransition_basic.phpt | 2 +- ext/intl/tests/calendar_getWeekendTransition_error.phpt | 2 +- ext/intl/tests/calendar_getXMaximum_basic.phpt | 2 +- ext/intl/tests/calendar_getXMinimum_basic.phpt | 2 +- .../tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt | 2 +- ext/intl/tests/calendar_get_basic.phpt | 2 +- ext/intl/tests/calendar_get_getActualMaximum_Minumum_error.phpt | 2 +- ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt | 2 +- ext/intl/tests/calendar_get_setRepeatedWallTimeOption_basic.phpt | 2 +- ext/intl/tests/calendar_get_setSkippedWallTimeOption_basic.phpt | 2 +- ext/intl/tests/calendar_inDaylightTime_basic.phpt | 2 +- ext/intl/tests/calendar_inDaylightTime_error.phpt | 2 +- ext/intl/tests/calendar_isEquivalentTo_basic.phpt | 2 +- ext/intl/tests/calendar_isEquivalentTo_error.phpt | 2 +- ext/intl/tests/calendar_isLenient_error.phpt | 2 +- ext/intl/tests/calendar_isSet_basic.phpt | 2 +- ext/intl/tests/calendar_isSet_error.phpt | 2 +- ext/intl/tests/calendar_isWeekend_basic.phpt | 2 +- ext/intl/tests/calendar_isWeekend_error.phpt | 2 +- ext/intl/tests/calendar_is_set_lenient_basic.phpt | 2 +- ext/intl/tests/calendar_roll_basic.phpt | 2 +- ext/intl/tests/calendar_roll_error.phpt | 2 +- ext/intl/tests/calendar_roll_variation1.phpt | 2 +- ext/intl/tests/calendar_setFirstDayOfWeek_basic.phpt | 2 +- ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt | 2 +- ext/intl/tests/calendar_setLenient_error.phpt | 2 +- ext/intl/tests/calendar_setMinimalDaysInFirstWeek_basic.phpt | 2 +- ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt | 2 +- .../tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt | 2 +- ext/intl/tests/calendar_setTimeZone_basic.phpt | 2 +- ext/intl/tests/calendar_setTimeZone_error.phpt | 2 +- ext/intl/tests/calendar_setTimeZone_error2.phpt | 2 +- ext/intl/tests/calendar_setTimeZone_variation1.phpt | 2 +- ext/intl/tests/calendar_setTimeZone_variation2.phpt | 2 +- ext/intl/tests/calendar_setTime_basic.phpt | 2 +- ext/intl/tests/calendar_setTime_error.phpt | 2 +- ext/intl/tests/calendar_set_basic.phpt | 2 +- ext/intl/tests/calendar_set_error.phpt | 2 +- ext/intl/tests/calendar_set_variation1.phpt | 2 +- ext/intl/tests/calendar_toDateTime_basic.phpt | 2 +- ext/intl/tests/calendar_toDateTime_error.phpt | 2 +- ext/intl/tests/cpbi_clone_equality.phpt | 2 +- ext/intl/tests/cpbi_getLastCodePoint_basic.phpt | 2 +- ext/intl/tests/cpbi_parts_iterator.phpt | 2 +- ext/intl/tests/dateformat___construct_bad_tz_cal.phpt | 2 +- ext/intl/tests/dateformat_formatObject_error.phpt | 2 +- ext/intl/tests/dateformat_setTimeZone_error.phpt | 2 +- ext/intl/tests/gregoriancalendar___construct_basic.phpt | 2 +- ext/intl/tests/gregoriancalendar___construct_error.phpt | 2 +- ext/intl/tests/gregoriancalendar___construct_variant1.phpt | 2 +- ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt | 2 +- .../tests/gregoriancalendar_get_setGregorianChange_basic.phpt | 2 +- ext/intl/tests/gregoriancalendar_isLeapYear_basic.phpt | 2 +- ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt | 2 +- ext/intl/tests/idn_uts46_basic.phpt | 8 ++++---- ext/intl/tests/idn_uts46_errors.phpt | 8 ++++---- ext/intl/tests/msgfmt_bug70484.phpt | 2 +- ext/intl/tests/msgfmt_format_datetime.phpt | 2 +- ext/intl/tests/msgfmt_format_error1.phpt | 2 +- ext/intl/tests/msgfmt_format_error2.phpt | 2 +- ext/intl/tests/msgfmt_format_error3.phpt | 2 +- ext/intl/tests/msgfmt_format_error4.phpt | 2 +- ext/intl/tests/msgfmt_format_error5.phpt | 2 +- ext/intl/tests/msgfmt_format_error6.phpt | 2 +- ext/intl/tests/msgfmt_format_mixed_params.phpt | 2 +- ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt | 2 +- ext/intl/tests/msgfmt_format_subpatterns.phpt | 2 +- ext/intl/tests/msgfmt_format_subpatterns_named.phpt | 2 +- ext/intl/tests/msgfmt_millisecond_dates.phpt | 2 +- ext/intl/tests/msgfmt_setPattern_cache.phpt | 2 +- ext/intl/tests/rbbiter___construct_basic.phpt | 2 +- ext/intl/tests/rbbiter_getRuleStatusVec_basic.phpt | 2 +- ext/intl/tests/rbbiter_getRuleStatus_basic.phpt | 2 +- ext/intl/tests/spoofchecker_007.phpt | 8 ++++---- ext/intl/tests/timezone_IDforWindowsID_basic.phpt | 2 +- ext/intl/tests/timezone_IDforWindowsID_basic2.phpt | 2 +- ext/intl/tests/timezone_clone_basic.phpt | 2 +- ext/intl/tests/timezone_clone_error.phpt | 2 +- ext/intl/tests/timezone_countEquivalentIDs_basic.phpt | 2 +- ext/intl/tests/timezone_countEquivalentIDs_error.phpt | 2 +- ext/intl/tests/timezone_createDefault_basic.phpt | 2 +- ext/intl/tests/timezone_createEnumeration_basic.phpt | 2 +- ext/intl/tests/timezone_createEnumeration_error.phpt | 2 +- ext/intl/tests/timezone_createEnumeration_variation1.phpt | 2 +- ext/intl/tests/timezone_createEnumeration_variation2.phpt | 2 +- ext/intl/tests/timezone_createTimeZoneIDEnumeration_basic.phpt | 2 +- ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt | 2 +- ext/intl/tests/timezone_createTimeZoneIDEnumeration_variant1.phpt | 2 +- ext/intl/tests/timezone_createTimeZoneIDEnumeration_variant2.phpt | 2 +- ext/intl/tests/timezone_createTimeZone_basic.phpt | 2 +- ext/intl/tests/timezone_createTimeZone_error.phpt | 2 +- ext/intl/tests/timezone_equals_basic.phpt | 2 +- ext/intl/tests/timezone_equals_error.phpt | 2 +- ext/intl/tests/timezone_fromDateTimeZone_basic.phpt | 2 +- ext/intl/tests/timezone_fromDateTimeZone_error.phpt | 2 +- ext/intl/tests/timezone_getCanonicalID_basic.phpt | 2 +- ext/intl/tests/timezone_getCanonicalID_error.phpt | 2 +- ext/intl/tests/timezone_getDSTSavings_basic.phpt | 2 +- ext/intl/tests/timezone_getDSTSavings_error.phpt | 2 +- ext/intl/tests/timezone_getDisplayName_basic.phpt | 2 +- ext/intl/tests/timezone_getDisplayName_error.phpt | 2 +- ext/intl/tests/timezone_getDisplayName_variant1.phpt | 2 +- ext/intl/tests/timezone_getEquivalentID_basic.phpt | 2 +- ext/intl/tests/timezone_getEquivalentID_error.phpt | 2 +- ext/intl/tests/timezone_getErrorCodeMessage_basic.phpt | 2 +- ext/intl/tests/timezone_getErrorCode_error.phpt | 2 +- ext/intl/tests/timezone_getErrorMessage_error.phpt | 2 +- ext/intl/tests/timezone_getGMT_basic.phpt | 2 +- ext/intl/tests/timezone_getID_error.phpt | 2 +- ext/intl/tests/timezone_getOffset_basic.phpt | 2 +- ext/intl/tests/timezone_getOffset_error.phpt | 2 +- ext/intl/tests/timezone_getRawOffset_basic.phpt | 2 +- ext/intl/tests/timezone_getRawOffset_error.phpt | 2 +- ext/intl/tests/timezone_getRegion_basic.phpt | 2 +- ext/intl/tests/timezone_getRegion_error.phpt | 2 +- ext/intl/tests/timezone_getTZData_basic.phpt | 2 +- ext/intl/tests/timezone_getUnknown_basic.phpt | 2 +- ext/intl/tests/timezone_hasSameRules_basic.phpt | 2 +- ext/intl/tests/timezone_hasSameRules_error.phpt | 2 +- ext/intl/tests/timezone_toDateTimeZone_basic.phpt | 2 +- ext/intl/tests/timezone_toDateTimeZone_error.phpt | 2 +- ext/intl/tests/timezone_useDaylightTime_basic.phpt | 2 +- ext/intl/tests/timezone_useDaylightTime_error.phpt | 2 +- ext/intl/tests/timezone_windowsID_basic.phpt | 2 +- ext/intl/tests/timezone_windowsID_basic2.phpt | 2 +- 196 files changed, 210 insertions(+), 210 deletions(-) (limited to 'ext/intl') diff --git a/ext/intl/tests/breakiter___construct.phpt b/ext/intl/tests/breakiter___construct.phpt index 16ca32bf18..716de728ae 100644 --- a/ext/intl/tests/breakiter___construct.phpt +++ b/ext/intl/tests/breakiter___construct.phpt @@ -3,7 +3,7 @@ IntlBreakIterator::__construct() should not be callable --SKIPIF-- 0) die('skip for ICU <= 57.1'); ?> --FILE-- diff --git a/ext/intl/tests/breakiter_getPartsIterator_basic2.phpt b/ext/intl/tests/breakiter_getPartsIterator_basic2.phpt index 834da13ece..826f57e45a 100644 --- a/ext/intl/tests/breakiter_getPartsIterator_basic2.phpt +++ b/ext/intl/tests/breakiter_getPartsIterator_basic2.phpt @@ -3,7 +3,7 @@ IntlBreakIterator::getPartsIterator(): basic test, ICU >= 58.1 --SKIPIF-- = 58.1'); ?> --FILE-- diff --git a/ext/intl/tests/breakiter_getPartsIterator_error.phpt b/ext/intl/tests/breakiter_getPartsIterator_error.phpt index f86e64d4cc..cd518b19d4 100644 --- a/ext/intl/tests/breakiter_getPartsIterator_error.phpt +++ b/ext/intl/tests/breakiter_getPartsIterator_error.phpt @@ -3,7 +3,7 @@ IntlBreakIterator::getPartsIterator(): bad args --SKIPIF-- 0) die('skip for ICU <= 57.1'); ?> --FILE-- diff --git a/ext/intl/tests/breakiter_preceding_basic2.phpt b/ext/intl/tests/breakiter_preceding_basic2.phpt index 8c1ee625e4..53446b2f6b 100644 --- a/ext/intl/tests/breakiter_preceding_basic2.phpt +++ b/ext/intl/tests/breakiter_preceding_basic2.phpt @@ -3,7 +3,7 @@ IntlBreakIterator::preceding(): basic test, ICU >= 58.1 --SKIPIF-- = 58.1'); --FILE-- = 0) - die('skip for ICU < 51.2'); + die('skip for ICU < 51.2'); ?> --FILE-- = 51.2'); + die('skip for ICU >= 51.2'); ?> --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- = 0) - die('skip for ICU < 52.1'); + die('skip for ICU < 52.1'); --FILE-- = 52.1'); + die('skip for ICU >= 52.1'); --FILE-- getConstant("SINGLE_SCRIPT_RESTRICTIVE")) { - die("skip Incompatible ICU version"); - } + $r = new ReflectionClass("SpoofChecker"); + if (false === $r->getConstant("SINGLE_SCRIPT_RESTRICTIVE")) { + die("skip Incompatible ICU version"); + } ?> --FILE-- + die('skip intl extension not enabled'); ?> = 52'); ?> = 0) die('skip for ICU <= 57.1'); ?> --FILE-- diff --git a/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt b/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt index 5008c2b66a..064c5826d8 100644 --- a/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt +++ b/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt @@ -3,7 +3,7 @@ IntlTimeZone::getIDForWindowsID basic test --SKIPIF-- + die('skip intl extension not enabled'); ?> = 58.1'); ?> --FILE-- int cast behavior. */ $arch = php_uname('m'); if ($arch != 'x86_64' && $arch != 'i386') diff --git a/ext/intl/tests/timezone_getErrorCode_error.phpt b/ext/intl/tests/timezone_getErrorCode_error.phpt index c20e3c666a..c44a910726 100644 --- a/ext/intl/tests/timezone_getErrorCode_error.phpt +++ b/ext/intl/tests/timezone_getErrorCode_error.phpt @@ -3,7 +3,7 @@ IntlTimeZone::getErrorCode(): errors --SKIPIF-- int cast behavior. */ $arch = php_uname('m'); diff --git a/ext/intl/tests/timezone_getRawOffset_basic.phpt b/ext/intl/tests/timezone_getRawOffset_basic.phpt index bfbf2710ca..6f85e9fc9c 100644 --- a/ext/intl/tests/timezone_getRawOffset_basic.phpt +++ b/ext/intl/tests/timezone_getRawOffset_basic.phpt @@ -3,7 +3,7 @@ IntlTimeZone::getRawOffset(): basic test --SKIPIF-- + die('skip intl extension not enabled'); ?> = 52'); ?> = 0) die('skip for ICU <= 57.1'); ?> --FILE-- diff --git a/ext/intl/tests/timezone_windowsID_basic2.phpt b/ext/intl/tests/timezone_windowsID_basic2.phpt index 7c00b646b6..32f80596c4 100644 --- a/ext/intl/tests/timezone_windowsID_basic2.phpt +++ b/ext/intl/tests/timezone_windowsID_basic2.phpt @@ -3,7 +3,7 @@ IntlTimeZone::getWindowsID basic test --SKIPIF-- + die('skip intl extension not enabled'); ?> = 58.1'); ?> --FILE--