[PHP-CVS] cvs: php-src(PHP_5_3) /ext/ereg/tests ereg_replace_variation_002.phpt eregi_replace_variation_002.phpt split_variation_003.phpt spliti_variation_003.phpt

2008-11-29 Thread Felipe Pena 
felipe  Sat Nov 29 22:45:49 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/ereg/tests ereg_replace_variation_002.phpt 
eregi_replace_variation_002.phpt 
split_variation_003.phpt 
spliti_variation_003.phpt 
  Log:
  - Fixed tests
  http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/tests/ereg_replace_variation_002.phpt?r1=1.1.2.6r2=1.1.2.7diff_format=u
Index: php-src/ext/ereg/tests/ereg_replace_variation_002.phpt
diff -u php-src/ext/ereg/tests/ereg_replace_variation_002.phpt:1.1.2.6 
php-src/ext/ereg/tests/ereg_replace_variation_002.phpt:1.1.2.7
--- php-src/ext/ereg/tests/ereg_replace_variation_002.phpt:1.1.2.6  Thu Nov 
27 14:39:33 2008
+++ php-src/ext/ereg/tests/ereg_replace_variation_002.phpt  Sat Nov 29 
22:45:48 2008
@@ -85,79 +85,104 @@
 Error: 8 - Undefined variable: unset_var, %s(67)
 
 Arg value 0 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) ho%21
 
 Arg value 1 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) h%01o%21
 
 Arg value 12345 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(6) h9o%21
 
 Arg value -2345 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) h%D7o%21
 
 Arg value 10.5 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) h%0Ao%21
 
 Arg value -10.5 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) h%F6o%21
 
 Arg value 101234567000 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(%d) h%so%21
 
 Arg value 1.07654321E-9 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) ho%21
 
 Arg value 0.5 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) ho%21
 
 Arg value Array 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) ho%21
 
 Arg value Array 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) h%01o%21
 
 Arg value Array 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) h%01o%21
 
 Arg value Array 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) h%01o%21
 
 Arg value Array 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) h%01o%21
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) ho%21
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) ho%21
 
 Arg value 1 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) h%01o%21
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) ho%21
 
 Arg value 1 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) h%01o%21
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) ho%21
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) ho%21
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) ho%21
 Error: 4096 - Object of class stdClass could not be converted to string, %s(73)
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 Error: 8 - Object of class stdClass could not be converted to int, %s(74)
 string(8) h%01o%21
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) ho%21
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) ho%21
 Done
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/tests/eregi_replace_variation_002.phpt?r1=1.1.2.6r2=1.1.2.7diff_format=u
Index: php-src/ext/ereg/tests/eregi_replace_variation_002.phpt
diff -u php-src/ext/ereg/tests/eregi_replace_variation_002.phpt:1.1.2.6 
php-src/ext/ereg/tests/eregi_replace_variation_002.phpt:1.1.2.7
--- php-src/ext/ereg/tests/eregi_replace_variation_002.phpt:1.1.2.6 Thu Nov 
27 14:39:33 2008
+++ php-src/ext/ereg/tests/eregi_replace_variation_002.phpt Sat Nov 29 
22:45:48 2008
@@ -85,79 +85,104 @@
 Error: 8 - Undefined variable: unset_var, %s(67)
 
 Arg value 0 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(5) ho%21
 
 Arg value 1 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) h%01o%21
 
 Arg value 12345 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(6) h9o%21
 
 Arg value -2345 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) h%D7o%21
 
 Arg value 10.5 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) h%0Ao%21
 
 Arg value -10.5 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) h%F6o%21
 
 Arg value 101234567000 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(%d) h%so%21
 
 Arg value 1.07654321E-9 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(5) ho%21
 
 Arg value 0.5 
+Error: 8192 -

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/ereg/tests ereg_replace_variation_002.phpt eregi_replace_variation_002.phpt split_variation_003.phpt spliti_variation_003.phpt

2008-11-27 Thread Ant Phillips 
ant Thu Nov 27 14:39:33 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/ereg/tests split_variation_003.phpt 
ereg_replace_variation_002.phpt 
eregi_replace_variation_002.phpt 
spliti_variation_003.phpt 
  Log:
  Latest and greatest versions of these session tests - checked on 5.2.X snap 
