From 5950629d8f5cd7784c57609509449b176f73aa0a Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Mon, 7 Sep 2009 10:25:15 +0200 Subject: [PATCH] Abstract -> Base --- framework/Db/lib/Horde/Db/Adapter/Base.php | 6 +++--- .../lib/Horde/Db/Adapter/{Abstract => Base}/Column.php | 2 +- .../Db/Adapter/{Abstract => Base}/ColumnDefinition.php | 2 +- .../Db/lib/Horde/Db/Adapter/{Abstract => Base}/Index.php | 2 +- .../lib/Horde/Db/Adapter/{Abstract => Base}/Schema.php | 14 +++++++------- .../Db/lib/Horde/Db/Adapter/{Abstract => Base}/Table.php | 4 ++-- .../Db/Adapter/{Abstract => Base}/TableDefinition.php | 6 +++--- framework/Db/lib/Horde/Db/Adapter/Mssql/Schema.php | 2 +- framework/Db/lib/Horde/Db/Adapter/Mysql/Column.php | 2 +- framework/Db/lib/Horde/Db/Adapter/Mysql/Schema.php | 2 +- framework/Db/lib/Horde/Db/Adapter/Mysqli.php | 2 +- framework/Db/lib/Horde/Db/Adapter/Oracle/Schema.php | 2 +- framework/Db/lib/Horde/Db/Adapter/Postgresql/Column.php | 2 +- framework/Db/lib/Horde/Db/Adapter/Postgresql/Schema.php | 2 +- framework/Db/lib/Horde/Db/Adapter/Sqlite/Column.php | 2 +- framework/Db/lib/Horde/Db/Adapter/Sqlite/Schema.php | 2 +- framework/Db/package.xml | 16 ++++++++-------- 17 files changed, 35 insertions(+), 35 deletions(-) rename framework/Db/lib/Horde/Db/Adapter/{Abstract => Base}/Column.php (99%) rename framework/Db/lib/Horde/Db/Adapter/{Abstract => Base}/ColumnDefinition.php (99%) rename framework/Db/lib/Horde/Db/Adapter/{Abstract => Base}/Index.php (98%) rename framework/Db/lib/Horde/Db/Adapter/{Abstract => Base}/Schema.php (98%) rename framework/Db/lib/Horde/Db/Adapter/{Abstract => Base}/Table.php (97%) rename framework/Db/lib/Horde/Db/Adapter/{Abstract => Base}/TableDefinition.php (97%) diff --git a/framework/Db/lib/Horde/Db/Adapter/Base.php b/framework/Db/lib/Horde/Db/Adapter/Base.php index bdd6f1eff..1d05a681c 100644 --- a/framework/Db/lib/Horde/Db/Adapter/Base.php +++ b/framework/Db/lib/Horde/Db/Adapter/Base.php @@ -65,7 +65,7 @@ abstract class Horde_Db_Adapter_Base protected $_logger = null; /** - * @var Horde_Db_Adapter_Abstract_Schema + * @var Horde_Db_Adapter_Base_Schema */ protected $_schema = null; @@ -154,7 +154,7 @@ abstract class Horde_Db_Adapter_Base if (class_exists($class)) { $class = new ReflectionClass($class); } else { - $class = new ReflectionClass('Horde_Db_Adapter_Abstract_' . $component); + $class = new ReflectionClass('Horde_Db_Adapter_Base_' . $component); } return $class->newInstanceArgs($args); @@ -193,7 +193,7 @@ abstract class Horde_Db_Adapter_Base */ public function adapterName() { - return 'Abstract'; + return 'Base'; } /** diff --git a/framework/Db/lib/Horde/Db/Adapter/Abstract/Column.php b/framework/Db/lib/Horde/Db/Adapter/Base/Column.php similarity index 99% rename from framework/Db/lib/Horde/Db/Adapter/Abstract/Column.php rename to framework/Db/lib/Horde/Db/Adapter/Base/Column.php index 4536f3034..f2f0c515d 100644 --- a/framework/Db/lib/Horde/Db/Adapter/Abstract/Column.php +++ b/framework/Db/lib/Horde/Db/Adapter/Base/Column.php @@ -21,7 +21,7 @@ * @package Horde_Db * @subpackage Adapter */ -class Horde_Db_Adapter_Abstract_Column +class Horde_Db_Adapter_Base_Column { protected $_name; protected $_type; diff --git a/framework/Db/lib/Horde/Db/Adapter/Abstract/ColumnDefinition.php b/framework/Db/lib/Horde/Db/Adapter/Base/ColumnDefinition.php similarity index 99% rename from framework/Db/lib/Horde/Db/Adapter/Abstract/ColumnDefinition.php rename to framework/Db/lib/Horde/Db/Adapter/Base/ColumnDefinition.php index f53b116bb..c8f493d07 100644 --- a/framework/Db/lib/Horde/Db/Adapter/Abstract/ColumnDefinition.php +++ b/framework/Db/lib/Horde/Db/Adapter/Base/ColumnDefinition.php @@ -21,7 +21,7 @@ * @package Horde_Db * @subpackage Adapter */ -class Horde_Db_Adapter_Abstract_ColumnDefinition +class Horde_Db_Adapter_Base_ColumnDefinition { protected $_base = null; protected $_name = null; diff --git a/framework/Db/lib/Horde/Db/Adapter/Abstract/Index.php b/framework/Db/lib/Horde/Db/Adapter/Base/Index.php similarity index 98% rename from framework/Db/lib/Horde/Db/Adapter/Abstract/Index.php rename to framework/Db/lib/Horde/Db/Adapter/Base/Index.php index 9407b2e8f..0509ece56 100644 --- a/framework/Db/lib/Horde/Db/Adapter/Abstract/Index.php +++ b/framework/Db/lib/Horde/Db/Adapter/Base/Index.php @@ -21,7 +21,7 @@ * @package Horde_Db * @subpackage Adapter */ -class Horde_Db_Adapter_Abstract_Index +class Horde_Db_Adapter_Base_Index { public $table; public $name; diff --git a/framework/Db/lib/Horde/Db/Adapter/Abstract/Schema.php b/framework/Db/lib/Horde/Db/Adapter/Base/Schema.php similarity index 98% rename from framework/Db/lib/Horde/Db/Adapter/Abstract/Schema.php rename to framework/Db/lib/Horde/Db/Adapter/Base/Schema.php index 0bb5d5cae..7c47fc9f5 100644 --- a/framework/Db/lib/Horde/Db/Adapter/Abstract/Schema.php +++ b/framework/Db/lib/Horde/Db/Adapter/Base/Schema.php @@ -21,7 +21,7 @@ * @package Horde_Db * @subpackage Adapter */ -abstract class Horde_Db_Adapter_Abstract_Schema +abstract class Horde_Db_Adapter_Base_Schema { /** * @var Cache object @@ -34,7 +34,7 @@ abstract class Horde_Db_Adapter_Abstract_Schema protected $_logger = null; /** - * @var Horde_Db_Adapter_Abstract + * @var Horde_Db_Adapter_Base */ protected $_adapter = null; @@ -49,7 +49,7 @@ abstract class Horde_Db_Adapter_Abstract_Schema ##########################################################################*/ /** - * @param Horde_Db_Adapter_Abstract $adapter + * @param Horde_Db_Adapter_Base $adapter * @param array $config */ public function __construct($adapter, $config = array()) @@ -249,12 +249,12 @@ abstract class Horde_Db_Adapter_Abstract_Schema abstract public function tables($name = null); /** - * Get a Horde_Db_Adapter_Abstract_Table object for the table. + * Get a Horde_Db_Adapter_Base_Table object for the table. * * @param string $tableName * @param string $name * - * @return Horde_Db_Adapter_Abstract_Table + * @return Horde_Db_Adapter_Base_Table */ public function table($tableName, $name = null) { @@ -281,7 +281,7 @@ abstract class Horde_Db_Adapter_Abstract_Schema abstract public function indexes($tableName, $name = null); /** - * Returns an array of Horde_Db_Adapter_Abstract_Column objects for the + * Returns an array of Horde_Db_Adapter_Base_Column objects for the * table specified by +table_name+. See the concrete implementation for * details on the expected parameter values. * @@ -375,7 +375,7 @@ abstract class Horde_Db_Adapter_Abstract_Schema */ public function endTable($name, $options=array()) { - if ($name instanceof Horde_Db_Adapter_Abstract_TableDefinition) { + if ($name instanceof Horde_Db_Adapter_Base_TableDefinition) { $tableDefinition = $name; $options = array_merge($tableDefinition->getOptions(), $options); } else { diff --git a/framework/Db/lib/Horde/Db/Adapter/Abstract/Table.php b/framework/Db/lib/Horde/Db/Adapter/Base/Table.php similarity index 97% rename from framework/Db/lib/Horde/Db/Adapter/Abstract/Table.php rename to framework/Db/lib/Horde/Db/Adapter/Base/Table.php index 177c35810..f0dfa0ca4 100644 --- a/framework/Db/lib/Horde/Db/Adapter/Abstract/Table.php +++ b/framework/Db/lib/Horde/Db/Adapter/Base/Table.php @@ -21,7 +21,7 @@ * @package Horde_Db * @subpackage Adapter */ -class Horde_Db_Adapter_Abstract_Table +class Horde_Db_Adapter_Base_Table { protected $_name; protected $_primaryKey; @@ -76,7 +76,7 @@ class Horde_Db_Adapter_Abstract_Table } /** - * @return Horde_Db_Adapter_Abstract_Column + * @return Horde_Db_Adapter_Base_Column */ public function getColumn($column) { diff --git a/framework/Db/lib/Horde/Db/Adapter/Abstract/TableDefinition.php b/framework/Db/lib/Horde/Db/Adapter/Base/TableDefinition.php similarity index 97% rename from framework/Db/lib/Horde/Db/Adapter/Abstract/TableDefinition.php rename to framework/Db/lib/Horde/Db/Adapter/Base/TableDefinition.php index 0eff9fad7..a5af543a1 100644 --- a/framework/Db/lib/Horde/Db/Adapter/Abstract/TableDefinition.php +++ b/framework/Db/lib/Horde/Db/Adapter/Base/TableDefinition.php @@ -21,7 +21,7 @@ * @package Horde_Db * @subpackage Adapter */ -class Horde_Db_Adapter_Abstract_TableDefinition implements ArrayAccess +class Horde_Db_Adapter_Base_TableDefinition implements ArrayAccess { protected $_name = null; protected $_base = null; @@ -32,7 +32,7 @@ class Horde_Db_Adapter_Abstract_TableDefinition implements ArrayAccess * Class Constructor * * @param string $name - * @param Horde_Db_Adapter_Abstract_Schema $base + * @param Horde_Db_Adapter_Base_Schema $base * @param array $options */ public function __construct($name, $base, $options=array()) @@ -175,7 +175,7 @@ class Horde_Db_Adapter_Abstract_TableDefinition implements ArrayAccess * ArrayAccess: Return the value for the given offset. * * @param int $offset - * @return object {@link {@Horde_Db_Adapter_Abstract_ColumnDefinition} + * @return object {@link {@Horde_Db_Adapter_Base_ColumnDefinition} */ public function offsetGet($offset) { diff --git a/framework/Db/lib/Horde/Db/Adapter/Mssql/Schema.php b/framework/Db/lib/Horde/Db/Adapter/Mssql/Schema.php index 1156332b8..82db9126d 100644 --- a/framework/Db/lib/Horde/Db/Adapter/Mssql/Schema.php +++ b/framework/Db/lib/Horde/Db/Adapter/Mssql/Schema.php @@ -21,7 +21,7 @@ * @package Horde_Db * @subpackage Adapter */ -class Horde_Db_Adapter_Mssql_Schema extends Horde_Db_Adapter_Abstract_Schema +class Horde_Db_Adapter_Mssql_Schema extends Horde_Db_Adapter_Base_Schema { /*########################################################################## # Quoting diff --git a/framework/Db/lib/Horde/Db/Adapter/Mysql/Column.php b/framework/Db/lib/Horde/Db/Adapter/Mysql/Column.php index c94f303ff..c118c53f0 100644 --- a/framework/Db/lib/Horde/Db/Adapter/Mysql/Column.php +++ b/framework/Db/lib/Horde/Db/Adapter/Mysql/Column.php @@ -21,7 +21,7 @@ * @package Horde_Db * @subpackage Adapter */ -class Horde_Db_Adapter_Mysql_Column extends Horde_Db_Adapter_Abstract_Column +class Horde_Db_Adapter_Mysql_Column extends Horde_Db_Adapter_Base_Column { /** * @var array diff --git a/framework/Db/lib/Horde/Db/Adapter/Mysql/Schema.php b/framework/Db/lib/Horde/Db/Adapter/Mysql/Schema.php index 358068475..eb902feba 100644 --- a/framework/Db/lib/Horde/Db/Adapter/Mysql/Schema.php +++ b/framework/Db/lib/Horde/Db/Adapter/Mysql/Schema.php @@ -21,7 +21,7 @@ * @package Horde_Db * @subpackage Adapter */ -class Horde_Db_Adapter_Mysql_Schema extends Horde_Db_Adapter_Abstract_Schema +class Horde_Db_Adapter_Mysql_Schema extends Horde_Db_Adapter_Base_Schema { /*########################################################################## # Quoting diff --git a/framework/Db/lib/Horde/Db/Adapter/Mysqli.php b/framework/Db/lib/Horde/Db/Adapter/Mysqli.php index 19a587e9f..35d422244 100644 --- a/framework/Db/lib/Horde/Db/Adapter/Mysqli.php +++ b/framework/Db/lib/Horde/Db/Adapter/Mysqli.php @@ -23,7 +23,7 @@ * @package Horde_Db * @subpackage Adapter */ -class Horde_Db_Adapter_Mysqli extends Horde_Db_Adapter_Abstract +class Horde_Db_Adapter_Mysqli extends Horde_Db_Adapter_Base { /** * Mysqli database connection object. diff --git a/framework/Db/lib/Horde/Db/Adapter/Oracle/Schema.php b/framework/Db/lib/Horde/Db/Adapter/Oracle/Schema.php index 3ddb1fbdb..f4bb17985 100644 --- a/framework/Db/lib/Horde/Db/Adapter/Oracle/Schema.php +++ b/framework/Db/lib/Horde/Db/Adapter/Oracle/Schema.php @@ -21,7 +21,7 @@ * @package Horde_Db * @subpackage Adapter */ -class Horde_Db_Adapter_Oracle_Schema extends Horde_Db_Adapter_Abstract_Schema +class Horde_Db_Adapter_Oracle_Schema extends Horde_Db_Adapter_Base_Schema { /*########################################################################## # Quoting diff --git a/framework/Db/lib/Horde/Db/Adapter/Postgresql/Column.php b/framework/Db/lib/Horde/Db/Adapter/Postgresql/Column.php index b8cef05e5..895a37b0e 100644 --- a/framework/Db/lib/Horde/Db/Adapter/Postgresql/Column.php +++ b/framework/Db/lib/Horde/Db/Adapter/Postgresql/Column.php @@ -21,7 +21,7 @@ * @package Horde_Db * @subpackage Adapter */ -class Horde_Db_Adapter_Postgresql_Column extends Horde_Db_Adapter_Abstract_Column +class Horde_Db_Adapter_Postgresql_Column extends Horde_Db_Adapter_Base_Column { /*########################################################################## # Constants diff --git a/framework/Db/lib/Horde/Db/Adapter/Postgresql/Schema.php b/framework/Db/lib/Horde/Db/Adapter/Postgresql/Schema.php index 9c73a98c0..74d1df94a 100644 --- a/framework/Db/lib/Horde/Db/Adapter/Postgresql/Schema.php +++ b/framework/Db/lib/Horde/Db/Adapter/Postgresql/Schema.php @@ -21,7 +21,7 @@ * @package Horde_Db * @subpackage Adapter */ -class Horde_Db_Adapter_Postgresql_Schema extends Horde_Db_Adapter_Abstract_Schema +class Horde_Db_Adapter_Postgresql_Schema extends Horde_Db_Adapter_Base_Schema { /** * @var string diff --git a/framework/Db/lib/Horde/Db/Adapter/Sqlite/Column.php b/framework/Db/lib/Horde/Db/Adapter/Sqlite/Column.php index ecaf8107b..765074927 100644 --- a/framework/Db/lib/Horde/Db/Adapter/Sqlite/Column.php +++ b/framework/Db/lib/Horde/Db/Adapter/Sqlite/Column.php @@ -21,7 +21,7 @@ * @package Horde_Db * @subpackage Adapter */ -class Horde_Db_Adapter_Sqlite_Column extends Horde_Db_Adapter_Abstract_Column +class Horde_Db_Adapter_Sqlite_Column extends Horde_Db_Adapter_Base_Column { /** * @var array diff --git a/framework/Db/lib/Horde/Db/Adapter/Sqlite/Schema.php b/framework/Db/lib/Horde/Db/Adapter/Sqlite/Schema.php index 5442efe16..c3ca43e21 100644 --- a/framework/Db/lib/Horde/Db/Adapter/Sqlite/Schema.php +++ b/framework/Db/lib/Horde/Db/Adapter/Sqlite/Schema.php @@ -21,7 +21,7 @@ * @package Horde_Db * @subpackage Adapter */ -class Horde_Db_Adapter_Sqlite_Schema extends Horde_Db_Adapter_Abstract_Schema +class Horde_Db_Adapter_Sqlite_Schema extends Horde_Db_Adapter_Base_Schema { /*########################################################################## # Quoting diff --git a/framework/Db/package.xml b/framework/Db/package.xml index ccff3fb9f..260c2f471 100644 --- a/framework/Db/package.xml +++ b/framework/Db/package.xml @@ -38,14 +38,14 @@ http://pear.php.net/dtd/package-2.0.xsd"> - + - + @@ -99,12 +99,12 @@ http://pear.php.net/dtd/package-2.0.xsd"> - - - - - - + + + + + + -- 2.11.0