aviat/Query
1
1
Fork 0
Code Issues 1 Pull Requests Releases 2 Activity

Move abstract classes and interfaces to their own respective folders

Browse Source
This commit is contained in:
Timothy Warren 2014-04-02 22:40:54 -04:00
parent bccea8cd2b
commit 600c07f1ca
7 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
autoload.php
View File

@ -45,25 +45,41 @@ function query_autoload($class)
$class_segments = explode('\\', $class); $class_segments = explode('\\', $class);
$class = strtolower(array_pop($class_segments)); $class = strtolower(array_pop($class_segments));
// Load Firebird separately // Load DB Driver classes
if (function_exists('fbird_connect') && $class === 'firebird') if ($class_segments == array('Query', 'Driver'))
{ {
array_map('do_include', glob(QDRIVER_PATH.'/firebird/*.php')); $driver_path = QDRIVER_PATH . "{$class}";
// @codeCoverageIgnoreStart
if (is_dir($driver_path))
{
// Firebird is a special case, since it's not a PDO driver
if (
in_array($class, PDO::getAvailableDrivers())
|| function_exists('fbird_connect') && $class === 'firebird'
)
{
array_map('do_include', glob("{$driver_path}/*.php"));
return; return;
} }
$class_path = QBASE_PATH . "classes/{$class}.php"; }
// @codeCoverageIgnoreEnd
}
$driver_path = QDRIVER_PATH . "{$class}"; // Load other classes
foreach(array(
if (is_file($class_path)) require_once($class_path); QBASE_PATH . "classes/interfaces/{$class}.php",
elseif (is_dir($driver_path)) QBASE_PATH . "classes/abstract/{$class}.php",
QBASE_PATH . "classes/{$class}.php"
) as $path)
{ {
$class = str_replace("pdo_", "", $class); if (file_exists($path))
if (in_array($class, PDO::getAvailableDrivers()))
{ {
array_map('do_include', glob("{$driver_path}/*.php")); // @codeCoverageIgnoreStart
require_once($path);
return;
// @codeCoverageIgnoreEnd
} }
} }
} }

0
classes/abstract_driver.php → classes/abstract/abstract_driver.php
View File

0
classes/abstract_sql.php → classes/abstract/abstract_sql.php
View File

0
classes/driver_interface.php → classes/interfaces/driver_interface.php
View File

0
classes/query_builder_interface.php → classes/interfaces/query_builder_interface.php
View File

0
classes/sql_interface.php → classes/interfaces/sql_interface.php
View File

4
common.php
View File

@ -77,7 +77,7 @@ function db_filter($array, $index)
/** /**
* Connection function * Connection function
* *
* @param mixed $params * @param string|object|array $params
* @return Query_Builder * @return Query_Builder
*/ */
function Query($params = '') function Query($params = '')
@ -89,7 +89,7 @@ function Query($params = '')
{ {
return $cmanager->get_connection($params); return $cmanager->get_connection($params);
} }
elseif ( ! is_scalar($params)) elseif ( ! is_scalar($params) && ! is_null($params))
{ {
$params = new ArrayObject($params, ArrayObject::STD_PROP_LIST | ArrayObject::ARRAY_AS_PROPS); $params = new ArrayObject($params, ArrayObject::STD_PROP_LIST | ArrayObject::ARRAY_AS_PROPS);