From 9c8b3ae43fc4cfb5818dccc5f48f4ee1ba967fa1 Mon Sep 17 00:00:00 2001
From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Fri, 27 Jul 2018 00:19:13 -0300
Subject: [PATCH] Make more tests run on 64bit plataforms

---
 Zend/tests/bug74603.phpt                      |   4 ----
 ..._overflow_32bit.phpt => oct_overflow.phpt} |   2 --
 ext/exif/tests/exif_tagname_variation1.phpt   |   4 +---
 ext/json/tests/pass001.1.phpt                 |   3 +--
 .../symlink_link_linkinfo_is_link_error1.phpt |   3 ---
 .../symlink_link_linkinfo_is_link_error2.phpt |   3 ---
 ...link_link_linkinfo_is_link_variation6.phpt |   3 ---
 .../general_functions/debug_zval_dump_b.phpt  | Bin 4554 -> 4461 bytes
 .../tests/general_functions/print_r.phpt      |   4 ----
 ext/standard/tests/mail/ezmlm_hash_basic.phpt |   6 +-----
 ext/standard/tests/strings/crc32_basic.phpt   |   8 +-------
 ext/standard/tests/strings/crc32_error.phpt   |   8 +-------
 .../tests/strings/strripos_offset.phpt        |   2 --
 .../tests/strings/strrpos_offset.phpt         |   2 --
 .../bitwiseShiftLeft_variationStr.phpt        |   4 ----
 .../lang/operators/operator_gt_variation.phpt |   4 ----
 .../lang/operators/operator_lt_variation.phpt |   4 ----
 17 files changed, 5 insertions(+), 59 deletions(-)
 rename Zend/tests/{oct_overflow_32bit.phpt => oct_overflow.phpt} (79%)

diff --git a/Zend/tests/bug74603.phpt b/Zend/tests/bug74603.phpt
index b3194ecd48f..5a5e40292e7 100644
--- a/Zend/tests/bug74603.phpt
+++ b/Zend/tests/bug74603.phpt
@@ -1,9 +1,5 @@
 --TEST--
 Bug #74603 (PHP INI Parsing Stack Buffer Overflow Vulnerability)
---SKIPIF--
-<?php
-if (PHP_INT_MAX !== 2147483647)
-        die('skip for 32-bit only');
 --FILE--
 <?php
 var_dump(parse_ini_file(__DIR__ . "/bug74603.ini", true, INI_SCANNER_NORMAL));
diff --git a/Zend/tests/oct_overflow_32bit.phpt b/Zend/tests/oct_overflow.phpt
similarity index 79%
rename from Zend/tests/oct_overflow_32bit.phpt
rename to Zend/tests/oct_overflow.phpt
index 5b62778e406..77e4d2a8bc6 100644
--- a/Zend/tests/oct_overflow_32bit.phpt
+++ b/Zend/tests/oct_overflow.phpt
@@ -2,8 +2,6 @@
 testing integer overflow (32bit)
 --INI--
 precision=14
---SKIPIF--
-<?php if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?>
 --FILE--
 <?php
 
diff --git a/ext/exif/tests/exif_tagname_variation1.phpt b/ext/exif/tests/exif_tagname_variation1.phpt
index 207b200aac2..d6dd0ffc97e 100644
--- a/ext/exif/tests/exif_tagname_variation1.phpt
+++ b/ext/exif/tests/exif_tagname_variation1.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Test exif_tagname() function : usage variations  - different types for index argument
 --SKIPIF--
-<?php if (!extension_loaded('exif')) print 'skip exif extension not available';
-if (PHP_INT_SIZE != 4) die('skip 32-bit only');
-?>
+<?php if (!extension_loaded('exif')) print 'skip exif extension not available'; ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/pass001.1.phpt b/ext/json/tests/pass001.1.phpt
index aced88fee24..7ac87cbdd88 100644
--- a/ext/json/tests/pass001.1.phpt
+++ b/ext/json/tests/pass001.1.phpt
@@ -4,8 +4,7 @@ JSON (http://www.crockford.com/JSON/JSON_checker/test/pass1.json)
 serialize_precision=-1
 --SKIPIF--
 <?php
-if (!extension_loaded('json')) die('skip');
-if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
+if (!extension_loaded('json')) die('skip json extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_error1.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_error1.phpt
index 8aae9b3bca1..7e8b5b24cf8 100644
--- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_error1.phpt
+++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_error1.phpt
@@ -8,9 +8,6 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 if (substr(PHP_OS, 0, 3) == 'SUN') {
   die('skip Not valid for Sun Solaris');
 }
-if (PHP_INT_SIZE != 4) {
-  die("skip this test is for 32bit platform only");
-}
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt
index 98ce6211dad..0386e644158 100644
--- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt
+++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt
@@ -5,9 +5,6 @@ Test symlink(), linkinfo(), link() and is_link() functions : error conditions -
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip no symlinks on Windows');
 }
-if (PHP_INT_SIZE != 4) {
-  die("skip this test is for 32bit platform only");
-}
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt
index 9b9afba10dc..e2f30cdfda8 100644
--- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt
+++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt
@@ -8,9 +8,6 @@ if ( substr(PHP_OS, 0, 3) == 'WIN' ) {
 if ( substr(PHP_OS, 0, 3) == 'MAC' ) {
     die('skip Not valid for MacOS');
 }
-if (PHP_INT_SIZE != 4) {
-  die("skip this test is for 32bit platform only");
-}
 
 // Skip if being run by root (files are always readable, writeable and executable)
 $filename = dirname(__FILE__)."/symlink_link_linkinfo_is_link6_check_root.tmp";
diff --git a/ext/standard/tests/general_functions/debug_zval_dump_b.phpt b/ext/standard/tests/general_functions/debug_zval_dump_b.phpt
index ec8e0a66ed7d6d3e24f02d3d138d5b04eda516c1..5c6fe3652333ef6b95fb89395a5e109550bc739a 100644
GIT binary patch
delta 10
RcmX@5{8nj#-NxDaf&d#C1Xln6

delta 101
zcmaE>bV_-GT~x5QXMm@ht}d62eL+S6S7w@mMu0~^yr*ACe6VMftAe7ff{CU=N@l8t
zQgL=>fkH_}X0bv^YH^7IkWR}lQZP13$}CYR$Vn^#@^TgO^KvScG_ASp?KWB)2?79F
CEFaGR

