mirror of
https://github.com/php/php-src.git
synced 2024-11-28 04:14:26 +08:00
-Add getCode() method to PEAR_Error
-Correct license versions + My Address for DB/* mods -Correct ibase module -Javadocize File_Find -Add a optional constructor to DB that passes it on to DB::connect()
This commit is contained in:
parent
5875af9372
commit
4850e34bf3
12
pear/DB.php
12
pear/DB.php
@ -152,6 +152,14 @@ if (!defined('DB_GETMODE_DEFAULT')) {
|
||||
* @since PHP 4.0
|
||||
*/
|
||||
class DB {
|
||||
|
||||
function DB ($dsn = false, $persistent = false)
|
||||
{
|
||||
if ($dsn) {
|
||||
return DB::connect ($dsn, $persistent);
|
||||
}
|
||||
}
|
||||
|
||||
// {{{ factory()
|
||||
|
||||
/**
|
||||
@ -162,7 +170,7 @@ class DB {
|
||||
* @return object a newly created DB object, or a DB error code on
|
||||
* error
|
||||
*/
|
||||
function &factory($type) {
|
||||
function &factory($type) {
|
||||
@include_once("DB/${type}.php");
|
||||
$classname = 'DB_' . $type;
|
||||
$obj = @new $classname;
|
||||
@ -170,7 +178,7 @@ class DB {
|
||||
return new DB_Error(DB_ERROR_NOT_FOUND);
|
||||
}
|
||||
return $obj;
|
||||
}
|
||||
}
|
||||
|
||||
// }}}
|
||||
// {{{ connect()
|
||||
|
@ -143,6 +143,7 @@ class PEAR_Error
|
||||
|
||||
var $mode = PEAR_ERROR_RETURN;
|
||||
var $level = E_USER_NOTICE;
|
||||
var $code = -1;
|
||||
|
||||
var $message = '';
|
||||
|
||||
@ -205,6 +206,19 @@ class PEAR_Error
|
||||
}
|
||||
|
||||
|
||||
// }}}
|
||||
// {{{ getCode()
|
||||
|
||||
/**
|
||||
* Get error code from an error object
|
||||
*
|
||||
* @return int error code
|
||||
*/
|
||||
function getCode ()
|
||||
{
|
||||
return ($this->code);
|
||||
}
|
||||
|
||||
// }}}
|
||||
// {{{ getType()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user