Merge branch 'PHP-7.4'

* PHP-7.4:
  Skip IntlTimeZone::getOffset() error tests on non-x86

Author: nikic

ext/intl/tests/timezone_getErrorCodeMessage_basic.phpt

@@ -4,6 +4,11 @@ IntlTimeZone::getErrorCode/Message(): basic test
 <?php
 if (!extension_loaded('intl'))
 	die('skip intl extension not enabled');
+/* INF being an invalid offset depends on UB in float->int cast behavior. */
+$arch = php_uname('m');
+if ($arch != 'x86_64' && $arch != 'i386')
+    die('skip requires x86');
+?>
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
@@ -28,4 +33,4 @@ Warning: IntlTimeZone::getOffset(): intltz_get_offset: error obtaining offset in
 bool(false)
 int(1)
 string(67) "intltz_get_offset: error obtaining offset: U_ILLEGAL_ARGUMENT_ERROR"
-==DONE==
+==DONE==

ext/intl/tests/timezone_getOffset_error.phpt

@@ -4,6 +4,12 @@ IntlTimeZone::getOffset(): errors
 <?php
 if (!extension_loaded('intl'))
 	die('skip intl extension not enabled');
+
+/* INF being an invalid offset depends on UB in float->int cast behavior. */
+$arch = php_uname('m');
+if ($arch != 'x86_64' && $arch != 'i386')
+    die('skip requires x86');
+?>
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);