on Windows, Linux and Linux 64 bit.
  http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/tests/split_variation_003.phpt?r1=1.1.2.5r2=1.1.2.6diff_format=u
Index: php-src/ext/ereg/tests/split_variation_003.phpt
diff -u php-src/ext/ereg/tests/split_variation_003.phpt:1.1.2.5 
php-src/ext/ereg/tests/split_variation_003.phpt:1.1.2.6
--- php-src/ext/ereg/tests/split_variation_003.phpt:1.1.2.5 Tue Nov 18 
17:55:07 2008
+++ php-src/ext/ereg/tests/split_variation_003.phpt Thu Nov 27 14:39:33 2008
@@ -82,7 +82,6 @@
 *** Testing split() : usage variations ***
 
 Arg value 10.5 
-Error: 8192 - Function split() is deprecated, %s(73)
 array(5) {
   [0]=
   string(1) 1
@@ -97,130 +96,130 @@
 }
 
 Arg value -10.5 
-Error: 8192 - Function split() is deprecated, %s(73)
 array(1) {
   [0]=
   string(9) 1 2 3 4 5
 }
 
 Arg value 1.07654321E-9 
-Error: 8192 - Function split() is deprecated, %s(73)
 array(1) {
   [0]=
   string(9) 1 2 3 4 5
 }
 
 Arg value 0.5 
-Error: 8192 - Function split() is deprecated, %s(73)
 array(1) {
   [0]=
   string(9) 1 2 3 4 5
 }
 
 Arg value Array 
-Error: 8192 - Function split() is deprecated, %s(73)
-Error: 2 - split() expects parameter 3 to be long, array given, %s(73)
-NULL
+array(1) {
+  [0]=
+  string(9) 1 2 3 4 5
+}
 
 Arg value Array 
-Error: 8192 - Function split() is deprecated, %s(73)
-Error: 2 - split() expects parameter 3 to be long, array given, %s(73)
-NULL
+array(1) {
+  [0]=
+  string(9) 1 2 3 4 5
+}
 
 Arg value Array 
-Error: 8192 - Function split() is deprecated, %s(73)
-Error: 2 - split() expects parameter 3 to be long, array given, %s(73)
-NULL
+array(1) {
+  [0]=
+  string(9) 1 2 3 4 5
+}
 
 Arg value Array 
-Error: 8192 - Function split() is deprecated, %s(73)
-Error: 2 - split() expects parameter 3 to be long, array given, %s(73)
-NULL
+array(1) {
+  [0]=
+  string(9) 1 2 3 4 5
+}
 
 Arg value Array 
-Error: 8192 - Function split() is deprecated, %s(73)
-Error: 2 - split() expects parameter 3 to be long, array given, %s(73)
-NULL
+array(1) {
+  [0]=
+  string(9) 1 2 3 4 5
+}
 
 Arg value  
-Error: 8192 - Function split() is deprecated, %s(73)
 array(1) {
   [0]=
   string(9) 1 2 3 4 5
 }
 
 Arg value  
-Error: 8192 - Function split() is deprecated, %s(73)
 array(1) {
   [0]=
   string(9) 1 2 3 4 5
 }
 
 Arg value 1 
-Error: 8192 - Function split() is deprecated, %s(73)
 array(1) {
   [0]=
   string(9) 1 2 3 4 5
 }
 
 Arg value  
-Error: 8192 - Function split() is deprecated, %s(73)
 array(1) {
   [0]=
   string(9) 1 2 3 4 5
 }
 
 Arg value 1 
-Error: 8192 - Function split() is deprecated, %s(73)
 array(1) {
   [0]=
   string(9) 1 2 3 4 5
 }
 
 Arg value  
-Error: 8192 - Function split() is deprecated, %s(73)
 array(1) {
   [0]=
   string(9) 1 2 3 4 5
 }
 
 Arg value  
