Merge branch 'PHP-7.1'

* PHP-7.1:
  Fix 32bits tests

2 files changed, 60 insertions, 26 deletions

diff --git a/ext/standard/tests/math/rand_variation1.phpt b/ext/standard/tests/math/rand_variation1.phpt
index f14ada87f5..7b3875105f 100644
--- a/ext/standard/tests/math/rand_variation1.phpt
+++ b/ext/standard/tests/math/rand_variation1.phpt
@@ -97,13 +97,17 @@ int(%i)
 int(%i)
 
 -- Iteration 3 --
-int(%i)
+
+Warning: rand(): max(100) is smaller than min(12345) in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation1.php on line 79
+bool(false)
 
 -- Iteration 4 --
 int(%i)
 
 -- Iteration 5 --
-int(%i)
+
+Warning: rand(): max(100) is smaller than min(2147483647) in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation1.php on line 79
+bool(false)
 
 -- Iteration 6 --
 int(%i)
diff --git a/ext/standard/tests/math/rand_variation2.phpt b/ext/standard/tests/math/rand_variation2.phpt
index 824b47b0cb..379f8839a7 100644
--- a/ext/standard/tests/math/rand_variation2.phpt
+++ b/ext/standard/tests/math/rand_variation2.phpt
@@ -91,98 +91,128 @@ fclose($fp);
 *** Testing rand) : usage variations ***
 
 -- Iteration 1 --
-int(%i)
+
+Warning: rand(): max(0) is smaller than min(100) in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
+bool(false)
 
 -- Iteration 2 --
-int(%i)
+
+Warning: rand(): max(1) is smaller than min(100) in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
+bool(false)
 
 -- Iteration 3 --
 int(%i)
 
 -- Iteration 4 --
-int(%i)
+
+Warning: rand(): max(-2345) is smaller than min(100) in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
+bool(false)
 
 -- Iteration 5 --
 int(%i)
 
 -- Iteration 6 --
-int(%i)
+
+Warning: rand(): max(10) is smaller than min(100) in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
+bool(false)
 
 -- Iteration 7 --
-int(%i)
+
+Warning: rand(): max(-10) is smaller than min(100) in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
+bool(false)
 
 -- Iteration 8 --
 
-Warning: rand() expects parameter 2 to be integer, float given in %s on line %d
+Warning: rand() expects parameter 2 to be integer, float given in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
 NULL
 
 -- Iteration 9 --
-int(%i)
+
+Warning: rand(): max(0) is smaller than min(100) in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
+bool(false)
 
 -- Iteration 10 --
-int(%i)
+
+Warning: rand(): max(0) is smaller than min(100) in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
+bool(false)
 
 -- Iteration 11 --
-int(%i)
+
+Warning: rand(): max(0) is smaller than min(100) in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
+bool(false)
 
 -- Iteration 12 --
-int(%i)
+
+Warning: rand(): max(0) is smaller than min(100) in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
+bool(false)
 
 -- Iteration 13 --
-int(%i)
+
+Warning: rand(): max(1) is smaller than min(100) in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
+bool(false)
 
 -- Iteration 14 --
-int(%i)
+
+Warning: rand(): max(0) is smaller than min(100) in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
+bool(false)
 
 -- Iteration 15 --
-int(%i)
+
+Warning: rand(): max(1) is smaller than min(100) in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
+bool(false)
 
 -- Iteration 16 --
-int(%i)
+
+Warning: rand(): max(0) is smaller than min(100) in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
+bool(false)
 
 -- Iteration 17 --
 
-Warning: rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 2 to be integer, string given in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
 NULL
 
 -- Iteration 18 --
 
-Warning: rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 2 to be integer, string given in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
 NULL
 
 -- Iteration 19 --
 
-Warning: rand() expects parameter 2 to be integer, array given in %s on line %d
+Warning: rand() expects parameter 2 to be integer, array given in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
 NULL
 
 -- Iteration 20 --
 
-Warning: rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 2 to be integer, string given in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
 NULL
 
 -- Iteration 21 --
 
-Warning: rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 2 to be integer, string given in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
 NULL
 
 -- Iteration 22 --
 
-Warning: rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 2 to be integer, string given in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
 NULL
 
 -- Iteration 23 --
 
-Warning: rand() expects parameter 2 to be integer, object given in %s on line %d
+Warning: rand() expects parameter 2 to be integer, object given in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
 NULL
 
 -- Iteration 24 --
-int(%i)
+
+Warning: rand(): max(0) is smaller than min(100) in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
+bool(false)
 
 -- Iteration 25 --
-int(%i)
+
+Warning: rand(): max(0) is smaller than min(100) in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
+bool(false)
 
 -- Iteration 26 --
 
-Warning: rand() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: rand() expects parameter 2 to be integer, resource given in /builddir/build/BUILD/php-7.1.0beta2/ext/standard/tests/math/rand_variation2.php on line 79
 NULL
 ===Done===