fix tests

diff --git a/ext/standard/tests/strings/sprintf_variation1.phpt b/ext/standard/tests/strings/sprintf_variation1.phpt
index a226bba7edbc8cdf751d1b9804ca406d186c6f5d..2a5bdfdec994a5f34c28e09b113803bb826c700b 100644 (file)
--- a/ext/standard/tests/strings/sprintf_variation1.phpt
+++ b/ext/standard/tests/strings/sprintf_variation1.phpt
@@ -44,8 +44,8 @@ $values = array(
       // float data
       10.5,
       -10.5,
-      10.5e10,
-      10.6E-10,
+      10.1234567e10,
+      10.7654321E-10,
       .5,
 
       // array data
@@ -139,14 +139,14 @@ string(5) "-10.5"
 string(5) "-10.5"
 
 -- Iteration 7 --
-string(12) "105000000000"
-string(12) "105000000000"
-string(12) "105000000000"
+string(12) "101234567000"
+string(12) "101234567000"
+string(12) "101234567000"
 
 -- Iteration 8 --
-string(7) "1.06E-9"
-string(7) "1.06E-9"
-string(7) "1.06E-9"
+string(13) "1.07654321E-9"
+string(13) "1.07654321E-9"
+string(13) "1.07654321E-9"
 
 -- Iteration 9 --
 string(3) "0.5"
@@ -267,4 +267,4 @@ string(0) ""
 string(%d) "Resource id #%d"
 string(%d) "Resource id #%d"
 string(%d) "Resource id #%d"
-Done
+Done
\ No newline at end of file

diff --git a/ext/standard/tests/strings/sprintf_variation11.phpt b/ext/standard/tests/strings/sprintf_variation11.phpt
index d15928dd9fe4ad5ebfce9edabbe254a151c90e4c..31097d8dd4a45214f4b9d75cc56eff9bb7dfa7e0 100644 (file)
--- a/ext/standard/tests/strings/sprintf_variation11.phpt
+++ b/ext/standard/tests/strings/sprintf_variation11.phpt
@@ -40,7 +40,7 @@ foreach($resource_values as $resource_value) {
 
 // closing the resources
 fclose($fp);
-fclose($dfp);
+closedir($dfp);
 
 echo "Done";
 ?>
@@ -58,8 +58,8 @@ string(%d) "  %d.000000"
 string(%d) "
 %d.000000"
 string(%d) "%d.000000"
-string(%d) "                      %d.000000"
-string(4) "0-9]"
+string(%d) "%s%d.000000"
+string(%d) "0-9]"
 string(1) "f"
 
 -- Iteration 2 --
@@ -73,7 +73,7 @@ string(%d) "  %d.000000"
 string(%d) "
 %d.000000"
 string(%d) "%d.000000"
-string(%d) "                      %d.000000"
-string(4) "0-9]"
+string(%d) "%s%d.000000"
+string(%d) "0-9]"
 string(1) "f"
 Done

diff --git a/ext/standard/tests/strings/sprintf_variation16.phpt b/ext/standard/tests/strings/sprintf_variation16.phpt
index 523eb5fb9d32e8c74e0585ae123fb1262887ac8d..57965315ee19e624061597dd608730d19c2e8436 100644 (file)
--- a/ext/standard/tests/strings/sprintf_variation16.phpt
+++ b/ext/standard/tests/strings/sprintf_variation16.phpt
@@ -20,12 +20,12 @@ $float_values = array(
   0.0,
   -0.1,
   1.0,
-  1e5,
-  -1e6,
-  1E8,
-  -1E9,
+  1e3,
+  -1e2,
+  1.23456E8,
+  -1.234567E9,
   10.0000000000000000005,
-  10.5e+5
+  10.123e+5
 );
 
 // array of string formats
@@ -187,62 +187,62 @@ string(10) "a-zA-Z0-9]"
 string(1) "s"
 
 -- Iteration 10 --
-string(6) "100000"
+string(4) "1000"
 string(1) "s"
-string(6) "100000"
+string(4) "1000"
 string(1) "s"
-string(7) " 100000"
-string(7) "100000 "
-string(7) "    100000"
-string(7) "
-100000"
-string(6) "100000"
-string(30) "                        100000"
+string(5) " 1000"
+string(5) "1000 "
+string(5) "    1000"
+string(5) "
+1000"
+string(4) "1000"
+string(30) "                          1000"
 string(10) "a-zA-Z0-9]"
 string(1) "s"
 
 -- Iteration 11 --
-string(8) "-1000000"
+string(4) "-100"
 string(1) "s"
-string(8) "-1000000"
+string(4) "-100"
 string(1) "s"
-string(9) " -1000000"
-string(9) "-1000000 "
-string(9) "    -1000000"
-string(9) "
--1000000"
-string(8) "-1000000"
-string(30) "                      -1000000"
+string(5) " -100"
+string(5) "-100 "
+string(5) "    -100"
+string(5) "
+-100"
+string(4) "-100"
+string(30) "                          -100"
 string(10) "a-zA-Z0-9]"
 string(1) "s"
 
 -- Iteration 12 --
-string(9) "100000000"
+string(9) "123456000"
 string(1) "s"
-string(9) "100000000"
+string(9) "123456000"
 string(1) "s"
-string(10) " 100000000"
-string(10) "100000000 "
-string(10) "   100000000"
+string(10) " 123456000"
+string(10) "123456000 "
+string(10) "   123456000"
 string(10) "
-100000000"
-string(9) "100000000"
-string(30) "                     100000000"
+123456000"
+string(9) "123456000"
+string(30) "                     123456000"
 string(10) "a-zA-Z0-9]"
 string(1) "s"
 
 -- Iteration 13 --
-string(11) "-1000000000"
+string(11) "-1234567000"
 string(1) "s"
-string(11) "-1000000000"
+string(11) "-1234567000"
 string(1) "s"
-string(12) " -1000000000"
-string(12) "-1000000000 "
-string(12) "   -1000000000"
+string(12) " -1234567000"
+string(12) "-1234567000 "
+string(12) "   -1234567000"
 string(12) "
--1000000000"
-string(11) "-1000000000"
-string(30) "                   -1000000000"
+-1234567000"
+string(11) "-1234567000"
+string(30) "                   -1234567000"
 string(10) "a-zA-Z0-9]"
 string(1) "s"
 
@@ -262,17 +262,17 @@ string(10) "a-zA-Z0-9]"
 string(1) "s"
 
 -- Iteration 15 --
-string(7) "1050000"
+string(7) "1012300"
 string(1) "s"
-string(7) "1050000"
+string(7) "1012300"
 string(1) "s"
-string(8) " 1050000"
-string(8) "1050000 "
-string(8) "    1050000"
+string(8) " 1012300"
+string(8) "1012300 "
+string(8) "    1012300"
 string(8) "
-1050000"
-string(7) "1050000"
-string(30) "                       1050000"
+1012300"
+string(7) "1012300"
+string(30) "                       1012300"
 string(10) "a-zA-Z0-9]"
 string(1) "s"
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/strings/sprintf_variation17.phpt b/ext/standard/tests/strings/sprintf_variation17.phpt
index 08028f8fe160277482dd7f510f6cfadd32b28655..4d9cc6de9b72c0cbb01ae10652c77adf9b492314 100644 (file)
--- a/ext/standard/tests/strings/sprintf_variation17.phpt
+++ b/ext/standard/tests/strings/sprintf_variation17.phpt
@@ -39,7 +39,7 @@ foreach($resource_values as $resource_value) {
 
 // closing the resources
 fclose($fp);
-fclose($dfp);
+closedir($dfp);
 
 echo "Done";
 ?>
@@ -57,8 +57,8 @@ string(%d) "  Resource id #%d"
 string(%d) "
 Resource id #%d"
 string(%d) "Resource id #%d"
-string(%d) "                Resource id #%d"
-string(10) "a-zA-Z0-9]"
+string(%d) "%sResource id #%d"
+string(%d) "a-zA-Z0-9]"
 string(1) "s"
 
 -- Iteration 2 --
@@ -72,7 +72,7 @@ string(%d) "  Resource id #%d"
 string(%d) "
 Resource id #%d"
 string(%d) "Resource id #%d"
-string(%d) "                Resource id #%d"
-string(10) "a-zA-Z0-9]"
+string(%d) "%sResource id #%d"
+string(%d) "a-zA-Z0-9]"
 string(1) "s"
 Done

diff --git a/ext/standard/tests/strings/sprintf_variation18.phpt b/ext/standard/tests/strings/sprintf_variation18.phpt
index b0013a4e9dfb69335c9dc8cdae34a46022e190e5..960bcd0e78e2ac1b53fd9205771ea8be41758d84 100644 (file)
--- a/ext/standard/tests/strings/sprintf_variation18.phpt
+++ b/ext/standard/tests/strings/sprintf_variation18.phpt
@@ -7,6 +7,8 @@ Test sprintf() function : usage variations - string formats with array values
  * Source code: ext/standard/formatted_print.c
 */
 
+error_reporting(E_ALL & ~E_NOTICE);
+
 echo "*** Testing sprintf() : string formats with array values ***\n";
 
 // different arrays used to test he function

diff --git a/ext/standard/tests/strings/sprintf_variation2.phpt b/ext/standard/tests/strings/sprintf_variation2.phpt
index fcd3f212398e297c6fb53c00b830619d23506a36..a663df4444c7b01d779f33144fd29b891d97ef8c 100644 (file)
--- a/ext/standard/tests/strings/sprintf_variation2.phpt
+++ b/ext/standard/tests/strings/sprintf_variation2.phpt
@@ -7,6 +7,8 @@ Test sprintf() function : usage variations - with all types of values for arg1 a
  * Source code: ext/standard/formatted_print.c
 */
 
+error_reporting(E_ALL & ~E_NOTICE);
+
 echo "*** Testing sprintf() : with different types of values passed for arg1 argument ***\n";
 
 // initialing required variables
@@ -40,8 +42,8 @@ $values = array(
       // float data
       10.5,
       -10.5,
-      10.5e10,
-      10.6E-10,
+      10.1234567e10,
+      10.7654321E-10,
       .5,
 
       // array data
@@ -130,12 +132,12 @@ string(5) "-10.5"
 string(5) "-10.5"
 
 -- Iteration 7 --
-string(12) "105000000000"
-string(12) "105000000000"
+string(12) "101234567000"
+string(12) "101234567000"
 
 -- Iteration 8 --
-string(7) "1.06E-9"
-string(7) "1.06E-9"
+string(13) "1.07654321E-9"
+string(13) "1.07654321E-9"
 
 -- Iteration 9 --
 string(3) "0.5"
@@ -216,4 +218,4 @@ string(0) ""
 -- Iteration 28 --
 string(%d) "Resource id #%d"
 string(%d) "Resource id #%d"
-Done
+Done
\ No newline at end of file

diff --git a/ext/standard/tests/strings/sprintf_variation30.phpt b/ext/standard/tests/strings/sprintf_variation30.phpt
index 57c5abbd86871efdc6d605394aa8004b0efcf2c9..cc80d7bb43ae683e5e902dd506f8d783ba4769c2 100644 (file)
--- a/ext/standard/tests/strings/sprintf_variation30.phpt
+++ b/ext/standard/tests/strings/sprintf_variation30.phpt
@@ -39,7 +39,7 @@ foreach($resource_values as $resource_value) {
 
 // closing the resources
 fclose($fp);
-fclose($dfp);
+closedir($dfp);
 
 echo "Done";
 ?>
@@ -56,9 +56,9 @@ string(%d) "%d "
 string(%d) "   %d"
 string(%d) "
 %d"
-string(%d) "   %d"
-string(%d) "                             %d"
-string(4) "0-7]"
+string(%d) "%s%d"
+string(%d) "%s%d"
+string(%d) "0-7]"
 string(1) "o"
 
 -- Iteration 2 --
@@ -71,8 +71,8 @@ string(%d) "%d "
 string(%d) "   %d"
 string(%d) "
 %d"
-string(%d) "   %d"
-string(%d) "                             %d"
-string(4) "0-7]"
+string(%d) "%s%d"
+string(%d) "%s%d"
+string(%d) "0-7]"
 string(1) "o"
 Done

diff --git a/ext/standard/tests/strings/sprintf_variation42.phpt b/ext/standard/tests/strings/sprintf_variation42.phpt
index a1c01ff6b38403a8c948cf0bd2272ac15810fdd0..3c5bd1f1bdd71f132193e904c757899c98c6b17e 100644 (file)
--- a/ext/standard/tests/strings/sprintf_variation42.phpt
+++ b/ext/standard/tests/strings/sprintf_variation42.phpt
@@ -40,7 +40,7 @@ foreach($resource_values as $resource_value) {
 
 // closing the resources
 fclose($fp);
-fclose($dfp);
+closedir($dfp);
 
 echo "Done";
 ?>
@@ -57,9 +57,9 @@ string(%d) "%d "
 string(%d) "   %d"
 string(%d) "
 %d"
-string(%d) "   %d"
-string(%d) "                             %d"
-string(4) "0-9]"
+string(%d) "%s%d"
+string(%d) "%s%d"
+string(%d) "0-9]"
 string(1) "u"
 
 -- Iteration 2 --
@@ -72,8 +72,8 @@ string(%d) "%d "
 string(%d) "   %d"
 string(%d) "
 %d"
-string(%d) "   %d"
-string(%d) "                             %d"
-string(4) "0-9]"
+string(%d) "%s%d"
+string(%d) "%s%d"
+string(%d) "0-9]"
 string(1) "u"
 Done