fix tests

diff --git a/ext/standard/tests/strings/sprintf_variation1.phpt b/ext/standard/tests/strings/sprintf_variation1.phpt
index 8b4726f7cc9ef4fc23e2f2ba4e2209f1649c5cf5..c1b787165469b15d114a577c90f88b1fcd5ed400 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"
@@ -155,57 +155,57 @@ string(3) "0.5"
 
 -- Iteration 10 --
 
-Notice: Array to string conversion in %s on line %d%d
+Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 
-Notice: Array to string conversion in %s on line %d%d
+Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 
-Notice: Array to string conversion in %s on line %d%d
+Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 
 -- Iteration 11 --
 
-Notice: Array to string conversion in %s on line %d%d
+Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 
-Notice: Array to string conversion in %s on line %d%d
+Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 
-Notice: Array to string conversion in %s on line %d%d
+Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 
 -- Iteration 12 --
 
-Notice: Array to string conversion in %s on line %d%d
+Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 
-Notice: Array to string conversion in %s on line %d%d
+Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 
-Notice: Array to string conversion in %s on line %d%d
+Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 
 -- Iteration 13 --
 
-Notice: Array to string conversion in %s on line %d%d
+Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 
-Notice: Array to string conversion in %s on line %d%d
+Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 
-Notice: Array to string conversion in %s on line %d%d
+Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 
 -- Iteration 14 --
 
-Notice: Array to string conversion in %s on line %d%d
+Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 
-Notice: Array to string conversion in %s on line %d%d
+Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 
-Notice: Array to string conversion in %s on line %d%d
+Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 
 -- Iteration 15 --
@@ -264,13 +264,11 @@ string(0) ""
 string(0) ""
 
 -- Iteration 26 --
-string(%d) "Resource id #5"
-string(%d) "Resource id #5"
-string(%d) "Resource id #5"
+string(%d) "Resource id #%d"
+string(%d) "Resource id #%d"
+string(%d) "Resource id #%d"
 Done
-
 --UEXPECTF--
-
 *** Testing sprintf() : with unexpected values for format argument ***
 
 -- Iteration 1 --
@@ -304,14 +302,14 @@ unicode(5) "-10.5"
 unicode(5) "-10.5"
 
 -- Iteration 7 --
-unicode(12) "105000000000"
-unicode(12) "105000000000"
-unicode(12) "105000000000"
+unicode(12) "101234567000"
+unicode(12) "101234567000"
+unicode(12) "101234567000"
 
 -- Iteration 8 --
-unicode(7) "1.06E-9"
-unicode(7) "1.06E-9"
-unicode(7) "1.06E-9"
+unicode(13) "1.07654321E-9"
+unicode(13) "1.07654321E-9"
+unicode(13) "1.07654321E-9"
 
 -- Iteration 9 --
 unicode(3) "0.5"

diff --git a/ext/standard/tests/strings/sprintf_variation11.phpt b/ext/standard/tests/strings/sprintf_variation11.phpt
index c0c625ef4e61b1d64e036a5fb97000280464bc03..9a9a3482bc5c879df1f46fc660337d9ddc907223 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,11 +73,10 @@ 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
-
 --UEXPECTF--
 *** Testing sprintf() : float formats with resource values ***
 
@@ -92,8 +91,8 @@ unicode(%d) " %d.000000"
 unicode(%d) "
 %d.000000"
 unicode(%d) "%d.000000"
-unicode(%d) "                      %d.000000"
-unicode(4) "0-9]"
+unicode(%d) "%s%d.000000"
+unicode(%d) "0-9]"
 unicode(1) "f"
 
 -- Iteration 2 --
@@ -107,7 +106,7 @@ unicode(%d) "       %d.000000"
 unicode(%d) "
 %d.000000"
 unicode(%d) "%d.000000"
-unicode(%d) "                      %d.000000"
-unicode(4) "0-9]"
+unicode(%d) "%s%d.000000"
+unicode(%d) "0-9]"
 unicode(1) "f"
 Done

diff --git a/ext/standard/tests/strings/sprintf_variation16.phpt b/ext/standard/tests/strings/sprintf_variation16.phpt
index bcacb5718692999a827143b8be4692ba5543b993..2fb5cbf0e27ff15076dae782b7ffe834211577ee 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,21 +262,20 @@ 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
-
 --UEXPECTF--
 *** Testing sprintf() : string formats with float values ***
 
@@ -416,62 +415,62 @@ unicode(10) "a-zA-Z0-9]"
 unicode(1) "s"
 
 -- Iteration 10 --
