Fix miscellaneous test failures/BORKED

The libxml borked warning was unrelated

Fix 32-bit builds and soap tests.

Make it so the same warnings would be emitted both
for 32-bit and 64-bit builds

Author: TysonAndre

Zend/tests/binary-32bit.phpt

@@ -77,7 +77,10 @@ var_dump(-0b11111111111111111111111111111111);
 var_dump(-0b1111111111111111111111111111111);
 var_dump(-0b111111111111111111111111111111);
 var_dump(-0b1);
---EXPECT--
+--EXPECTF--
+Warning: Saw imprecise float binary literal - the last 11 non-zero bits were truncated in %sbinary-32bit.php on line 65
+
+Warning: Saw imprecise float binary literal - the last 11 non-zero bits were truncated in %sbinary-32bit.php on line 67
 int(1)
 int(3)
 int(7)
@@ -149,4 +152,4 @@ float(-8589934591)
 float(-4294967295)
 int(-2147483647)
 int(-1073741823)
-int(-1)
+int(-1)

Zend/tests/binary_overflow_number.phpt

@@ -5,11 +5,11 @@ Octal overflow in numeric literal warning
 // rounding down
 var_dump(eval('return 0b1011111111111111111111111111111111111111111111111111100000000000;'));
 var_dump(eval('return 0b1011111111111111111111111111111111111111111111111111100000000001;'));
-// rounding up
+echo "test rounding up\n";
 var_dump(eval('return 0b1011111111111111111111111111111111111111111111111111111111111111;'));
 var_dump(eval('return 0b1011111111111111111111111111111111111111111111111111110000000000;'));
 var_dump(eval('return 0b1011111111111111111111111111111111111111111111111111111000000000;'));
-// don't count _ or leading 0s
+echo "test don't count _ or leading 0s\n";
 var_dump(eval('return     0b111_111_111_111_111_111_111_111_111_111_111_111_111_111_111_111_111_111_000_000_000_0;'));
 var_dump(eval('return 0b000_111_111_111_111_111_111_111_111_111_111_111_111_111_111_111_111_111_111_000_000_000_0;'));
 var_dump(eval('return 0b1111111111111111111111111111111111111111111111111111111111111111;'));
@@ -19,6 +19,7 @@ float(1.383505805528216E+19)
 
 Warning: Saw imprecise float binary literal - the last 11 non-zero bits were truncated in %sbinary_overflow_number.php(4) : eval()'d code on line 1
 float(1.383505805528216E+19)
+test rounding up
 
 Warning: Saw imprecise float binary literal - the last 11 non-zero bits were truncated in %sbinary_overflow_number.php(6) : eval()'d code on line 1
 float(1.3835058055282164E+19)
@@ -28,6 +29,7 @@ float(1.3835058055282164E+19)
 
 Warning: Saw imprecise float binary literal - the last 2 non-zero bits were truncated in %sbinary_overflow_number.php(8) : eval()'d code on line 1
 float(1.3835058055282164E+19)
+test don't count _ or leading 0s
 
 Warning: Saw imprecise float binary literal - the last 1 non-zero bits were truncated in %sbinary_overflow_number.php(10) : eval()'d code on line 1
 float(1.844674407370955E+19)

Zend/tests/hex_overflow_32bit.phpt

@@ -22,6 +22,11 @@ foreach ($doubles as $d) {
 echo "Done\n";
 ?>
 --EXPECTF--
+Warning: Saw imprecise float hex literal - the last 19 non-zero bits were truncated in %shex_overflow_32bit.php on line 5
+
+Warning: Saw imprecise float hex literal - the last 51 non-zero bits were truncated in %shex_overflow_32bit.php on line 6
+
+Warning: Saw imprecise float hex literal - the last 38 non-zero bits were truncated in %shex_overflow_32bit.php on line 7
 float(4.0833602971%dE+14)
 float(4.7223664828%dE+21)
 float(1.3521606402%dE+31)

Zend/zend_language_scanner.l

@@ -2033,14 +2033,15 @@ NEWLINE ("\r"|"\n"|"\r\n")
 		RETURN_TOKEN_WITH_VAL(T_LNUMBER);
 	} else {
 		const char* last_one_bit = bin + len - 1;
+		ZVAL_DOUBLE(zendlval, zend_bin_strtod(bin, (const char **)&end));
+		ZEND_ASSERT(end == bin + len);
 		while (*last_one_bit == '0') {
 			last_one_bit--;
 			ZEND_ASSERT(last_one_bit > bin);
 		}
-		ZVAL_DOUBLE(zendlval, zend_bin_strtod(bin, (const char **)&end));
 		/* errno isn't checked since we allow HUGE_VAL/INF overflow */
-		ZEND_ASSERT(end == bin + len);
-		if (last_one_bit - bin + 1> 53) {
+		/* TODO: Cross-platform macro for 64-bit double */
+		if (last_one_bit - bin + 1 > 53 && (SIZEOF_ZEND_LONG >= 8 || Z_DVAL_P(zendlval) >= (double)0x8000000000000000ULL)) {
 			zend_error(E_COMPILE_WARNING, "Saw imprecise float binary literal - the last %zu non-zero bits were truncated", (size_t)(last_one_bit - bin + 1 - 53));
 		}
 		if (contains_underscores) {
@@ -2097,7 +2098,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
 			errno = 0;
 			if (is_octal) { /* octal overflow */
 				ZVAL_DOUBLE(zendlval, zend_oct_strtod(lnum, (const char **)&end));
-				if (!is_truncated) {
+				if (!is_truncated && (SIZEOF_ZEND_LONG >= 8 || Z_DVAL_P(zendlval) >= (double)0x8000000000000000ULL)) {
 					size_t bits_in_representation = bits_in_octal_representation(lnum, len);
 					if (bits_in_representation > 53) {
 						zend_error(E_COMPILE_WARNING, "Saw imprecise float octal literal - the last %zu non-zero bits were truncated", bits_in_representation - 53);
@@ -2153,12 +2154,14 @@ NEWLINE ("\r"|"\n"|"\r\n")
 		}
 		RETURN_TOKEN_WITH_VAL(T_LNUMBER);
 	} else {
-		size_t bits_in_representation = bits_in_hex_representation(hex, len);
 		ZVAL_DOUBLE(zendlval, zend_hex_strtod(hex, (const char **)&end));
 		/* errno isn't checked since we allow HUGE_VAL/INF overflow */
 		ZEND_ASSERT(end == hex + len);
-		if (bits_in_representation > 53) {
-			zend_error(E_COMPILE_WARNING, "Saw imprecise float hex literal - the last %zu non-zero bits were truncated", bits_in_representation - 53);
+		if (SIZEOF_ZEND_LONG >= 8 || Z_DVAL_P(zendlval) >= (double)0x8000000000000000ULL) {
+			size_t bits_in_representation = bits_in_hex_representation(hex, len);
+			if (bits_in_representation > 53) {
+				zend_error(E_COMPILE_WARNING, "Saw imprecise float hex literal - the last %zu non-zero bits were truncated", bits_in_representation - 53);
+			}
 		}
 		if (contains_underscores) {
 			efree(hex);

ext/libxml/tests/bug79191.phpt

@@ -3,7 +3,7 @@ Bug #79191 (Error in SoapClient ctor disables DOMDocument::save())
 --SKIPIF--
 <?php
 if (!extension_loaded('soap')) die('skip soap extension not available');
-if (!extension_loaded('dom')) die('dom extension not available');
+if (!extension_loaded('dom')) die('skip dom extension not available');
 ?>
 --FILE--
 <?php