[PHP-CVS] cvs: CVSROOT / avail
derick Tue Apr 22 12:03:10 2008 UTC Modified files: /CVSROOTavail Log: - Give Anthony Phillips source access so he can add tests. http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1379r2=1.1380diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1379 CVSROOT/avail:1.1380 --- CVSROOT/avail:1.1379Wed Apr 16 09:17:38 2008 +++ CVSROOT/avail Tue Apr 22 12:03:09 2008 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP, as well as the documentation. -avail|lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,go! palv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no,phd +avail|lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,go! palv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no,phd # Some people have access to tests in the Engine avail|magnus,michael,zoe,jmessa|Zend/tests,ZendEngine2/tests -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo pdo_dbh.c
iliaa Tue Apr 22 13:01:45 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdopdo_dbh.c
Log:
Added a warning message on pdo::exec() failure in the event of an empty query
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.17.2.9r2=1.82.2.31.2.17.2.10diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.9
php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.10
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.9Tue Mar 18 14:44:35 2008
+++ php-src/ext/pdo/pdo_dbh.c Tue Apr 22 13:01:45 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.9 2008/03/18 14:44:35 tony2001 Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.10 2008/04/22 13:01:45 iliaa Exp $ */
/* The PDO Database Handle Class */
@@ -922,6 +922,7 @@
}
if (!statement_len) {
+ pdo_raise_impl_error(dbh, NULL, HY000, trying to execute
and empty query TSRMLS_CC);
RETURN_FALSE;
}
PDO_DBH_CLEAR_ERR();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ldap/tests ldap_dn2ufn.phpt ldap_explode_dn.phpt
tony2001Tue Apr 22 13:31:18 2008 UTC Modified files: /php-src/ext/ldap/tests ldap_dn2ufn.phpt ldap_explode_dn.phpt Log: fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/tests/ldap_dn2ufn.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/ldap/tests/ldap_dn2ufn.phpt diff -u php-src/ext/ldap/tests/ldap_dn2ufn.phpt:1.2 php-src/ext/ldap/tests/ldap_dn2ufn.phpt:1.3 --- php-src/ext/ldap/tests/ldap_dn2ufn.phpt:1.2 Thu Dec 13 18:00:46 2007 +++ php-src/ext/ldap/tests/ldap_dn2ufn.phpt Tue Apr 22 13:31:17 2008 @@ -28,6 +28,6 @@ string(23) bob, users, example.com bool(false) -Warning: Wrong parameter count for ldap_dn2ufn() in %s on line %d +Warning: ldap_dn2ufn() expects exactly 1 parameter, 2 given in %s on line %d bool(false) Done http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/tests/ldap_explode_dn.phpt?r1=1.4r2=1.5diff_format=u Index: php-src/ext/ldap/tests/ldap_explode_dn.phpt diff -u php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.4 php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.5 --- php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.4 Thu Dec 13 17:46:23 2007 +++ php-src/ext/ldap/tests/ldap_explode_dn.phpt Tue Apr 22 13:31:17 2008 @@ -86,9 +86,9 @@ bool(false) bool(false) -Warning: Wrong parameter count for ldap_explode_dn() in %s on line %d +Warning: ldap_explode_dn() expects exactly 2 parameters, 1 given in %s on line %d -Warning: Wrong parameter count for ldap_explode_dn() in %s on line %d +Warning: ldap_explode_dn() expects exactly 2 parameters, 3 given in %s on line %d bool(false) bool(false) Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/ldap/tests ldap_dn2ufn.phpt ldap_explode_dn.phpt
tony2001Tue Apr 22 13:31:25 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/ldap/tests ldap_dn2ufn.phpt ldap_explode_dn.phpt Log: fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/tests/ldap_dn2ufn.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/ldap/tests/ldap_dn2ufn.phpt diff -u php-src/ext/ldap/tests/ldap_dn2ufn.phpt:1.1.4.2 php-src/ext/ldap/tests/ldap_dn2ufn.phpt:1.1.4.3 --- php-src/ext/ldap/tests/ldap_dn2ufn.phpt:1.1.4.2 Thu Dec 13 18:00:27 2007 +++ php-src/ext/ldap/tests/ldap_dn2ufn.phpt Tue Apr 22 13:31:25 2008 @@ -28,6 +28,6 @@ string(23) bob, users, example.com bool(false) -Warning: Wrong parameter count for ldap_dn2ufn() in %s on line %d +Warning: ldap_dn2ufn() expects exactly 1 parameter, 2 given in %s on line %d bool(false) Done http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/tests/ldap_explode_dn.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u Index: php-src/ext/ldap/tests/ldap_explode_dn.phpt diff -u php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.1.2.3 php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.1.2.4 --- php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.1.2.3 Thu Dec 13 17:45:44 2007 +++ php-src/ext/ldap/tests/ldap_explode_dn.phpt Tue Apr 22 13:31:25 2008 @@ -86,9 +86,9 @@ bool(false) bool(false) -Warning: Wrong parameter count for ldap_explode_dn() in %s on line %d +Warning: ldap_explode_dn() expects exactly 2 parameters, 1 given in %s on line %d -Warning: Wrong parameter count for ldap_explode_dn() in %s on line %d +Warning: ldap_explode_dn() expects exactly 2 parameters, 3 given in %s on line %d bool(false) bool(false) Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/reg ereg_replace_variation_002.phpt eregi_replace_variation_002.phpt split_variation_003.phpt spliti_variation_003.phpt
robinf Tue Apr 22 15:31:56 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/reg ereg_replace_variation_002.phpt
split_variation_003.phpt
spliti_variation_003.phpt
eregi_replace_variation_002.phpt
Log:
Fix some ereg tests for 64bit platforms.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/reg/ereg_replace_variation_002.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/standard/tests/reg/ereg_replace_variation_002.phpt
diff -u php-src/ext/standard/tests/reg/ereg_replace_variation_002.phpt:1.1.2.1
php-src/ext/standard/tests/reg/ereg_replace_variation_002.phpt:1.1.2.2
--- php-src/ext/standard/tests/reg/ereg_replace_variation_002.phpt:1.1.2.1
Fri Apr 11 08:57:11 2008
+++ php-src/ext/standard/tests/reg/ereg_replace_variation_002.phpt Tue Apr
22 15:31:56 2008
@@ -103,7 +103,7 @@
string(8) h%F6o%21
Arg value 101234567000
-string(6) hXo%21
+string(%d) h%so%21
Arg value 1.07654321E-9
string(5) ho%21
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/reg/split_variation_003.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/standard/tests/reg/split_variation_003.phpt
diff -u php-src/ext/standard/tests/reg/split_variation_003.phpt:1.1.2.1
php-src/ext/standard/tests/reg/split_variation_003.phpt:1.1.2.2
--- php-src/ext/standard/tests/reg/split_variation_003.phpt:1.1.2.1 Fri Apr
11 08:57:11 2008
+++ php-src/ext/standard/tests/reg/split_variation_003.phpt Tue Apr 22
15:31:56 2008
@@ -9,7 +9,10 @@
*/
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;
@@ -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,12 +101,6 @@
string(9) 1 2 3 4 5
}
-Arg value 101234567000
-array(1) {
- [0]=
- string(9) 1 2 3 4 5
-}
-
Arg value 1.07654321E-9
array(1) {
[0]=
@@ -208,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/standard/tests/reg/spliti_variation_003.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/standard/tests/reg/spliti_variation_003.phpt
diff -u php-src/ext/standard/tests/reg/spliti_variation_003.phpt:1.1.2.1
php-src/ext/standard/tests/reg/spliti_variation_003.phpt:1.1.2.2
--- php-src/ext/standard/tests/reg/spliti_variation_003.phpt:1.1.2.1Fri Apr
11 08:57:11 2008
+++ php-src/ext/standard/tests/reg/spliti_variation_003.phptTue Apr 22
15:31:56 2008
@@ -9,7 +9,10 @@
*/
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;
@@ -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,12 +101,6 @@
string(9) 1 2 3 4 5
}
-Arg value 101234567000
-array(1) {
- [0]=
- string(9) 1 2 3 4 5
-}
-
Arg value 1.07654321E-9
array(1) {
[0]=
@@ -208,10 +202,10 @@
[0]=
string(9) 1 2 3 4 5
}
-Error: 4096 - Object of
[PHP-CVS] cvs: php-src /ext/ereg/tests ereg_replace_variation_002.phpt eregi_replace_variation_002.phpt split_variation_003.phpt spliti_variation_003.phpt
robinf Tue Apr 22 15:31:55 2008 UTC
Modified files:
/php-src/ext/ereg/tests eregi_replace_variation_002.phpt
ereg_replace_variation_002.phpt
split_variation_003.phpt
spliti_variation_003.phpt
Log:
Fix some ereg tests for 64bit platforms.
http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/tests/eregi_replace_variation_002.phpt?r1=1.1r2=1.2diff_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
php-src/ext/ereg/tests/eregi_replace_variation_002.phpt:1.2
--- php-src/ext/ereg/tests/eregi_replace_variation_002.phpt:1.1 Fri Apr 11
08:57:06 2008
+++ php-src/ext/ereg/tests/eregi_replace_variation_002.phpt Tue Apr 22
15:31:54 2008
@@ -103,7 +103,7 @@
string(8) h%F6o%21
Arg value 101234567000
-string(8) h%FFo%21
+string(%d) h%so%21
Arg value 1.07654321E-9
string(5) ho%21
http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/tests/ereg_replace_variation_002.phpt?r1=1.1r2=1.2diff_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
php-src/ext/ereg/tests/ereg_replace_variation_002.phpt:1.2
--- php-src/ext/ereg/tests/ereg_replace_variation_002.phpt:1.1 Fri Apr 11
08:57:06 2008
+++ php-src/ext/ereg/tests/ereg_replace_variation_002.phpt Tue Apr 22
15:31:54 2008
@@ -103,7 +103,7 @@
string(8) h%F6o%21
Arg value 101234567000
-string(8) h%FFo%21
+string(%d) h%so%21
Arg value 1.07654321E-9
string(5) ho%21
http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/tests/split_variation_003.phpt?r1=1.1r2=1.2diff_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
php-src/ext/ereg/tests/split_variation_003.phpt:1.2
--- php-src/ext/ereg/tests/split_variation_003.phpt:1.1 Fri Apr 11 08:57:06 2008
+++ php-src/ext/ereg/tests/split_variation_003.phpt Tue Apr 22 15:31:54 2008
@@ -9,7 +9,10 @@
*/
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;
@@ -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]=
@@ -126,35 +112,35 @@
[0]=
string(9) 1 2 3 4 5
}
-Error: 8 - Array to string conversion, %s(70)
+Error: 8 - Array to string conversion, %s(72)
Arg value Array
array(1) {
[0]=
string(9) 1 2 3 4 5
}
-Error: 8 - Array to string conversion, %s(70)
+Error: 8 - Array to string conversion, %s(72)
Arg value Array
array(1) {
[0]=
string(9) 1 2 3 4 5
}
-Error: 8 - Array to string conversion, %s(70)
+Error: 8 - Array to string conversion, %s(72)
Arg value Array
array(1) {
[0]=
string(9) 1 2 3 4 5
}
-Error: 8 - Array to string conversion, %s(70)
+Error: 8 - Array to string conversion, %s(72)
Arg value Array
array(1) {
[0]=
string(9) 1 2 3 4 5
}
-Error: 8 - Array to string conversion, %s(70)
+Error: 8 - Array to string conversion, %s(72)
Arg value Array
array(1) {
@@ -221,10 +207,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.1r2=1.2diff_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
php-src/ext/ereg/tests/spliti_variation_003.phpt:1.2
--- php-src/ext/ereg/tests/spliti_variation_003.phpt:1.1Fri Apr 11
08:57:06 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
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) {
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/session/tests 022.phpt 023.phpt 024.phpt 025.phpt 026.phpt 027.phpt 028.phpt 029.phpt 030.phpt
ant Tue Apr 22 15:58:33 2008 UTC Added files: (Branch: PHP_5_2) /php-src/ext/session/tests 029.phpt 028.phpt 026.phpt 024.phpt 030.phpt 027.phpt 023.phpt 022.phpt 025.phpt Log: These tests were backported from the PHP 6.0 branch, which in turn were ported from this branch and then updated to remove any dependencies on register_globals. With register_globals removed they are useful tests to run against the 5.X branches. http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/029.phpt?view=markuprev=1.1 Index: php-src/ext/session/tests/029.phpt +++ php-src/ext/session/tests/029.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/028.phpt?view=markuprev=1.1 Index: php-src/ext/session/tests/028.phpt +++ php-src/ext/session/tests/028.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/026.phpt?view=markuprev=1.1 Index: php-src/ext/session/tests/026.phpt +++ php-src/ext/session/tests/026.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/024.phpt?view=markuprev=1.1 Index: php-src/ext/session/tests/024.phpt +++ php-src/ext/session/tests/024.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/030.phpt?view=markuprev=1.1 Index: php-src/ext/session/tests/030.phpt +++ php-src/ext/session/tests/030.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/027.phpt?view=markuprev=1.1 Index: php-src/ext/session/tests/027.phpt +++ php-src/ext/session/tests/027.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/023.phpt?view=markuprev=1.1 Index: php-src/ext/session/tests/023.phpt +++ php-src/ext/session/tests/023.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/022.phpt?view=markuprev=1.1 Index: php-src/ext/session/tests/022.phpt +++ php-src/ext/session/tests/022.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/025.phpt?view=markuprev=1.1 Index: php-src/ext/session/tests/025.phpt +++ php-src/ext/session/tests/025.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/session/tests save_handler.inc session_cache_expire_basic.phpt session_cache_expire_error.phpt session_cache_expire_variation1.phpt session_cache_expire_variation2
ant Tue Apr 22 16:02:44 2008 UTC Added files: (Branch: PHP_5_2) /php-src/ext/session/tests session_decode_error2.phpt session_set_save_handler_error.phpt session_set_save_handler_variation2.phpt session_write_close_variation2.phpt session_module_name_variation3.phpt session_cache_limiter_error.phpt session_start_variation6.phpt session_encode_variation5.phpt session_destroy_variation1.phpt session_commit_variation4.phpt session_set_cookie_params_variation5.phpt session_encode_variation3.phpt session_unset_variation1.phpt session_cache_expire_error.phpt session_set_save_handler_error2.phpt session_get_cookie_params_error.phpt session_cache_limiter_variation2.phpt session_write_close_variation1.phpt session_id_basic.phpt session_regenerate_id_error.phpt session_set_save_handler_error3.phpt session_save_path_variation2.phpt session_commit_variation2.phpt session_set_cookie_params_variation4.phpt session_regenerate_id_basic.phpt session_unregister_variation3.phpt session_cache_expire_variation2.phpt session_module_name_basic.phpt session_id_error3.phpt session_module_name_error.phpt session_encode_error.phpt session_decode_variation2.phpt session_destroy_variation2.phpt session_encode_error2.phpt session_cache_limiter_variation3.phpt session_name_variation2.phpt session_unset_error.phpt session_decode_variation1.phpt session_start_variation9.phpt session_is_registered_variation2.phpt session_set_cookie_params_variation3.phpt session_commit_basic.phpt session_encode_variation6.phpt session_start_variation8.phpt session_register_variation4.phpt session_start_variation4.phpt session_set_save_handler_variation3.phpt session_unregister_variation1.phpt session_regenerate_id_variation1.phpt session_name_basic.phpt session_save_path_error.phpt session_id_error.phpt session_get_cookie_params_variation1.phpt session_name_variation1.phpt session_module_name_variation2.phpt session_is_registered_variation1.phpt session_write_close_basic.phpt session_write_close_variation4.phpt session_id_error2.phpt session_encode_variation4.phpt session_write_close_variation3.phpt session_encode_variation2.phpt session_set_save_handler_variation1.phpt session_register_basic.phpt session_get_cookie_params_basic.phpt session_cache_limiter_basic.phpt session_save_path_variation1.phpt session_cache_limiter_variation1.phpt session_commit_error.phpt session_start_variation7.phpt session_decode_basic.phpt session_is_registered_variation3.phpt session_unset_basic.phpt session_commit_variation3.phpt
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/session/tests save_handler.inc session_cache_expire_basic.phpt session_cache_expire_error.phpt session_cache_expire_variation1.phpt session_cache_expire_variation2
ant Tue Apr 22 16:04:03 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/session/tests session_write_close_variation1.phpt session_get_cookie_params_error.phpt session_set_save_handler_error4.phpt session_is_registered_basic.phpt session_is_registered_variation3.phpt session_id_error.phpt session_set_cookie_params_basic.phpt session_write_close_error.phpt session_start_variation8.phpt session_encode_variation3.phpt session_module_name_error.phpt session_encode_error.phpt session_module_name_variation1.phpt session_destroy_error.phpt session_cache_limiter_variation1.phpt session_register_basic.phpt session_register_variation2.phpt session_set_save_handler_variation1.phpt session_name_error.phpt session_save_path_variation3.phpt session_set_cookie_params_variation2.phpt session_save_path_error.phpt session_cache_limiter_error.phpt session_cache_expire_variation1.phpt session_cache_expire_error.phpt session_set_cookie_params_variation3.phpt session_register_variation1.phpt session_unset_variation1.phpt session_cache_expire_variation2.phpt session_decode_variation2.phpt session_decode_error2.phpt session_decode_error.phpt session_destroy_variation3.phpt save_handler.inc session_commit_variation1.phpt session_set_cookie_params_variation5.phpt session_set_save_handler_basic.phpt session_save_path_variation1.phpt session_name_basic.phpt session_set_cookie_params_variation1.phpt session_encode_variation2.phpt session_encode_variation1.phpt session_write_close_variation2.phpt session_get_cookie_params_basic.phpt session_start_variation7.phpt session_module_name_variation2.phpt session_start_error.phpt session_regenerate_id_error.phpt session_cache_limiter_variation2.phpt session_start_variation6.phpt session_id_error2.phpt session_commit_error.phpt session_encode_error2.phpt session_unregister_variation3.phpt session_unset_basic.phpt session_destroy_variation1.phpt session_save_path_variation2.phpt session_unregister_variation2.phpt session_encode_variation5.phpt session_register_variation4.phpt session_regenerate_id_variation1.phpt session_set_save_handler_error2.phpt session_write_close_variation3.phpt session_cache_expire_variation3.phpt session_regenerate_id_basic.phpt session_set_cookie_params_variation4.phpt session_commit_variation3.phpt session_is_registered_variation1.phpt session_destroy_variation2.phpt session_set_save_handler_variation3.phpt session_write_close_variation4.phpt session_set_save_handler_error.phpt session_unregister_variation1.phpt session_commit_variation4.phpt
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/session/tests 022.phpt 023.phpt 024.phpt 025.phpt 026.phpt 027.phpt 028.phpt 029.phpt 030.phpt
ant Tue Apr 22 16:04:31 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/session/tests 030.phpt 028.phpt 027.phpt 024.phpt 026.phpt 029.phpt 022.phpt 025.phpt 023.phpt Log: These tests were backported from the PHP 6.0 branch, which in turn were ported from this branch and then updated to remove any dependencies on register_globals. With register_globals removed they are useful tests to run against the 5.X branches. http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/030.phpt?view=markuprev=1.1 Index: php-src/ext/session/tests/030.phpt +++ php-src/ext/session/tests/030.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/028.phpt?view=markuprev=1.1 Index: php-src/ext/session/tests/028.phpt +++ php-src/ext/session/tests/028.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/027.phpt?view=markuprev=1.1 Index: php-src/ext/session/tests/027.phpt +++ php-src/ext/session/tests/027.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/024.phpt?view=markuprev=1.1 Index: php-src/ext/session/tests/024.phpt +++ php-src/ext/session/tests/024.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/026.phpt?view=markuprev=1.1 Index: php-src/ext/session/tests/026.phpt +++ php-src/ext/session/tests/026.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/029.phpt?view=markuprev=1.1 Index: php-src/ext/session/tests/029.phpt +++ php-src/ext/session/tests/029.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/022.phpt?view=markuprev=1.1 Index: php-src/ext/session/tests/022.phpt +++ php-src/ext/session/tests/022.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/025.phpt?view=markuprev=1.1 Index: php-src/ext/session/tests/025.phpt +++ php-src/ext/session/tests/025.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/023.phpt?view=markuprev=1.1 Index: php-src/ext/session/tests/023.phpt +++ php-src/ext/session/tests/023.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Tue Apr 22 17:08:53 2008 UTC Modified files: /CVSROOTavail Log: - karma for bindlib_w32 (Liz, Scott, Edin and me, anyone else?) http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1380r2=1.1381diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1380 CVSROOT/avail:1.1381 --- CVSROOT/avail:1.1380Tue Apr 22 12:03:09 2008 +++ CVSROOT/avail Tue Apr 22 17:08:53 2008 @@ -322,4 +322,8 @@ avail|pajoye,edink,lhecking,mloskot,nlopess,scottmac,guenter,mattias,kshepherd,chapg|gd avail|mattias|php-src/ext/gd +# bindlib_w32 karma +# Our bundled version of bindlib (used by php on windows) +avail|auroraeosrose,scottmac,pajoye,edin|bindlib_w32 + # vim:set ft=conf sw=2 ts=2 et: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / loginfo
pajoye Tue Apr 22 17:27:37 2008 UTC
Modified files:
/CVSROOTloginfo
Log:
- add bindlib_w32 and win-installer to php-cvs list
http://cvs.php.net/viewvc.cgi/CVSROOT/loginfo?r1=1.128r2=1.129diff_format=u
Index: CVSROOT/loginfo
diff -u CVSROOT/loginfo:1.128 CVSROOT/loginfo:1.129
--- CVSROOT/loginfo:1.128 Sun Mar 23 21:15:47 2008
+++ CVSROOT/loginfo Tue Apr 22 17:27:37 2008
@@ -1,5 +1,5 @@
#
-#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.128 2008/03/23 21:15:47
rasmus Exp $
+#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.129 2008/04/22 17:27:37
pajoye Exp $
#
# The loginfo file is used to control where cvs commit log information
# is sent. The first entry on a line is a regular expression which is tested
@@ -112,7 +112,10 @@
^portal $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
# win installer stuff
-^win-installer $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER
%{sVv}
+^win-installer $CVSROOT/CVSROOT/loginfo.pl php-cvs@lists.php.net
$USER %{sVv}
+
+# bindlib_w32 stuff
+^bindlib_w32 $CVSROOT/CVSROOT/loginfo.pl php-cvs@lists.php.net $USER
%{sVv}
# gd stuff
^gd $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
derick Tue Apr 22 18:47:18 2008 UTC Modified files: /CVSROOTavail Log: - Copied pecl/litespeed to php-src/litespeed and gave karma to php-src/sapi/litespeed. cvs rm is required on pecl/litespeed. http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1381r2=1.1382diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1381 CVSROOT/avail:1.1382 --- CVSROOT/avail:1.1381Tue Apr 22 17:08:53 2008 +++ CVSROOT/avail Tue Apr 22 18:47:18 2008 @@ -254,7 +254,7 @@ avail|traufeisen,jandrade|pecl/gnupg,phpdoc/en/reference/gnupg avail|mikl|pecl/memcache,pecl/wbxml,pecl/ocal,pecl/pam avail|ohill|pecl/stem -avail|gwang|pecl/litespeed +avail|gwang|pecl/litespeed,php-src/sapi/litespeed avail|jsjohnst|pecl/flitetts avail|mlwmohawk|pecl/msession,pecl/xmldbx avail|nabeel|pecl/axis2 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
philip Tue Apr 22 18:56:15 2008 UTC Modified files: /CVSROOTavail Log: - phpdoc-pt karma for André Ferreira (aferreira) http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1382r2=1.1383diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1382 CVSROOT/avail:1.1383 --- CVSROOT/avail:1.1382Tue Apr 22 18:47:18 2008 +++ CVSROOT/avail Tue Apr 22 18:56:15 2008 @@ -75,6 +75,7 @@ avail|neonz|phpdoc-lv avail|erkje,oebe,janwb|phpdoc-nl avail|cyb0org,lach,adi|phpdoc-pl +avail|aferreira|phpdoc-pt avail|machado,scar,davis,dnfeitosa|phpdoc-pt_BR avail|radical,shoty|phpdoc-ro avail|freespace,shaff,sveta,wanderer,kozloffsky,santiago|phpdoc-ru -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