-unicode(6) "100000"
+unicode(4) "1000"
 unicode(1) "s"
-unicode(6) "100000"
+unicode(4) "1000"
 unicode(1) "s"
-unicode(7) " 100000"
-unicode(7) "100000 "
-unicode(7) "   100000"
-unicode(7) "
-100000"
-unicode(6) "100000"
-unicode(30) "                        100000"
+unicode(5) " 1000"
+unicode(5) "1000 "
+unicode(5) "   1000"
+unicode(5) "
+1000"
+unicode(4) "1000"
+unicode(30) "                          1000"
 unicode(10) "a-zA-Z0-9]"
 unicode(1) "s"
 
 -- Iteration 11 --
-unicode(8) "-1000000"
+unicode(4) "-100"
 unicode(1) "s"
-unicode(8) "-1000000"
+unicode(4) "-100"
 unicode(1) "s"
-unicode(9) " -1000000"
-unicode(9) "-1000000 "
-unicode(9) "   -1000000"
-unicode(9) "
--1000000"
-unicode(8) "-1000000"
-unicode(30) "                      -1000000"
+unicode(5) " -100"
+unicode(5) "-100 "
+unicode(5) "   -100"
+unicode(5) "
+-100"
+unicode(4) "-100"
+unicode(30) "                          -100"
 unicode(10) "a-zA-Z0-9]"
 unicode(1) "s"
 
 -- Iteration 12 --
-unicode(9) "100000000"
+unicode(9) "123456000"
 unicode(1) "s"
-unicode(9) "100000000"
+unicode(9) "123456000"
 unicode(1) "s"
-unicode(10) " 100000000"
-unicode(10) "100000000 "
-unicode(10) "  100000000"
+unicode(10) " 123456000"
+unicode(10) "123456000 "
+unicode(10) "  123456000"
 unicode(10) "
-100000000"
-unicode(9) "100000000"
-unicode(30) "                     100000000"
+123456000"
+unicode(9) "123456000"
+unicode(30) "                     123456000"
 unicode(10) "a-zA-Z0-9]"
 unicode(1) "s"
 
 -- Iteration 13 --
-unicode(11) "-1000000000"
+unicode(11) "-1234567000"
 unicode(1) "s"
-unicode(11) "-1000000000"
+unicode(11) "-1234567000"
 unicode(1) "s"
-unicode(12) " -1000000000"
-unicode(12) "-1000000000 "
-unicode(12) "  -1000000000"
+unicode(12) " -1234567000"
+unicode(12) "-1234567000 "
+unicode(12) "  -1234567000"
 unicode(12) "
--1000000000"
-unicode(11) "-1000000000"
-unicode(30) "                   -1000000000"
+-1234567000"
+unicode(11) "-1234567000"
+unicode(30) "                   -1234567000"
 unicode(10) "a-zA-Z0-9]"
 unicode(1) "s"
 
@@ -491,17 +490,17 @@ unicode(10) "a-zA-Z0-9]"
 unicode(1) "s"
 
 -- Iteration 15 --
-unicode(7) "1050000"
+unicode(7) "1012300"
 unicode(1) "s"
-unicode(7) "1050000"
+unicode(7) "1012300"
 unicode(1) "s"
-unicode(8) " 1050000"
-unicode(8) "1050000 "
-unicode(8) "   1050000"
+unicode(8) " 1012300"
+unicode(8) "1012300 "
+unicode(8) "   1012300"
 unicode(8) "
