From dd672df81d8f6e423b4b8ed6d7b8077306a191a3 Mon Sep 17 00:00:00 2001 From: "Timothy J. Warren" Date: Fri, 8 Aug 2014 13:48:20 -0400 Subject: [PATCH] Reorganize classes to autoload by namespace --- .../Abstract_Query_Builder.php | 2 -- {core => Query}/BadDBDriverException.php | 0 .../Connection_Manager.php | 2 +- .../Driver/Abstract_Driver.php | 6 ---- .../Driver/Driver_Interface.php | 0 .../Driver/SQL/Abstract_SQL.php | 0 .../Driver/SQL/SQL_Interface.php | 0 .../Driver/Util/Abstract_Util.php | 0 .../Query_Builder.php | 0 .../Query_Builder_Interface.php | 0 .../Query_Parser.php | 0 autoload.php | 29 ++++++++----------- 12 files changed, 13 insertions(+), 26 deletions(-) rename core/abstract/abstract_query_builder.php => Query/Abstract_Query_Builder.php (99%) rename {core => Query}/BadDBDriverException.php (100%) rename core/connection_manager.php => Query/Connection_Manager.php (99%) rename core/abstract/abstract_driver.php => Query/Driver/Abstract_Driver.php (99%) rename core/interfaces/driver_interface.php => Query/Driver/Driver_Interface.php (100%) rename core/abstract/abstract_sql.php => Query/Driver/SQL/Abstract_SQL.php (100%) rename core/interfaces/sql_interface.php => Query/Driver/SQL/SQL_Interface.php (100%) rename core/abstract/abstract_util.php => Query/Driver/Util/Abstract_Util.php (100%) rename core/query_builder.php => Query/Query_Builder.php (100%) rename core/interfaces/query_builder_interface.php => Query/Query_Builder_Interface.php (100%) rename core/query_parser.php => Query/Query_Parser.php (100%) diff --git a/core/abstract/abstract_query_builder.php b/Query/Abstract_Query_Builder.php similarity index 99% rename from core/abstract/abstract_query_builder.php rename to Query/Abstract_Query_Builder.php index 649abf4..e17ca6e 100644 --- a/core/abstract/abstract_query_builder.php +++ b/Query/Abstract_Query_Builder.php @@ -618,8 +618,6 @@ abstract class Abstract_Query_Builder { $sql = $this->sql->explain($sql); } -// $sql . "
"; - return $sql; } } diff --git a/core/BadDBDriverException.php b/Query/BadDBDriverException.php similarity index 100% rename from core/BadDBDriverException.php rename to Query/BadDBDriverException.php diff --git a/core/connection_manager.php b/Query/Connection_Manager.php similarity index 99% rename from core/connection_manager.php rename to Query/Connection_Manager.php index 914dad3..fa03ad6 100644 --- a/core/connection_manager.php +++ b/Query/Connection_Manager.php @@ -231,4 +231,4 @@ final class Connection_Manager { return $dsn; } } -// End of connection_manager.php +// End of connection_manager.php \ No newline at end of file diff --git a/core/abstract/abstract_driver.php b/Query/Driver/Abstract_Driver.php similarity index 99% rename from core/abstract/abstract_driver.php rename to Query/Driver/Abstract_Driver.php index 3094d72..29647bd 100644 --- a/core/abstract/abstract_driver.php +++ b/Query/Driver/Abstract_Driver.php @@ -51,12 +51,6 @@ abstract class Abstract_Driver extends \PDO implements Driver_Interface { */ public $util; - /** - * Reference to table_builder class - * @var \Query\Table\Table_Builder - */ - public $table; - /** * Last query executed * @var string diff --git a/core/interfaces/driver_interface.php b/Query/Driver/Driver_Interface.php similarity index 100% rename from core/interfaces/driver_interface.php rename to Query/Driver/Driver_Interface.php diff --git a/core/abstract/abstract_sql.php b/Query/Driver/SQL/Abstract_SQL.php similarity index 100% rename from core/abstract/abstract_sql.php rename to Query/Driver/SQL/Abstract_SQL.php diff --git a/core/interfaces/sql_interface.php b/Query/Driver/SQL/SQL_Interface.php similarity index 100% rename from core/interfaces/sql_interface.php rename to Query/Driver/SQL/SQL_Interface.php diff --git a/core/abstract/abstract_util.php b/Query/Driver/Util/Abstract_Util.php similarity index 100% rename from core/abstract/abstract_util.php rename to Query/Driver/Util/Abstract_Util.php diff --git a/core/query_builder.php b/Query/Query_Builder.php similarity index 100% rename from core/query_builder.php rename to Query/Query_Builder.php diff --git a/core/interfaces/query_builder_interface.php b/Query/Query_Builder_Interface.php similarity index 100% rename from core/interfaces/query_builder_interface.php rename to Query/Query_Builder_Interface.php diff --git a/core/query_parser.php b/Query/Query_Parser.php similarity index 100% rename from core/query_parser.php rename to Query/Query_Parser.php diff --git a/autoload.php b/autoload.php index 8d51708..91b6525 100644 --- a/autoload.php +++ b/autoload.php @@ -35,45 +35,40 @@ define('QDRIVER_PATH', QBASE_PATH.'drivers/'); // Require some common functions require(QBASE_PATH.'common.php'); -require(QBASE_PATH.'core/BadDBDriverException.php'); // Load Query Classes spl_autoload_register(function ($class) { $class_segments = explode('\\', $class); - $class = strtolower(array_pop($class_segments)); + $driver_class = strtolower(array_pop($class_segments)); // Load DB Driver classes - $driver_path = QDRIVER_PATH . "{$class}"; + $driver_path = QDRIVER_PATH . "{$driver_class}"; if ($class_segments == array('Query', 'Driver') && is_dir($driver_path)) { // Firebird is a special case, since it's not a PDO driver // @codeCoverageIgnoreStart if ( - in_array($class, \PDO::getAvailableDrivers()) - || function_exists('\\fbird_connect') && $class === 'firebird' + in_array($driver_class, \PDO::getAvailableDrivers()) + || function_exists('\\fbird_connect') && $driver_class === 'firebird' ) { array_map('\\do_include', glob("{$driver_path}/*.php")); } // @codeCoverageIgnoreEnd } - + // Load other classes - foreach(array( - QBASE_PATH . "core/interfaces/{$class}.php", - QBASE_PATH . "core/abstract/{$class}.php", - QBASE_PATH . "core/{$class}.php" - ) as $path) + $path = str_replace('\\', DIRECTORY_SEPARATOR, $class); + $file = QBASE_PATH . "{$path}.php"; + + // @codeCoverageIgnoreStart + if (file_exists($file)) { - // @codeCoverageIgnoreStart - if (file_exists($path)) - { - require_once($path); - } - // @codeCoverageIgnoreEnd + require_once($file); } + // @codeCoverageIgnoreEnd }); // End of autoload.php \ No newline at end of file