-Error: 8192 - Function split() is deprecated, %s(73)
-Error: 2 - split() expects parameter 3 to be long, string given, %s(73)
-NULL
+array(1) {
+  [0]=
+  string(9) 1 2 3 4 5
+}
 
 Arg value  
-Error: 8192 - Function split() is deprecated, %s(73)
-Error: 2 - split() expects parameter 3 to be long, string given, %s(73)
-NULL
+array(1) {
+  [0]=
+  string(9) 1 2 3 4 5
+}
 
 Arg value string 
-Error: 8192 - Function split() is deprecated, %s(73)
-Error: 2 - split() expects parameter 3 to be long, string given, %s(73)
-NULL
+array(1) {
+  [0]=
+  string(9) 1 2 3 4 5
+}
 
 Arg value string 
-Error: 8192 - Function split() is deprecated, %s(73)
-Error: 2 - split() expects parameter 3 to be long, string given, %s(73)
-NULL
+array(1) {
+  [0]=
+  string(9) 1 2 3 4 5
+}
 Error: 4096 - Object of class stdClass could not be converted to string, %s(72)
 
 Arg value  
-Error: 8192 - Function split() is deprecated, %s(73)
-Error: 2 - split() expects parameter 3 to be long, object given, %s(73)
-NULL
+Error: 8 - Object of class stdClass could not be converted to int, %s(73)
+array(1) {
+  [0]=
+  string(9) 1 2 3 4 5
+}
 
 Arg value  
-Error: 8192 - Function split() is deprecated, %s(73)
 array(1) {
   [0]=
   string(9) 1 2 3 4 5
 }
 
 Arg value  
-Error: 8192 - Function split() is deprecated, %s(73)
 array(1) {
   [0]=
   string(9) 1 2 3 4 5
 }
-Done
+Done
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/tests/ereg_replace_variation_002.phpt?r1=1.1.2.5r2=1.1.2.6diff_format=u
Index: php-src/ext/ereg/tests/ereg_replace_variation_002.phpt
diff -u php-src/ext/ereg/tests/ereg_replace_variation_002.phpt:1.1.2.5 
php-src/ext/ereg/tests/ereg_replace_variation_002.phpt:1.1.2.6
--- php-src/ext/ereg/tests/ereg_replace_variation_002.phpt:1.1.2.5  Thu Nov 
20 13:31:34 2008
+++

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/ereg/tests ereg_replace_variation_002.phpt eregi_replace_variation_002.phpt split_variation_003.phpt spliti_variation_003.phpt

2008-04-22 Thread Robin Fernandes 
robinf  Tue Apr 22 15:31:57 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/ereg/tests split_variation_003.phpt 
spliti_variation_003.phpt 
eregi_replace_variation_002.phpt 
ereg_replace_variation_002.phpt 
  Log:
  Fix some ereg tests for 64bit platforms.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/tests/split_variation_003.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/ereg/tests/split_variation_003.phpt
diff -u php-src/ext/ereg/tests/split_variation_003.phpt:1.1.2.2 
php-src/ext/ereg/tests/split_variation_003.phpt:1.1.2.3
--- php-src/ext/ereg/tests/split_variation_003.phpt:1.1.2.2 Fri Apr 11 
08:57:16 2008
+++ php-src/ext/ereg/tests/split_variation_003.phpt Tue Apr 22 15:31:57 2008
@@ -9,13 +9,16 @@
  */
 
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-   echo Error: $err_no - $err_msg, $filename($linenum)\n;
+   if (error_reporting() != 0) {
+   // report non-silenced errors
+   echo Error: $err_no - $err_msg, $filename($linenum)\n;
+   }
 }
 set_error_handler('test_error_handler');
 echo *** Testing split() : usage variations ***\n;
 
 // Initialise function arguments not being substituted (if any)
-$pattern = '[[:space:]]';
+$pattern = b'[[:space:]]';
 $string = '1 2 3 4 5';
 
 //get an unset variable
@@ -28,7 +31,6 @@
   // float data
   10.5,
   -10.5,
-  10.1234567e10,
   10.7654321E-10,
   .5,
 
@@ -61,10 +63,10 @@
   new stdclass(),
 
   // undefined data