-1050000"
-unicode(7) "1050000"
-unicode(30) "                       1050000"
+1012300"
+unicode(7) "1012300"
+unicode(30) "                       1012300"
 unicode(10) "a-zA-Z0-9]"
 unicode(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 e745bfd8e1b7872147640d277b47ce07834db977..8dc986d46f26eeb54051eac8ba888a4904b01edd 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,11 +72,10 @@ 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
-
 --UEXPECTF--
 *** Testing sprintf() : string formats with resource values ***
 
@@ -91,8 +90,8 @@ unicode(%d) " Resource id #%d"
 unicode(%d) "
 Resource id #%d"
 unicode(%d) "Resource id #%d"
-unicode(%d) "                Resource id #%d"
-unicode(10) "a-zA-Z0-9]"
+unicode(%d) "%sResource id #%d"
+unicode(%d) "a-zA-Z0-9]"
 unicode(1) "s"
 
 -- Iteration 2 --
@@ -106,7 +105,7 @@ unicode(%d) "       Resource id #%d"
 unicode(%d) "
 Resource id #%d"
 unicode(%d) "Resource id #%d"
-unicode(%d) "                Resource id #%d"
-unicode(10) "a-zA-Z0-9]"
+unicode(%d) "%sResource id #%d"
+unicode(%d) "a-zA-Z0-9]"
 unicode(1) "s"
 Done

diff --git a/ext/standard/tests/strings/sprintf_variation18.phpt b/ext/standard/tests/strings/sprintf_variation18.phpt
index 8edf1771edf0ff2197e3d38ede976d7e2276e300..e8893b7188cc8fb576186969c85710534e28e8ac 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
@@ -49,749 +51,364 @@ echo "Done";
 *** Testing sprintf() : string formats with array values ***
 
 -- Iteration 1 --
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 string(6) "    Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 string(30) "                         Array"
 string(10) "a-zA-Z0-9]"
 string(1) "s"
 
 -- Iteration 2 --
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 string(6) "    Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 string(30) "                         Array"
 string(10) "a-zA-Z0-9]"
 string(1) "s"
 
 -- Iteration 3 --
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 string(6) "    Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 string(30) "                         Array"
 string(10) "a-zA-Z0-9]"
 string(1) "s"
 
 -- Iteration 4 --
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 string(6) "    Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 string(30) "                         Array"
 string(10) "a-zA-Z0-9]"
 string(1) "s"
 
 -- Iteration 5 --
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 string(6) "    Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 string(30) "                         Array"
 string(10) "a-zA-Z0-9]"
 string(1) "s"
 
 -- Iteration 6 --
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 string(6) "    Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 string(30) "                         Array"
 string(10) "a-zA-Z0-9]"
 string(1) "s"
 
 -- Iteration 7 --
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 string(6) "    Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 string(30) "                         Array"
 string(10) "a-zA-Z0-9]"
 string(1) "s"
 
 -- Iteration 8 --
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 string(6) "    Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 string(30) "                         Array"
 string(10) "a-zA-Z0-9]"
 string(1) "s"
 
 -- Iteration 9 --
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 string(6) "    Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 string(30) "                         Array"
 string(10) "a-zA-Z0-9]"
 string(1) "s"
 
 -- Iteration 10 --
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 string(6) "    Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 string(30) "                         Array"
 string(10) "a-zA-Z0-9]"
 string(1) "s"
 
 -- Iteration 11 --
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 string(6) "    Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 string(30) "                         Array"
 string(10) "a-zA-Z0-9]"
 string(1) "s"
 
 -- Iteration 12 --
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 string(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 string(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 string(6) "    Array"
-
-Notice: Array to string conversion in %s on line %d
 string(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 string(30) "                         Array"
 string(10) "a-zA-Z0-9]"
 string(1) "s"
 Done
-
 --UEXPECTF--
 *** Testing sprintf() : string formats with array values ***
 
 -- Iteration 1 --
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "   Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(30) "                         Array"
 unicode(10) "a-zA-Z0-9]"
 unicode(1) "s"
 
 -- Iteration 2 --
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "   Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(30) "                         Array"
 unicode(10) "a-zA-Z0-9]"
 unicode(1) "s"
 
 -- Iteration 3 --
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "   Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(30) "                         Array"
 unicode(10) "a-zA-Z0-9]"
 unicode(1) "s"
 
 -- Iteration 4 --
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "   Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(30) "                         Array"
 unicode(10) "a-zA-Z0-9]"
 unicode(1) "s"
 
 -- Iteration 5 --
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "   Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(30) "                         Array"
 unicode(10) "a-zA-Z0-9]"
 unicode(1) "s"
 
 -- Iteration 6 --
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "   Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(30) "                         Array"
 unicode(10) "a-zA-Z0-9]"
 unicode(1) "s"
 
 -- Iteration 7 --
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "   Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(30) "                         Array"
 unicode(10) "a-zA-Z0-9]"
 unicode(1) "s"
 
 -- Iteration 8 --
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "   Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(30) "                         Array"
 unicode(10) "a-zA-Z0-9]"
 unicode(1) "s"
 
 -- Iteration 9 --
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "   Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(30) "                         Array"
 unicode(10) "a-zA-Z0-9]"
 unicode(1) "s"
 
 -- Iteration 10 --
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "   Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(30) "                         Array"
 unicode(10) "a-zA-Z0-9]"
 unicode(1) "s"
 
 -- Iteration 11 --
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "   Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(30) "                         Array"
 unicode(10) "a-zA-Z0-9]"
 unicode(1) "s"
 
 -- Iteration 12 --
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 unicode(1) "s"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) " Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "Array "
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "   Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(6) "
 Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(30) "                         Array"
 unicode(10) "a-zA-Z0-9]"
 unicode(1) "s"

diff --git a/ext/standard/tests/strings/sprintf_variation2.phpt b/ext/standard/tests/strings/sprintf_variation2.phpt
index a351ba14ba0e6860d7969dd1b9b26ac7e215ef73..f4fc3f4d0559564523fa3ac044b7a2be9548f1d4 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,55 +132,35 @@ 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"
 string(3) "0.5"
 
 -- Iteration 10 --
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 
 -- Iteration 11 --
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 
 -- Iteration 12 --
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 
 -- Iteration 13 --
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 
 -- Iteration 14 --
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 
 -- Iteration 15 --
@@ -237,7 +219,6 @@ string(0) ""
 string(%d) "Resource id #%d"
 string(%d) "Resource id #%d"
 Done
-
 --UEXPECTF--
 *** Testing sprintf() : with different types of values passed for arg1 argument ***
 
@@ -266,55 +247,35 @@ unicode(5) "-10.5"
 unicode(5) "-10.5"
 
 -- Iteration 7 --
-unicode(12) "105000000000"
-unicode(12) "105000000000"
+unicode(12) "101234567000"
+unicode(12) "101234567000"
 
 -- Iteration 8 --
-unicode(7) "1.06E-9"
-unicode(7) "1.06E-9"
+unicode(13) "1.07654321E-9"
+unicode(13) "1.07654321E-9"
 
 -- Iteration 9 --
 unicode(3) "0.5"
 unicode(3) "0.5"
 
 -- Iteration 10 --
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 
 -- Iteration 11 --
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 
 -- Iteration 12 --
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 
 -- Iteration 13 --
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 
 -- Iteration 14 --
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
 unicode(5) "Array"
 
 -- Iteration 15 --

diff --git a/ext/standard/tests/strings/sprintf_variation30.phpt b/ext/standard/tests/strings/sprintf_variation30.phpt
index 02ebf93a8570e085d6c18459f197072b5ee1729f..874c738e6b77ab93eaaed63df22e96d656745c4e 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,12 +71,11 @@ 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
-
 --UEXPECTF--
 *** Testing sprintf() : octal formats with resource values ***
 
@@ -90,9 +89,9 @@ unicode(%d) "%d "
 unicode(%d) "  %d"
 unicode(%d) "
 %d"
-unicode(%d) "   %d"
-unicode(%d) "                             %d"
-unicode(4) "0-7]"
+unicode(%d) "%s%d"
+unicode(%d) "%s%d"
+unicode(%d) "0-7]"
 unicode(1) "o"
 
 -- Iteration 2 --
@@ -105,8 +104,8 @@ unicode(%d) "%d "
 unicode(%d) "  %d"
 unicode(%d) "
 %d"
-unicode(%d) "   %d"
-unicode(%d) "                             %d"
-unicode(4) "0-7]"
+unicode(%d) "%s%d"
+unicode(%d) "%s%d"
+unicode(%d) "0-7]"
 unicode(1) "o"
 Done

diff --git a/ext/standard/tests/strings/sprintf_variation42.phpt b/ext/standard/tests/strings/sprintf_variation42.phpt
index 38a67c8844f052272591f3a2d752f58f0e9be3ef..46fefb6d4c423859eed9d05bde9864497b4ebd8d 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,12 +72,11 @@ 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
-
 --UEXPECTF--
 *** Testing sprintf() : unsigned formats with resource values ***
 
@@ -91,9 +90,9 @@ unicode(%d) "%d "
 unicode(%d) "  %d"
 unicode(%d) "
 %d"
-unicode(%d) "   %d"
-unicode(%d) "                             %d"
-unicode(4) "0-9]"
+unicode(%d) "%s%d"
+unicode(%d) "%s%d"
+unicode(%d) "0-9]"
 unicode(1) "u"
 
 -- Iteration 2 --
@@ -106,8 +105,8 @@ unicode(%d) "%d "
 unicode(%d) "  %d"
 unicode(%d) "
 %d"
-unicode(%d) "   %d"
-unicode(%d) "                             %d"
-unicode(4) "0-9]"
+unicode(%d) "%s%d"
+unicode(%d) "%s%d"
+unicode(%d) "0-9]"
 unicode(1) "u"
 Done