cvs: php4 /pear/DB/tests db_error.phpt db_error2.phpt /pear/PEAR Registry.php /pear/tests pear_error.phpt

From: Date: Wed, 31 Oct 2001 05:52:41 +0000
Subject: cvs: php4 /pear/DB/tests db_error.phpt db_error2.phpt /pear/PEAR Registry.php /pear/tests pear_error.phpt
Groups: php.pear.cvs 
Request: Send a blank email to pear-cvs+get-1215@lists.php.net to get a copy of this message
ssb Wed Oct 31 00:52:41 2001 EDT Modified files: /php4/pear/DB/tests db_error.phpt db_error2.phpt /php4/pear/PEAR Registry.php /php4/pear/tests pear_error.phpt Log: * update tests

Index: php4/pear/DB/tests/db_error.phpt diff -u php4/pear/DB/tests/db_error.phpt:1.12 php4/pear/DB/tests/db_error.phpt:1.13 --- php4/pear/DB/tests/db_error.phpt:1.12 Sat Aug 18 08:38:56 2001 +++ php4/pear/DB/tests/db_error.phpt Wed Oct 31 00:52:41 2001 @@ -56,17 +56,17 @@ --POST-- --EXPECT-- testing different error codes... -[db_error: message="DB Error: unknown error" code=-1 mode=return level=notice prefix="" prepend="" append="" info=""] -[db_error: message="DB Error: test error" code=-1 mode=return level=notice prefix="" prepend="" append="" info=""] -[db_error: message="DB Error: no error" code=1 mode=return level=notice prefix="" prepend="" append="" info=""] -[db_error: message="DB Error: unknown error" code=-1 mode=return level=notice prefix="" prepend="" append="" info=""] -[db_error: message="DB Error: syntax error" code=-2 mode=return level=notice prefix="" prepend="" append="" info=""] -[db_error: message="DB Error: division by zero" code=-13 mode=return level=notice prefix="" prepend="" append="" info=""] -[db_warning: message="DB Warning: unknown warning" code=-1000 mode=return level=notice prefix="" prepend="" append="" info=""] -[db_warning: message="DB Warning: test warning" code=0 mode=return level=notice prefix="" prepend="" append="" info=""] -[db_warning: message="DB Warning: read only" code=-1001 mode=return level=notice prefix="" prepend="" append="" info=""] +[db_error: message="DB Error: unknown error" code=-1 mode=return level=notice prefix="" info=""] +[db_error: message="DB Error: test error" code=-1 mode=return level=notice prefix="" info=""] +[db_error: message="DB Error: no error" code=1 mode=return level=notice prefix="" info=""] +[db_error: message="DB Error: unknown error" code=-1 mode=return level=notice prefix="" info=""] +[db_error: message="DB Error: syntax error" code=-2 mode=return level=notice prefix="" info=""] +[db_error: message="DB Error: division by zero" code=-13 mode=return level=notice prefix="" info=""] +[db_warning: message="DB Warning: unknown warning" code=-1000 mode=return level=notice prefix="" info=""] +[db_warning: message="DB Warning: test warning" code=0 mode=return level=notice prefix="" info=""] +[db_warning: message="DB Warning: read only" code=-1001 mode=return level=notice prefix="" info=""] testing different error modes... -DB Error: unknown error[db_error: message="DB Error: unknown error" code=-1 mode=print level=notice prefix="" prepend="" append="" info=""] +DB Error: unknown error[db_error: message="DB Error: unknown error" code=-1 mode=print level=notice prefix="" info=""] User Notice: DB Error: syntax error in PEAR.php on line 591 testing different error serverities... Index: php4/pear/DB/tests/db_error2.phpt diff -u php4/pear/DB/tests/db_error2.phpt:1.10 php4/pear/DB/tests/db_error2.phpt:1.11 --- php4/pear/DB/tests/db_error2.phpt:1.10 Sat Aug 18 08:39:58 2001 +++ php4/pear/DB/tests/db_error2.phpt Wed Oct 31 00:52:41 2001 @@ -68,9 +68,9 @@ ?> --EXPECT-- -default: [db_error: message="DB Error: return testing error" code=-1 mode=return level=notice prefix="" prepend="" append="" info=""] -global default: myfunc2 here, obj=[db_error: message="DB Error: global default test" code=-1 mode=callback callback=myfunc2 prefix="" prepend="" append="" info=""] +default: [db_error: message="DB Error: return testing error" code=-1 mode=return level=notice prefix="" info=""] +global default: myfunc2 here, obj=[db_error: message="DB Error: global default test" code=-1 mode=callback callback=myfunc2 prefix="" info=""] mode=print: DB Error: print testing error -mode=function callback: myfunc here, obj=[db_error: message="DB Error: function callback testing error" code=-1 mode=callback callback=myfunc prefix="" prepend="" append="" info=""] -mode=object callback: myclass::myfunc here, obj=[db_error: message="DB Error: object callback testing error" code=-1 mode=callback callback=myclass::myfunc prefix="" prepend="" append="" info=""] +mode=function callback: myfunc here, obj=[db_error: message="DB Error: function callback testing error" code=-1 mode=callback callback=myfunc prefix="" info=""] +mode=object callback: myclass::myfunc here, obj=[db_error: message="DB Error: object callback testing error" code=-1 mode=callback callback=myclass::myfunc prefix="" info=""] mode=trigger: User Notice: DB Error: trigger testing error in PEAR.php on line 591 Index: php4/pear/PEAR/Registry.php diff -u php4/pear/PEAR/Registry.php:1.6 php4/pear/PEAR/Registry.php:1.7 --- php4/pear/PEAR/Registry.php:1.6 Wed Oct 31 00:39:11 2001 +++ php4/pear/PEAR/Registry.php Wed Oct 31 00:52:41 2001 @@ -17,7 +17,7 @@ // | | // +----------------------------------------------------------------------+ // -// $Id: Registry.php,v 1.6 2001/10/31 05:39:11 ssb Exp $ +// $Id: Registry.php,v 1.7 2001/10/31 05:52:41 ssb Exp $ require_once "System.php"; @@ -92,7 +92,7 @@ // }}} // {{{ addPackage() - function addPackage($package, &$info) + function addPackage($package, $info) { if ($this->packageExists($package)) { return false; @@ -136,7 +136,7 @@ // }}} // {{{ updatePackage() - function updatePackage($package, &$info) + function updatePackage($package, $info) { $oldinfo = $this->packageInfo($package); if (empty($oldinfo)) { Index: php4/pear/tests/pear_error.phpt diff -u php4/pear/tests/pear_error.phpt:1.15 php4/pear/tests/pear_error.phpt:1.16 --- php4/pear/tests/pear_error.phpt:1.15 Wed Oct 10 21:23:53 2001 +++ php4/pear/tests/pear_error.phpt Wed Oct 31 00:52:41 2001 @@ -24,6 +24,10 @@ 512 => "User Warning", 1024=> "User Notice" ); + if (preg_match('/^The call_user_method.. function is deprecated/', + $errmsg)) { + return; + } $prefix = $errortype[$errno]; $file = basename($file); print "\n$prefix: $errmsg in $file on line $line\n"; @@ -144,31 +148,31 @@ --GET-- --POST-- --EXPECT-- -specify error class: [foo_error: message="test error" code=0 mode=return level=notice prefix="Foo_Error prefix" prepend="" append="" info=""] -default PEAR_Error: [pear_error: message="unknown error" code=0 mode=return level=notice prefix="" prepend="" append="" info=""] +specify error class: [foo_error: message="test error" code=0 mode=return level=notice prefix="Foo_Error prefix" info=""] +default PEAR_Error: [pear_error: message="unknown error" code=0 mode=return level=notice prefix="" info=""] Testing it: bool(true) This is not an error: bool(false) Now trying a bunch of variations... -different message: [pear_error: message="test error" code=0 mode=return level=notice prefix="" prepend="" append="" info=""] -different message,code: [pear_error: message="test error" code=-42 mode=return level=notice prefix="" prepend="" append="" info=""] -mode=print: test error[pear_error: message="test error" code=-42 mode=print level=notice prefix="" prepend="" append="" info=""] -mode=callback(function): errorhandler function called, obj=[pear_error: message="test error" code=-42 mode=callback callback=errorhandler prefix="" prepend="" append="" info=""] -mode=callback(method): errorhandler method called, obj=[pear_error: message="test error" code=-42 mode=callback callback=errorclass::errorhandler prefix="" prepend="" append="" info=""] +different message: [pear_error: message="test error" code=0 mode=return level=notice prefix="" info=""] +different message,code: [pear_error: message="test error" code=-42 mode=return level=notice prefix="" info=""] +mode=print: test error[pear_error: message="test error" code=-42 mode=print level=notice prefix="" info=""] +mode=callback(function): errorhandler function called, obj=[pear_error: message="test error" code=-42 mode=callback callback=errorhandler prefix="" info=""] +mode=callback(method): errorhandler method called, obj=[pear_error: message="test error" code=-42 mode=callback callback=errorclass::errorhandler prefix="" info=""] mode=print&trigger: test error -User Notice: test error in PEAR.php on line 650 -[pear_error: message="test error" code=-42 mode=print|trigger level=notice prefix="" prepend="" append="" info=""] +User Notice: test error in PEAR.php on line 591 +[pear_error: message="test error" code=-42 mode=print|trigger level=notice prefix="" info=""] mode=trigger: -User Notice: test error in PEAR.php on line 650 -[pear_error: message="test error" code=-42 mode=trigger level=notice prefix="" prepend="" append="" info=""] +User Notice: test error in PEAR.php on line 591 +[pear_error: message="test error" code=-42 mode=trigger level=notice prefix="" info=""] mode=trigger,level=notice: -User Notice: test error in PEAR.php on line 650 -[pear_error: message="test error" code=-42 mode=trigger level=notice prefix="" prepend="" append="" info=""] +User Notice: test error in PEAR.php on line 591 +[pear_error: message="test error" code=-42 mode=trigger level=notice prefix="" info=""] mode=trigger,level=warning: -User Warning: test error in PEAR.php on line 650 -[pear_error: message="test error" code=-42 mode=trigger level=warning prefix="" prepend="" append="" info=""] +User Warning: test error in PEAR.php on line 591 +[pear_error: message="test error" code=-42 mode=trigger level=warning prefix="" info=""] mode=trigger,level=error: -User Error: test error in PEAR.php on line 650 -[pear_error: message="test error" code=-42 mode=trigger level=error prefix="" prepend="" append="" info=""] +User Error: test error in PEAR.php on line 591 +[pear_error: message="test error" code=-42 mode=trigger level=error prefix="" info=""] testing expectError: expecting syntax/invalid raising already_exists
« previous php.pear.cvs (#1215) next »