-  $undefined_var,
+  @$undefined_var,
 
   // unset data
-  $unset_var,
+  @$unset_var,
 );
 
 // loop through each element of the array for limit
@@ -78,8 +80,6 @@
 ?
 --EXPECTF--
 *** Testing split() : usage variations ***
-Error: 8 - Undefined variable: undefined_var, %s(61)
-Error: 8 - Undefined variable: unset_var, %s(64)
 
 Arg value 10.5 
 array(5) {
@@ -101,20 +101,6 @@
   string(9) 1 2 3 4 5
 }
 
-Arg value 101234567000 
-array(5) {
-  [0]=
-  string(1) 1
-  [1]=
-  string(1) 2
-  [2]=
-  string(1) 3
-  [3]=
-  string(1) 4
-  [4]=
-  string(1) 5
-}
-
 Arg value 1.07654321E-9 
 array(1) {
   [0]=
@@ -216,10 +202,10 @@
   [0]=
   string(9) 1 2 3 4 5
 }
-Error: 4096 - Object of class stdClass could not be converted to string, %s(70)
+Error: 4096 - Object of class stdClass could not be converted to string, %s(72)
 
 Arg value  
-Error: 8 - Object of class stdClass could not be converted to int, %s(71)
+Error: 8 - Object of class stdClass could not be converted to int, %s(73)
 array(1) {
   [0]=
   string(9) 1 2 3 4 5
http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/tests/spliti_variation_003.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/ereg/tests/spliti_variation_003.phpt
diff -u php-src/ext/ereg/tests/spliti_variation_003.phpt:1.1.2.2 
php-src/ext/ereg/tests/spliti_variation_003.phpt:1.1.2.3
--- php-src/ext/ereg/tests/spliti_variation_003.phpt:1.1.2.2Fri Apr 11 
08:57:16 2008
+++ php-src/ext/ereg/tests/spliti_variation_003.phptTue Apr 22 15:31:57 2008
@@ -9,13 +9,16 @@
  */
 
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-   echo Error: $err_no - $err_msg, $filename($linenum)\n;
+   if (error_reporting() != 0) {
+   // report non-silenced errors
+   echo Error: $err_no - $err_msg, $filename($linenum)\n;
+   }
 }
 set_error_handler('test_error_handler');
 echo *** Testing spliti() : usage variations ***\n;
 
 // Initialise function arguments not being substituted (if any)
-$pattern = '[[:space:]]';
+$pattern = b'[[:space:]]';
 $string = '1 2 3 4 5';
 
 //get an unset variable
@@ -28,7 +31,6 @@
   // float data
   10.5,
   -10.5,
-  10.1234567e10,
   10.7654321E-10,
   .5,
 
@@ -61,10 +63,10 @@
   new stdclass(),
 
   // undefined data
-  $undefined_var,
+  @$undefined_var,
 
   // unset data
-  $unset_var,
+  @$unset_var,
 );
 
 // loop through each element of the array for limit
@@ -78,8 +80,6 @@
 ?
 --EXPECTF--
 *** Testing spliti() : usage variations ***
-Error: 8 - Undefined variable: undefined_var, %s(61)
-Error: 8 - Undefined variable: unset_var, %s(64)
 
 Arg value 10.5 
 array(5) {
@@ -101,20 +101,6 @@
   string(9) 1 2 3 4 5
 }
 
-Arg value 101234567000 
-array(5) {
-  [0]=
-  string(1) 1
-  [1]=
-  string(1) 2
-  [2]=
-  string(1) 3
-  [3]=
-  string(1) 4
-  [4]=
-  string(1) 5
-}
-
 Arg value 1.07654321E-9 
 array(1) {
   [0]=
@@ -216,10 +202,10 @@
   [0]=
   string(9) 1 2 3 4 5
 }
-Error: 4096 - Object of class stdClass could not be converted to string, %s(70)
+Error: 4096 - Object of class stdClass could not be converted to string, %s(72)
 
 Arg value  
-Error: 8 - Object of class stdClass could not be converted to int, %s(71)
+Error: 8 - Object of class stdClass could not be converted to int, %s(73)
 array(1) {