diff --git a/ext/standard/tests/general_functions/print_r.phpt b/ext/standard/tests/general_functions/print_r.phpt
index e502f612911..5069dd33f18 100644
--- a/ext/standard/tests/general_functions/print_r.phpt
+++ b/ext/standard/tests/general_functions/print_r.phpt
@@ -1,9 +1,5 @@
 --TEST--
 Test print_r() function
---SKIPIF--
-<?php
-if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
-?>
 --INI--
 precision=14
 --FILE--
diff --git a/ext/standard/tests/mail/ezmlm_hash_basic.phpt b/ext/standard/tests/mail/ezmlm_hash_basic.phpt
index 2f810e2562a..da629e9e122 100644
--- a/ext/standard/tests/mail/ezmlm_hash_basic.phpt
+++ b/ext/standard/tests/mail/ezmlm_hash_basic.phpt
@@ -1,9 +1,5 @@
 --TEST--
-Test ezmlm_hash() function : basic functionality 
---SKIPIF--
-<?php
-if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
-?>
+Test ezmlm_hash() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : int ezmlm_hash  ( string $addr  )
diff --git a/ext/standard/tests/strings/crc32_basic.phpt b/ext/standard/tests/strings/crc32_basic.phpt
index 3aa780d113d..2ddc2f96185 100644
--- a/ext/standard/tests/strings/crc32_basic.phpt
+++ b/ext/standard/tests/strings/crc32_basic.phpt
@@ -1,11 +1,5 @@
 --TEST--
-Test crc32() function : basic functionality 
---SKIPIF--
-<?php
-if (PHP_INT_SIZE != 4) 
-  die("skip this test is for 32bit platform only");
-?>
-
+Test crc32() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string crc32(string $str)
diff --git a/ext/standard/tests/strings/crc32_error.phpt b/ext/standard/tests/strings/crc32_error.phpt
index 45378204cd4..71798ed002d 100644
--- a/ext/standard/tests/strings/crc32_error.phpt
+++ b/ext/standard/tests/strings/crc32_error.phpt
@@ -1,11 +1,5 @@
 --TEST--
-Test crc32() function : error conditions 
---SKIPIF--
-<?php
-if (PHP_INT_SIZE != 4) 
-  die("skip this test is for 32bit platform only");
-?>
-
+Test crc32() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string crc32(string $str)
diff --git a/ext/standard/tests/strings/strripos_offset.phpt b/ext/standard/tests/strings/strripos_offset.phpt
index 080f87050d8..81e4e2ba8a8 100644
--- a/ext/standard/tests/strings/strripos_offset.phpt
+++ b/ext/standard/tests/strings/strripos_offset.phpt
@@ -1,7 +1,5 @@
 --TEST--
 strripos() offset integer overflow
---SKIPIF--
-<?php if (PHP_INT_SIZE !== 4) die("skip this test is for 32-bit only");
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/strrpos_offset.phpt b/ext/standard/tests/strings/strrpos_offset.phpt
index 72f0c5f5287..6ecab108dcd 100644
--- a/ext/standard/tests/strings/strrpos_offset.phpt
+++ b/ext/standard/tests/strings/strrpos_offset.phpt
@@ -1,7 +1,5 @@
 --TEST--
 strrpos() offset integer overflow
---SKIPIF--
-<?php if (PHP_INT_SIZE !== 4) die("skip this test is for 32-bit only");
 --FILE--
 <?php
 
diff --git a/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt b/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt
index 0176d907389..7300eca02c6 100644
--- a/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt
+++ b/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt
@@ -1,9 +1,5 @@
 --TEST--
 Test << operator : various numbers as strings
---SKIPIF--
-<?php
-if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
-?>
 --FILE--
 <?php
 
diff --git a/tests/lang/operators/operator_gt_variation.phpt b/tests/lang/operators/operator_gt_variation.phpt
index ff15550dbe2..937ebbbb631 100644
--- a/tests/lang/operators/operator_gt_variation.phpt
+++ b/tests/lang/operators/operator_gt_variation.phpt
@@ -1,9 +1,5 @@
 --TEST--
 Test > operator : max int 32bit range
---SKIPIF--
-<?php
-if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
-?>
 --FILE--
 <?php
  
diff --git a/tests/lang/operators/operator_lt_variation.phpt b/tests/lang/operators/operator_lt_variation.phpt
index 4f468638dcd..f210fe4657d 100644
--- a/tests/lang/operators/operator_lt_variation.phpt
+++ b/tests/lang/operators/operator_lt_variation.phpt
@@ -1,9 +1,5 @@
 --TEST--
 Test < operator : max int 32bit range
---SKIPIF--
-<?php
-if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
-?>
 --FILE--
 <?php