* update tests

diff --git a/pear/PEAR/Registry.php b/pear/PEAR/Registry.php
index c0d42c9e108cdce73337f8c335f590737ebd912f..d5319a45de4b074377f7cf7041eca5964db529e2 100644 (file)
--- a/pear/PEAR/Registry.php
+++ b/pear/PEAR/Registry.php
@@ -92,7 +92,7 @@ class PEAR_Registry
     // }}}
     // {{{ addPackage()
 
-    function addPackage($package, &$info)
+    function addPackage($package, $info)
     {
         if ($this->packageExists($package)) {
             return false;
@@ -136,7 +136,7 @@ class PEAR_Registry
     // }}}
     // {{{ updatePackage()
 
-    function updatePackage($package, &$info)
+    function updatePackage($package, $info)
     {
         $oldinfo = $this->packageInfo($package);
         if (empty($oldinfo)) {

diff --git a/pear/tests/pear_error.phpt b/pear/tests/pear_error.phpt
index 6757be63ed740f7e2d0b83aa766e0bd2e5f48209..79267dae5d3ea2ec8e780576ee943fb1fd4818e6 100644 (file)
--- a/pear/tests/pear_error.phpt
+++ b/pear/tests/pear_error.phpt
@@ -24,6 +24,10 @@ function test_error_handler($errno, $errmsg, $file, $line, $vars) {
                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 @@ $err = $obj->raiseError("invalid");
 --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