From: Andrei Zmievski <andrei@php.net>
Date: Thu, 7 Sep 2000 16:36:22 +0000 (+0000)
Subject: - Converted __string_value() to toString(), since the former is obsolete.
X-Git-Tag: php-4.0.3RC1~257
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0fddc30b7a17fc4fb74091bd634942650b893391;p=php

- 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 3935b91aa4..a4cb0d42d4 100644
--- 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 5cc546281d..4589df504d 100644
--- 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";