Error on invalid octal (fixes PHPSadness #31)

Further error checks

43 files changed, 55 insertions, 55 deletions

diff --git a/ext/standard/tests/strings/sprintf_basic8.phpt b/ext/standard/tests/strings/sprintf_basic8.phpt
index bb9ecd1a66..925689939c 100644
--- a/ext/standard/tests/strings/sprintf_basic8.phpt
+++ b/ext/standard/tests/strings/sprintf_basic8.phpt
@@ -22,7 +22,7 @@ $format2 = "%o %o";
 $format3 = "%o %o %o";
 $arg1 = 021;
 $arg2 = -0347;
-$arg3 = 05678;
+$arg3 = 0567;
 
 // Calling sprintf() with default arguments
 var_dump( sprintf($format) );
diff --git a/ext/standard/tests/strings/sprintf_basic8_64bit.phpt b/ext/standard/tests/strings/sprintf_basic8_64bit.phpt
index 76d8f05eac..9c7e1e6535 100644
--- a/ext/standard/tests/strings/sprintf_basic8_64bit.phpt
+++ b/ext/standard/tests/strings/sprintf_basic8_64bit.phpt
@@ -18,7 +18,7 @@ $format2 = "%o %o";
 $format3 = "%o %o %o";
 $arg1 = 021;
 $arg2 = -0347;
-$arg3 = 05678;
+$arg3 = 0567;
 
 // Calling sprintf() with default arguments
 var_dump( sprintf($format) );
diff --git a/ext/standard/tests/strings/sprintf_variation10.phpt b/ext/standard/tests/strings/sprintf_variation10.phpt
index e989d9f8b8..3880b212df 100644
--- a/ext/standard/tests/strings/sprintf_variation10.phpt
+++ b/ext/standard/tests/strings/sprintf_variation10.phpt
@@ -26,7 +26,7 @@ $integer_values = array (
   0x7fffffff,  // max positive integer as hexadecimal
   0x7FFFFFFF,  // max positive integer as hexadecimal
   0123,        // integer as octal
-  01912,       // should be quivalent to octal 1
+  01,       // should be quivalent to octal 1
   -020000000000, // max negative integer as octal
   017777777777  // max positive integer as octal
 );
@@ -324,4 +324,4 @@ string(17) "2147483647.000000"
 string(30) "             2147483647.000000"
 string(4) "0-9]"
 string(1) "f"
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/strings/sprintf_variation19.phpt b/ext/standard/tests/strings/sprintf_variation19.phpt
index 542ba52aa3..fb3f90585e 100644
--- a/ext/standard/tests/strings/sprintf_variation19.phpt
+++ b/ext/standard/tests/strings/sprintf_variation19.phpt
@@ -26,7 +26,7 @@ $integer_values = array(
   0x7fffffff,  // max positive integer as hexadecimal
   0x7FFFFFFF,  // max positive integer as hexadecimal
   0123,        // integer as octal
-  01912,       // should be quivalent to octal 1
+  01,       // should be quivalent to octal 1
   -020000000000, // max negative integer as octal
   017777777777  // max positive integer as octal
 );
@@ -323,4 +323,4 @@ string(10) "2147483647"
 string(30) "                    2147483647"
 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_variation21.phpt b/ext/standard/tests/strings/sprintf_variation21.phpt
index cbbf16e066..20aa1e9d58 100644
--- a/ext/standard/tests/strings/sprintf_variation21.phpt
+++ b/ext/standard/tests/strings/sprintf_variation21.phpt
diff --git a/ext/standard/tests/strings/sprintf_variation28.phpt b/ext/standard/tests/strings/sprintf_variation28.phpt
index 40af96f960..e295fc8181 100644
--- a/ext/standard/tests/strings/sprintf_variation28.phpt
+++ b/ext/standard/tests/strings/sprintf_variation28.phpt
@@ -32,7 +32,7 @@ $integer_values = array(
   0x7fffffff,  // max positive integer as hexadecimal
   0x7FFFFFFF,  // max positive integer as hexadecimal
   0123,        // integer as octal
-  01912,       // should be quivalent to octal 1
+  01,       // should be quivalent to octal 1
   -020000000000, // max negative integer as octal
   017777777777  // max positive integer as octal
 );
diff --git a/ext/standard/tests/strings/sprintf_variation28_64bit.phpt b/ext/standard/tests/strings/sprintf_variation28_64bit.phpt
index 92fdf78da1..f4d8125e98 100644
--- a/ext/standard/tests/strings/sprintf_variation28_64bit.phpt
+++ b/ext/standard/tests/strings/sprintf_variation28_64bit.phpt
@@ -28,7 +28,7 @@ $integer_values = array(
   0x7fffffff,  // max positive integer as hexadecimal
   0x7FFFFFFF,  // max positive integer as hexadecimal
   0123,        // integer as octal
-  01912,       // should be quivalent to octal 1
+  01,       // should be quivalent to octal 1
   -020000000000, // max negative integer as octal
   017777777777  // max positive integer as octal
 );
diff --git a/ext/standard/tests/strings/sprintf_variation3.phpt b/ext/standard/tests/strings/sprintf_variation3.phpt
index 0435cf3d77..6c0577e4d4 100644
--- a/ext/standard/tests/strings/sprintf_variation3.phpt
+++ b/ext/standard/tests/strings/sprintf_variation3.phpt
@@ -26,7 +26,7 @@ $valid_ints = array(
   0x7fffffff,  // max positive integer as hexadecimal
   0x7FFFFFFF,  // max positive integer as hexadecimal
   0123,        // integer as octal
-  01912,       // should be quivalent to octal 1
+  01,       // should be quivalent to octal 1
   -020000000000, // max negative integer as octal
   017777777777  // max positive integer as octal
 );
@@ -322,4 +322,4 @@ string(10) "2147483647"
 string(30) "                    2147483647"
 string(4) "0-9]"
 string(1) "d"
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/strings/sprintf_variation34.phpt b/ext/standard/tests/strings/sprintf_variation34.phpt
index 8a5cd809d6..db905ebd18 100644
--- a/ext/standard/tests/strings/sprintf_variation34.phpt
+++ b/ext/standard/tests/strings/sprintf_variation34.phpt
@@ -32,7 +32,7 @@ $integer_values = array(
   0x7fffffff,  // max positive integer as hexadecimal
   0x7FFFFFFF,  // max positive integer as hexadecimal
   0123,        // integer as octal 
-  01912,       // should be quivalent to octal 1
+  01,       // should be quivalent to octal 1
   -020000000000, // max negative integer as octal 
   017777777777  // max positive integer as octal
 );
diff --git a/ext/standard/tests/strings/sprintf_variation34_64bit.phpt b/ext/standard/tests/strings/sprintf_variation34_64bit.phpt
index 27e3f0c73e..a4914664a2 100644
--- a/ext/standard/tests/strings/sprintf_variation34_64bit.phpt
+++ b/ext/standard/tests/strings/sprintf_variation34_64bit.phpt
@@ -28,7 +28,7 @@ $integer_values = array(
   0x7fffffff,  // max positive integer as hexadecimal
   0x7FFFFFFF,  // max positive integer as hexadecimal
   0123,        // integer as octal 
-  01912,       // should be quivalent to octal 1
+  01,       // should be quivalent to octal 1
   -020000000000, // max negative integer as octal 
   017777777777  // max positive integer as octal
 );
diff --git a/ext/standard/tests/strings/sprintf_variation40.phpt b/ext/standard/tests/strings/sprintf_variation40.phpt
index 6efcee0608..774650a32c 100644
--- a/ext/standard/tests/strings/sprintf_variation40.phpt
+++ b/ext/standard/tests/strings/sprintf_variation40.phpt
@@ -32,7 +32,7 @@ $integer_values = array(
   0x7fffffff,  // max positive integer as hexadecimal
   0x7FFFFFFF,  // max positive integer as hexadecimal
   0123,        // integer as octal 
-  01912,       // should be quivalent to octal 1
+  01,       // should be quivalent to octal 1
   -020000000000, // max negative integer as octal 
   017777777777  // max positive integer as octal
 );
diff --git a/ext/standard/tests/strings/sprintf_variation40_64bit.phpt b/ext/standard/tests/strings/sprintf_variation40_64bit.phpt
index 029e94c782..fffe6155fe 100644
--- a/ext/standard/tests/strings/sprintf_variation40_64bit.phpt
+++ b/ext/standard/tests/strings/sprintf_variation40_64bit.phpt
@@ -28,7 +28,7 @@ $integer_values = array(
   0x7fffffff,  // max positive integer as hexadecimal
   0x7FFFFFFF,  // max positive integer as hexadecimal
   0123,        // integer as octal 
-  01912,       // should be quivalent to octal 1
+  01,       // should be quivalent to octal 1
   -020000000000, // max negative integer as octal 
   017777777777  // max positive integer as octal
 );
diff --git a/ext/standard/tests/strings/sprintf_variation46.phpt b/ext/standard/tests/strings/sprintf_variation46.phpt
index 311d8c192a..9b8892d7d0 100644
--- a/ext/standard/tests/strings/sprintf_variation46.phpt
+++ b/ext/standard/tests/strings/sprintf_variation46.phpt
@@ -26,7 +26,7 @@ $integer_values = array(
   0x7fffffff,  // max positive integer as hexadecimal
   0x7FFFFFFF,  // max positive integer as hexadecimal
   0123,        // integer as octal 
-  01912,       // should be quivalent to octal 1
+  01,       // should be quivalent to octal 1
   -020000000000, // max negative integer as octal 
   017777777777  // max positive integer as octal
 );
@@ -323,4 +323,4 @@ string(11) "2.147484e+9"
 string(30) "                   2.147484e+9"
 string(4) "0-1]"
 string(1) "e"
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/strings/vfprintf_basic8.phpt b/ext/standard/tests/strings/vfprintf_basic8.phpt
index bf7eb96ad5..aad883c6e9 100644
--- a/ext/standard/tests/strings/vfprintf_basic8.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic8.phpt
@@ -16,7 +16,7 @@ $format2 = "%o %o";
 $format3 = "%o %o %o";
 $arg1 = array(021);
 $arg2 = array(021,0347);
-$arg3 = array(021,0347,05678);
+$arg3 = array(021,0347,0567);
 
 /* creating dumping file */
 $data_file = dirname(__FILE__) . '/vfprintf_basic8.txt';
diff --git a/ext/standard/tests/strings/vfprintf_variation11.phpt b/ext/standard/tests/strings/vfprintf_variation11.phpt
index 4bc38851d2..e94e7e0c56 100644
--- a/ext/standard/tests/strings/vfprintf_variation11.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation11.phpt
@@ -36,10 +36,10 @@ $args_array = array(
   array(00),
   array(-01, 01, +022),
   array(-020000000000, 020000000000, 017777777777, -017777777777),
-  array(0123456, 012345678, -01234567, 01234567),
+  array(0123456, 01234567, -01234567, 01234567),
   array(0111, 02222, -0333333, -044444444),
-  array(0x123b, 0xfAb, 0123, 01293),
-  array(01234, 05678, -01234, 02345),
+  array(0x123b, 0xfAb, 0123, 012),
+  array(01234, 0567, -01234, 02345),
   array(03, 04, 01, 02)
 
 );
diff --git a/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt
index a55297999e..ab3e1ce83f 100644
--- a/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt
@@ -36,10 +36,10 @@ $args_array = array(
   array(00),
   array(-01, 01, +022),
   array(-020000000000, 020000000000, 017777777777, -017777777777),
-  array(0123456, 012345678, -01234567, 01234567),
+  array(0123456, 01234567, -01234567, 01234567),
   array(0111, 02222, -0333333, -044444444),
-  array(0x123b, 0xfAb, 0123, 01293),
-  array(01234, 05678, -01234, 02345),
+  array(0x123b, 0xfAb, 0123, 012),
+  array(01234, 0567, -01234, 02345),
   array(03, 04, 01, 02)
 
 );
diff --git a/ext/standard/tests/strings/vfprintf_variation13.phpt b/ext/standard/tests/strings/vfprintf_variation13.phpt
index fd34242424..ebb45acb6b 100644
--- a/ext/standard/tests/strings/vfprintf_variation13.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation13.phpt
@@ -38,7 +38,7 @@ $args_array = array(
   array(0x7FFFFFFF, -0x7fffffff, +0x7000000, -0x80000000),
   array(123456, 12345678, -1234567, 1234567),
   array(1, 0x2222, 0333333, -0x44444444),
-  array(0x123b, 0xfAb, "0xaxz", 01293),
+  array(0x123b, 0xfAb, "0xaxz", 012),
   array(0x1234, 0x34, 0x2ff),
   array(0x3, 0x4, 0x1, 0x2)
 
diff --git a/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt
index 68baed8537..34089e2b78 100644
--- a/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt
@@ -38,7 +38,7 @@ $args_array = array(
   array(0x7FFFFFFF, -0x7fffffff, +0x7000000, -0x80000000),
   array(123456, 12345678, -1234567, 1234567),
   array(1, 0x2222, 0333333, -0x44444444),
-  array(0x123b, 0xfAb, "0xaxz", 01293),
+  array(0x123b, 0xfAb, "0xaxz", 012),
   array(0x1234, 0x34, 0x2ff),
   array(0x3, 0x4, 0x1, 0x2)
 
diff --git a/ext/standard/tests/strings/vfprintf_variation19.phpt b/ext/standard/tests/strings/vfprintf_variation19.phpt
index 26c21e1e3c..b2fbdd88cf 100644
--- a/ext/standard/tests/strings/vfprintf_variation19.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation19.phpt
@@ -38,7 +38,7 @@ $args_array = array(
   array(65, 66, 67),
   array(2e1, 2e-1, -2e1),
   array(-11, +22, 33),
-  array(012, -02394, +02389),
+  array(012, -023, +023),
   array(0x11, -0x22, +0x33),
   array(0x11, -0x22, +0x33),
   array(2e1, 2e-1, -2e1)
diff --git a/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt
index a56357cfdf..8153ce8129 100644
--- a/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt
@@ -38,7 +38,7 @@ $args_array = array(
   array(65, 66, 67),
   array(2e1, 2e-1, -2e1),
   array(-11, +22, 33),
-  array(012, -02394, +02389),
+  array(012, -023, +023),
   array(0x11, -0x22, +0x33),
   array(0x11, -0x22, +0x33),
   array(2e1, 2e-1, -2e1)
diff --git a/ext/standard/tests/strings/vfprintf_variation3.phpt b/ext/standard/tests/strings/vfprintf_variation3.phpt
index 1ae945990c..99db0bf00b 100644
--- a/ext/standard/tests/strings/vfprintf_variation3.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation3.phpt
@@ -35,7 +35,7 @@ $args_array = array(
   array(2147483647, -2147483648, +2147483640, -2147483640),
   array(123456, 12345678, -1234567, 1234567),
   array(111, 2222, 333333, 44444444),
-  array(0x123b, 0xfAb, 0123, 01293),
+  array(0x123b, 0xfAb, 0123, 012),
   array(1234, -5678, 2345),
   array(3, 4, 1, 2)
 
diff --git a/ext/standard/tests/strings/vfprintf_variation5.phpt b/ext/standard/tests/strings/vfprintf_variation5.phpt
index eb3646ca1f..9845a3ff2c 100644
--- a/ext/standard/tests/strings/vfprintf_variation5.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation5.phpt
@@ -35,7 +35,7 @@ $args_array = array(
   array(2147483649, -2147483647, +2147483640, -2147483640),
   array(2e5, 2e-5, -2e5, -2e-5),
   array(0.2E5, -0.2e40, 0.2E-20, 0.2E+20),
-  array(0x123b, 0xfAb, 0123, 01293),
+  array(0x123b, 0xfAb, 0123, 012),
   array(1234.1234, -5678.5678, 2345.2345),
   array(3.33, 4.44, 1.11, 2.22)
 
diff --git a/ext/standard/tests/strings/vfprintf_variation9.phpt b/ext/standard/tests/strings/vfprintf_variation9.phpt
index dd3093c8c9..8481b41ade 100644
--- a/ext/standard/tests/strings/vfprintf_variation9.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation9.phpt
diff --git a/ext/standard/tests/strings/vprintf_basic8.phpt b/ext/standard/tests/strings/vprintf_basic8.phpt
index 91c6dd782d..d5f6e222d0 100644
--- a/ext/standard/tests/strings/vprintf_basic8.phpt
+++ b/ext/standard/tests/strings/vprintf_basic8.phpt
@@ -16,7 +16,7 @@ $format2 = "%o %o";
 $format3 = "%o %o %o";
 $arg1 = array(021);
 $arg2 = array(021,0347);
-$arg3 = array(021,0347,05678);
+$arg3 = array(021,0347,0567);
 
 $result = vprintf($format1,$arg1);
 echo "\n";
diff --git a/ext/standard/tests/strings/vprintf_variation11.phpt b/ext/standard/tests/strings/vprintf_variation11.phpt
index f803e96c83..4207bc294e 100644
--- a/ext/standard/tests/strings/vprintf_variation11.phpt
+++ b/ext/standard/tests/strings/vprintf_variation11.phpt
@@ -36,10 +36,10 @@ $args_array = array(
   array(00),
   array(-01, 01, +022),
   array(-020000000000, 020000000000, 017777777777, -017777777777),
-  array(0123456, 012345678, -01234567, 01234567),
+  array(0123456, 01234567, -01234567, 01234567),
   array(0111, 02222, -0333333, -044444444),
-  array(0x123b, 0xfAb, 0123, 01293),
-  array(01234, 05678, -01234, 02345),
+  array(0x123b, 0xfAb, 0123, 012),
+  array(01234, 0567, -01234, 02345),
   array(03, 04, 01, 02)
 
 );
diff --git a/ext/standard/tests/strings/vprintf_variation11_64bit.phpt b/ext/standard/tests/strings/vprintf_variation11_64bit.phpt
index 5f65c5fb44..039006fdc6 100644
--- a/ext/standard/tests/strings/vprintf_variation11_64bit.phpt
+++ b/ext/standard/tests/strings/vprintf_variation11_64bit.phpt
@@ -36,10 +36,10 @@ $args_array = array(
   array(00),
   array(-01, 01, +022),
   array(-020000000000, 020000000000, 017777777777, -017777777777),
-  array(0123456, 012345678, -01234567, 01234567),
+  array(0123456, 01234567, -01234567, 01234567),
   array(0111, 02222, -0333333, -044444444),
-  array(0x123b, 0xfAb, 0123, 01293),
-  array(01234, 05678, -01234, 02345),
+  array(0x123b, 0xfAb, 0123, 012),
+  array(01234, 0567, -01234, 02345),
   array(03, 04, 01, 02)
 
 );
diff --git a/ext/standard/tests/strings/vprintf_variation13.phpt b/ext/standard/tests/strings/vprintf_variation13.phpt
index 6b629c851d..240db721e8 100644
--- a/ext/standard/tests/strings/vprintf_variation13.phpt
+++ b/ext/standard/tests/strings/vprintf_variation13.phpt
@@ -38,7 +38,7 @@ $args_array = array(
   array(0x7FFFFFFF, -0x7fffffff, +0x7000000, -0x80000000),
   array(123456, 12345678, -1234567, 1234567),
   array(1, 0x2222, 0333333, -0x44444444),
-  array(0x123b, 0xfAb, "0xaxz", 01293),
+  array(0x123b, 0xfAb, "0xaxz", 012),
   array(0x1234, 0x34, 0x2ff),
   array(0x3, 0x4, 0x1, 0x2)
 
diff --git a/ext/standard/tests/strings/vprintf_variation13_64bit.phpt b/ext/standard/tests/strings/vprintf_variation13_64bit.phpt
index 8cf768b776..06d2bec26d 100644
--- a/ext/standard/tests/strings/vprintf_variation13_64bit.phpt
+++ b/ext/standard/tests/strings/vprintf_variation13_64bit.phpt
@@ -38,7 +38,7 @@ $args_array = array(
   array(0x7FFFFFFF, -0x7fffffff, +0x7000000, -0x80000000),
   array(123456, 12345678, -1234567, 1234567),
   array(1, 0x2222, 0333333, -0x44444444),
-  array(0x123b, 0xfAb, "0xaxz", 01293),
+  array(0x123b, 0xfAb, "0xaxz", 012),
   array(0x1234, 0x34, 0x2ff),
   array(0x3, 0x4, 0x1, 0x2)
 
diff --git a/ext/standard/tests/strings/vprintf_variation19.phpt b/ext/standard/tests/strings/vprintf_variation19.phpt
index a9288a1634..8b826d8e94 100644
--- a/ext/standard/tests/strings/vprintf_variation19.phpt
+++ b/ext/standard/tests/strings/vprintf_variation19.phpt
@@ -38,7 +38,7 @@ $args_array = array(
   array(65, 66, 67),
   array(2e1, 2e-1, -2e1),
   array(-11, +22, 33),
-  array(012, -02394, +02389),
+  array(012, -023, +023),
   array(0x11, -0x22, +0x33),
   array(0x11, -0x22, +0x33),
   array(2e1, 2e-1, -2e1)
diff --git a/ext/standard/tests/strings/vprintf_variation19_64bit.phpt b/ext/standard/tests/strings/vprintf_variation19_64bit.phpt
index d98199624f..6abc134549 100644
--- a/ext/standard/tests/strings/vprintf_variation19_64bit.phpt
+++ b/ext/standard/tests/strings/vprintf_variation19_64bit.phpt
@@ -38,7 +38,7 @@ $args_array = array(
   array(65, 66, 67),
   array(2e1, 2e-1, -2e1),
   array(-11, +22, 33),
-  array(012, -02394, +02389),
+  array(012, -023, +023),
   array(0x11, -0x22, +0x33),
   array(0x11, -0x22, +0x33),
   array(2e1, 2e-1, -2e1)
diff --git a/ext/standard/tests/strings/vprintf_variation3.phpt b/ext/standard/tests/strings/vprintf_variation3.phpt
index 41c76487c8..0b59ddda1f 100644
--- a/ext/standard/tests/strings/vprintf_variation3.phpt
+++ b/ext/standard/tests/strings/vprintf_variation3.phpt
@@ -35,7 +35,7 @@ $args_array = array(
   array(2147483647, -2147483648, +2147483640, -2147483640),
   array(123456, 12345678, -1234567, 1234567),
   array(111, 2222, 333333, 44444444),
-  array(0x123b, 0xfAb, 0123, 01293),
+  array(0x123b, 0xfAb, 0123, 012),
   array(1234, -5678, 2345),
   array(3, 4, 1, 2)
 
diff --git a/ext/standard/tests/strings/vprintf_variation5.phpt b/ext/standard/tests/strings/vprintf_variation5.phpt
index 6388f284c6..f54d1e19c5 100644
--- a/ext/standard/tests/strings/vprintf_variation5.phpt
+++ b/ext/standard/tests/strings/vprintf_variation5.phpt
@@ -35,7 +35,7 @@ $args_array = array(
   array(2147483649, -2147483647, +2147483640, -2147483640),
   array(2e5, 2e-5, -2e5, -2e-5),
   array(0.2E5, -0.2e40, 0.2E-20, 0.2E+20),
-  array(0x123b, 0xfAb, 0123, 01293),
+  array(0x123b, 0xfAb, 0123, 012),
   array(1234.1234, -5678.5678, 2345.2345),
   array(3.33, 4.44, 1.11, 2.22)
 
diff --git a/ext/standard/tests/strings/vprintf_variation9.phpt b/ext/standard/tests/strings/vprintf_variation9.phpt
index a7b513f633..5ad2db2afa 100644
--- a/ext/standard/tests/strings/vprintf_variation9.phpt
+++ b/ext/standard/tests/strings/vprintf_variation9.phpt
diff --git a/ext/standard/tests/strings/vsprintf_basic8.phpt b/ext/standard/tests/strings/vsprintf_basic8.phpt
index 59f17b6507..cd2929e007 100644
--- a/ext/standard/tests/strings/vsprintf_basic8.phpt
+++ b/ext/standard/tests/strings/vsprintf_basic8.phpt
@@ -16,7 +16,7 @@ $format2 = "%o %o";
 $format3 = "%o %o %o";
 $arg1 = array(021);
 $arg2 = array(021,0347);
-$arg3 = array(021,0347,05678);
+$arg3 = array(021,0347,0567);
 
 var_dump( vsprintf($format1,$arg1) );
 var_dump( vsprintf($format2,$arg2) );
diff --git a/ext/standard/tests/strings/vsprintf_variation11.phpt b/ext/standard/tests/strings/vsprintf_variation11.phpt
index e7fe663c4e..4cc5b02922 100644
--- a/ext/standard/tests/strings/vsprintf_variation11.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation11.phpt
@@ -36,10 +36,10 @@ $args_array = array(
   array(00),
   array(-01, 01, +022),
   array(-020000000000, 020000000000, 017777777777, -017777777777),
-  array(0123456, 012345678, -01234567, 01234567),
+  array(0123456, 01234567, -01234567, 01234567),
   array(0111, 02222, -0333333, -044444444),
-  array(0x123b, 0xfAb, 0123, 01293),
-  array(01234, 05678, -01234, 02345),
+  array(0x123b, 0xfAb, 0123, 012),
+  array(01234, 0567, -01234, 02345),
   array(03, 04, 01, 02)
 
 );
diff --git a/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt
index 61327c84ba..841d104b81 100644
--- a/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt
@@ -36,10 +36,10 @@ $args_array = array(
   array(00),
   array(-01, 01, +022),
   array(-020000000000, 020000000000, 017777777777, -017777777777),
-  array(0123456, 012345678, -01234567, 01234567),
+  array(0123456, 01234567, -01234567, 01234567),
   array(0111, 02222, -0333333, -044444444),
-  array(0x123b, 0xfAb, 0123, 01293),
-  array(01234, 05678, -01234, 02345),
+  array(0x123b, 0xfAb, 0123, 012),
+  array(01234, 0567, -01234, 02345),
   array(03, 04, 01, 02)
 
 );
diff --git a/ext/standard/tests/strings/vsprintf_variation13.phpt b/ext/standard/tests/strings/vsprintf_variation13.phpt
index 3e89fa3508..b617975759 100644
--- a/ext/standard/tests/strings/vsprintf_variation13.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation13.phpt
@@ -38,7 +38,7 @@ $args_array = array(
   array(0x7FFFFFFF, -0x7fffffff, +0x7000000, -0x80000000),
   array(123456, 12345678, -1234567, 1234567),
   array(1, 0x2222, 0333333, -0x44444444),
-  array(0x123b, 0xfAb, "0xaxz", 01293),
+  array(0x123b, 0xfAb, "0xaxz", 012),
   array(0x1234, 0x34, 0x2ff),
   array(0x3, 0x4, 0x1, 0x2)
 
diff --git a/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt
index 749a4a858f..8d2533a8fc 100644
--- a/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt
@@ -38,7 +38,7 @@ $args_array = array(
   array(0x7FFFFFFF, -0x7fffffff, +0x7000000, -0x80000000),
   array(123456, 12345678, -1234567, 1234567),
   array(1, 0x2222, 0333333, -0x44444444),
-  array(0x123b, 0xfAb, "0xaxz", 01293),
+  array(0x123b, 0xfAb, "0xaxz", 012),
   array(0x1234, 0x34, 0x2ff),
   array(0x3, 0x4, 0x1, 0x2)
 
diff --git a/ext/standard/tests/strings/vsprintf_variation19.phpt b/ext/standard/tests/strings/vsprintf_variation19.phpt
index 4ad276a880..8d475b75a3 100644
--- a/ext/standard/tests/strings/vsprintf_variation19.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation19.phpt
@@ -38,7 +38,7 @@ $args_array = array(
   array(65, 66, 67),
   array(2e1, 2e-1, -2e1),
   array(-11, +22, 33),
-  array(012, -02394, +02389),
+  array(012, -023, +023),
   array(0x11, -0x22, +0x33),
   array(0x11, -0x22, +0x33),
   array(2e1, 2e-1, -2e1)
diff --git a/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt
index 6e805feb7f..69145ba963 100644
--- a/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt
@@ -38,7 +38,7 @@ $args_array = array(
   array(65, 66, 67),
   array(2e1, 2e-1, -2e1),
   array(-11, +22, 33),
-  array(012, -02394, +02389),
+  array(012, -023, +023),
   array(0x11, -0x22, +0x33),
   array(0x11, -0x22, +0x33),
   array(2e1, 2e-1, -2e1)
diff --git a/ext/standard/tests/strings/vsprintf_variation3.phpt b/ext/standard/tests/strings/vsprintf_variation3.phpt
index fff82c8032..2932e15f18 100644
--- a/ext/standard/tests/strings/vsprintf_variation3.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation3.phpt
@@ -35,7 +35,7 @@ $args_array = array(
   array(2147483647, -2147483648, +2147483640, -2147483640),
   array(123456, 12345678, -1234567, 1234567),
   array(111, 2222, 333333, 44444444),
-  array(0x123b, 0xfAb, 0123, 01293),
+  array(0x123b, 0xfAb, 0123, 012),
   array(1234, -5678, 2345),
   array(3, 4, 1, 2)
 
diff --git a/ext/standard/tests/strings/vsprintf_variation5.phpt b/ext/standard/tests/strings/vsprintf_variation5.phpt
index dd356fbbe0..b2bd0d5b79 100644
--- a/ext/standard/tests/strings/vsprintf_variation5.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation5.phpt
@@ -35,7 +35,7 @@ $args_array = array(
   array(2147483649, -2147483647, +2147483640, -2147483640),
   array(2e5, 2e-5, -2e5, -2e-5),
   array(0.2E5, -0.2e40, 0.2E-20, 0.2E+20),
-  array(0x123b, 0xfAb, 0123, 01293),
+  array(0x123b, 0xfAb, 0123, 012),
   array(1234.1234, -5678.5678, 2345.2345),
   array(3.33, 4.44, 1.11, 2.22)
 
diff --git a/ext/standard/tests/strings/vsprintf_variation9.phpt b/ext/standard/tests/strings/vsprintf_variation9.phpt
index 2d46637391..c16531b2f5 100644
--- a/ext/standard/tests/strings/vsprintf_variation9.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation9.phpt