- Converted __string_value() to toString(), since the former is obsolete.

- Made sure DB results are freed where necessary.
- Made DB::getAssoc() use $params if passed.
- Implemented DB::getAll().

diff --git a/pear/PEAR.php.in b/pear/PEAR.php.in
index 3935b91aa4492ae467f4a37170c0ec03efc012c3..a4cb0d42d4c5f811c4e5f677fd3aa8b8c0c690cc 100644 (file)
--- a/pear/PEAR.php.in
+++ b/pear/PEAR.php.in
@@ -233,14 +233,14 @@ class PEAR_Error
        }
 
     // }}}
-    // {{{ __string_value()
+    // {{{ toString()
 
        /**
         * Make a string representation of this object.
         *
         * @return string a string with an object "summary"
         */
-       function __string_value() {
+       function toString() {
                $modes = array(PEAR_ERROR_RETURN => "return",
                                           PEAR_ERROR_PRINT => "print",
                                           PEAR_ERROR_TRIGGER => "trigger",

diff --git a/pear/tests/DB_Error.phpt b/pear/tests/DB_Error.phpt
index 5cc546281d126d7c1bc76ce68dbe6a5904c69911..4589df504d024a36f99904b427f0f876536976c5 100644 (file)
--- a/pear/tests/DB_Error.phpt
+++ b/pear/tests/DB_Error.phpt
@@ -29,20 +29,20 @@ var_dump(DB::parseDSN(""));
 
 
 print "testing different error codes...\n";
-$e = new DB_Error(); print $e->__string_value()."\n";
-$e = new DB_Error("test error"); print $e->__string_value()."\n";
-$e = new DB_Error(DB_OK); print $e->__string_value()."\n";
-$e = new DB_Error(DB_ERROR); print $e->__string_value()."\n";
-$e = new DB_Error(DB_ERROR_SYNTAX); print $e->__string_value()."\n";
-$e = new DB_Error(DB_ERROR_DIVZERO); print $e->__string_value()."\n";
-$e = new DB_Warning(); print $e->__string_value()."\n";
-$e = new DB_Warning("test warning"); print $e->__string_value()."\n";
-$e = new DB_Warning(DB_WARNING_READ_ONLY); print $e->__string_value()."\n";
+$e = new DB_Error(); print $e->toString()."\n";
+$e = new DB_Error("test error"); print $e->toString()."\n";
+$e = new DB_Error(DB_OK); print $e->toString()."\n";
+$e = new DB_Error(DB_ERROR); print $e->toString()."\n";
+$e = new DB_Error(DB_ERROR_SYNTAX); print $e->toString()."\n";
+$e = new DB_Error(DB_ERROR_DIVZERO); print $e->toString()."\n";
+$e = new DB_Warning(); print $e->toString()."\n";
+$e = new DB_Warning("test warning"); print $e->toString()."\n";
+$e = new DB_Warning(DB_WARNING_READ_ONLY); print $e->toString()."\n";
 
 ini_alter("html_errors", false);
 
 print "testing different error modes...\n";
-$e = new DB_Error(DB_ERROR, PEAR_ERROR_PRINT); print $e->__string_value()."\n";
+$e = new DB_Error(DB_ERROR, PEAR_ERROR_PRINT); print $e->toString()."\n";
 $e = new DB_Error(DB_ERROR_SYNTAX, PEAR_ERROR_TRIGGER);
 
 print "testing different error serverities...\n";