From b5a141ffc741a4f271bf4e110814ac8861a2312f Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Tue, 10 Nov 2015 10:12:23 -0500 Subject: [PATCH] Make class names Pascal Case --- src/Query/{Abstract_Driver.php => AbstractDriver.php} | 2 +- .../{Abstract_Query_Builder.php => AbstractQueryBuilder.php} | 2 +- src/Query/{Abstract_SQL.php => AbstractSQL.php} | 2 +- src/Query/{Abstract_Util.php => AbstractUtil.php} | 4 ++-- src/Query/{Connection_Manager.php => ConnectionManager.php} | 4 ++-- src/Query/{Driver_Interface.php => DriverInterface.php} | 2 +- src/Query/Drivers/Firebird/Driver.php | 2 +- src/Query/Drivers/Firebird/SQL.php | 2 +- src/Query/Drivers/Firebird/Util.php | 2 +- src/Query/Drivers/Mysql/Driver.php | 2 +- src/Query/Drivers/Mysql/SQL.php | 2 +- src/Query/Drivers/Mysql/Util.php | 2 +- src/Query/Drivers/Pgsql/Driver.php | 2 +- src/Query/Drivers/Pgsql/SQL.php | 2 +- src/Query/Drivers/Pgsql/Util.php | 2 +- src/Query/Drivers/Sqlite/Driver.php | 2 +- src/Query/Drivers/Sqlite/SQL.php | 2 +- src/Query/Drivers/Sqlite/Util.php | 2 +- src/Query/{Query_Builder.php => QueryBuilder.php} | 2 +- ...{Query_Builder_Interface.php => QueryBuilderInterface.php} | 2 +- src/Query/{Query_Parser.php => QueryParser.php} | 2 +- src/Query/{SQL_Interface.php => SQLInterface.php} | 0 src/common.php | 4 ++-- 23 files changed, 25 insertions(+), 25 deletions(-) rename src/Query/{Abstract_Driver.php => AbstractDriver.php} (99%) rename src/Query/{Abstract_Query_Builder.php => AbstractQueryBuilder.php} (99%) rename src/Query/{Abstract_SQL.php => AbstractSQL.php} (93%) rename src/Query/{Abstract_Util.php => AbstractUtil.php} (97%) rename src/Query/{Connection_Manager.php => ConnectionManager.php} (98%) rename src/Query/{Driver_Interface.php => DriverInterface.php} (99%) rename src/Query/{Query_Builder.php => QueryBuilder.php} (99%) rename src/Query/{Query_Builder_Interface.php => QueryBuilderInterface.php} (99%) rename src/Query/{Query_Parser.php => QueryParser.php} (99%) rename src/Query/{SQL_Interface.php => SQLInterface.php} (100%) diff --git a/src/Query/Abstract_Driver.php b/src/Query/AbstractDriver.php similarity index 99% rename from src/Query/Abstract_Driver.php rename to src/Query/AbstractDriver.php index 6b0df93..2d2fd0e 100644 --- a/src/Query/Abstract_Driver.php +++ b/src/Query/AbstractDriver.php @@ -25,7 +25,7 @@ namespace Query; * @package Query * @subpackage Drivers */ -abstract class Abstract_Driver extends \PDO implements Driver_Interface { +abstract class AbstractDriver extends \PDO implements DriverInterface { /** * Reference to the last executed query diff --git a/src/Query/Abstract_Query_Builder.php b/src/Query/AbstractQueryBuilder.php similarity index 99% rename from src/Query/Abstract_Query_Builder.php rename to src/Query/AbstractQueryBuilder.php index e73a922..d739ebf 100644 --- a/src/Query/Abstract_Query_Builder.php +++ b/src/Query/AbstractQueryBuilder.php @@ -21,7 +21,7 @@ namespace Query; * Abstract Class for internal implementation methods of the Query Builder * @package Query */ -abstract class Abstract_Query_Builder { +abstract class AbstractQueryBuilder { // -------------------------------------------------------------------------- // ! Constants diff --git a/src/Query/Abstract_SQL.php b/src/Query/AbstractSQL.php similarity index 93% rename from src/Query/Abstract_SQL.php rename to src/Query/AbstractSQL.php index dce3702..40ade68 100644 --- a/src/Query/Abstract_SQL.php +++ b/src/Query/AbstractSQL.php @@ -21,7 +21,7 @@ namespace Query; * @package Query * @subpackage Drivers */ -abstract class Abstract_SQL implements SQL_Interface { +abstract class AbstractSQL implements SQLInterface { /** * Limit clause diff --git a/src/Query/Abstract_Util.php b/src/Query/AbstractUtil.php similarity index 97% rename from src/Query/Abstract_Util.php rename to src/Query/AbstractUtil.php index 893558c..afa7396 100644 --- a/src/Query/Abstract_Util.php +++ b/src/Query/AbstractUtil.php @@ -25,7 +25,7 @@ namespace Query; * @method string quote_ident(string $sql) * @method string quote_table(string $sql) */ -abstract class Abstract_Util { +abstract class AbstractUtil { /** * Reference to the current connection object @@ -37,7 +37,7 @@ abstract class Abstract_Util { * * @param Driver_Interface $conn */ - public function __construct(Driver_Interface $conn) + public function __construct(DriverInterface $conn) { $this->conn = $conn; } diff --git a/src/Query/Connection_Manager.php b/src/Query/ConnectionManager.php similarity index 98% rename from src/Query/Connection_Manager.php rename to src/Query/ConnectionManager.php index 2b62423..a29d781 100644 --- a/src/Query/Connection_Manager.php +++ b/src/Query/ConnectionManager.php @@ -22,7 +22,7 @@ namespace Query; * @package Query * @subpackage Core */ -final class Connection_Manager { +final class ConnectionManager { /** * Map of named database connections @@ -144,7 +144,7 @@ final class Connection_Manager { } // Create Query Builder object - $conn = new Query_Builder($db, new Query_Parser($db)); + $conn = new QueryBuilder($db, new QueryParser($db)); // Save it for later diff --git a/src/Query/Driver_Interface.php b/src/Query/DriverInterface.php similarity index 99% rename from src/Query/Driver_Interface.php rename to src/Query/DriverInterface.php index 29548fe..02c8dd9 100644 --- a/src/Query/Driver_Interface.php +++ b/src/Query/DriverInterface.php @@ -21,7 +21,7 @@ namespace Query; * @package Query * @subpackage Drivers */ -interface Driver_Interface { +interface DriverInterface { /** * Constructor/Connection method diff --git a/src/Query/Drivers/Firebird/Driver.php b/src/Query/Drivers/Firebird/Driver.php index 3c1f197..5ffa36e 100644 --- a/src/Query/Drivers/Firebird/Driver.php +++ b/src/Query/Drivers/Firebird/Driver.php @@ -23,7 +23,7 @@ namespace Query\Drivers\Firebird; * @package Query * @subpackage Drivers */ -class Driver extends \Query\Abstract_Driver { +class Driver extends \Query\AbstractDriver { /** * Reference to the last query executed diff --git a/src/Query/Drivers/Firebird/SQL.php b/src/Query/Drivers/Firebird/SQL.php index addeb86..c2cd78e 100644 --- a/src/Query/Drivers/Firebird/SQL.php +++ b/src/Query/Drivers/Firebird/SQL.php @@ -21,7 +21,7 @@ namespace Query\Drivers\Firebird; * @package Query * @subpackage Drivers */ -class SQL extends \Query\Abstract_SQL { +class SQL extends \Query\AbstractSQL { /** * Limit clause diff --git a/src/Query/Drivers/Firebird/Util.php b/src/Query/Drivers/Firebird/Util.php index c30628a..89549c3 100644 --- a/src/Query/Drivers/Firebird/Util.php +++ b/src/Query/Drivers/Firebird/Util.php @@ -21,7 +21,7 @@ namespace Query\Drivers\Firebird; * @package Query * @subpackage Drivers */ -class Util extends \Query\Abstract_Util { +class Util extends \Query\AbstractUtil { /** * Convenience public function to generate sql for creating a db table diff --git a/src/Query/Drivers/Mysql/Driver.php b/src/Query/Drivers/Mysql/Driver.php index c9cd111..df24c84 100644 --- a/src/Query/Drivers/Mysql/Driver.php +++ b/src/Query/Drivers/Mysql/Driver.php @@ -21,7 +21,7 @@ namespace Query\Drivers\Mysql; * @package Query * @subpackage Drivers */ -class Driver extends \Query\Abstract_Driver { +class Driver extends \Query\AbstractDriver { /** * Set the backtick as the MySQL escape character diff --git a/src/Query/Drivers/Mysql/SQL.php b/src/Query/Drivers/Mysql/SQL.php index 79537cb..1cc7e1a 100644 --- a/src/Query/Drivers/Mysql/SQL.php +++ b/src/Query/Drivers/Mysql/SQL.php @@ -21,7 +21,7 @@ namespace Query\Drivers\Mysql; * @package Query * @subpackage Drivers */ -class SQL extends \Query\Abstract_SQL { +class SQL extends \Query\AbstractSQL { /** * Limit clause diff --git a/src/Query/Drivers/Mysql/Util.php b/src/Query/Drivers/Mysql/Util.php index e505a8a..06eb089 100644 --- a/src/Query/Drivers/Mysql/Util.php +++ b/src/Query/Drivers/Mysql/Util.php @@ -21,7 +21,7 @@ namespace Query\Drivers\Mysql; * @package Query * @subpackage Drivers */ -class Util extends \Query\Abstract_Util { +class Util extends \Query\AbstractUtil { /** * Create an SQL backup file for the current database's structure diff --git a/src/Query/Drivers/Pgsql/Driver.php b/src/Query/Drivers/Pgsql/Driver.php index adc39af..16b944e 100644 --- a/src/Query/Drivers/Pgsql/Driver.php +++ b/src/Query/Drivers/Pgsql/Driver.php @@ -21,7 +21,7 @@ namespace Query\Drivers\Pgsql; * @package Query * @subpackage Drivers */ -class Driver extends \Query\Abstract_Driver { +class Driver extends \Query\AbstractDriver { /** * Connect to a PosgreSQL database diff --git a/src/Query/Drivers/Pgsql/SQL.php b/src/Query/Drivers/Pgsql/SQL.php index f002583..57325c4 100644 --- a/src/Query/Drivers/Pgsql/SQL.php +++ b/src/Query/Drivers/Pgsql/SQL.php @@ -20,7 +20,7 @@ namespace Query\Drivers\Pgsql; * @package Query * @subpackage Drivers */ -class SQL extends \Query\Abstract_SQL { +class SQL extends \Query\AbstractSQL { /** * Get the query plan for the sql query diff --git a/src/Query/Drivers/Pgsql/Util.php b/src/Query/Drivers/Pgsql/Util.php index 60eafc7..62f428d 100644 --- a/src/Query/Drivers/Pgsql/Util.php +++ b/src/Query/Drivers/Pgsql/Util.php @@ -21,7 +21,7 @@ namespace Query\Drivers\Pgsql; * @package Query * @subpackage Drivers */ -class Util extends \Query\Abstract_Util { +class Util extends \Query\AbstractUtil { /** * Create an SQL backup file for the current database's structure diff --git a/src/Query/Drivers/Sqlite/Driver.php b/src/Query/Drivers/Sqlite/Driver.php index f27c91f..7871407 100644 --- a/src/Query/Drivers/Sqlite/Driver.php +++ b/src/Query/Drivers/Sqlite/Driver.php @@ -21,7 +21,7 @@ namespace Query\Drivers\Sqlite; * @package Query * @subpackage Drivers */ -class Driver extends \Query\Abstract_Driver { +class Driver extends \Query\AbstractDriver { /** * Reference to the last executed sql query diff --git a/src/Query/Drivers/Sqlite/SQL.php b/src/Query/Drivers/Sqlite/SQL.php index 61f5bb8..c2abd49 100644 --- a/src/Query/Drivers/Sqlite/SQL.php +++ b/src/Query/Drivers/Sqlite/SQL.php @@ -21,7 +21,7 @@ namespace Query\Drivers\Sqlite; * @package Query * @subpackage Drivers */ -class SQL extends \Query\Abstract_SQL { +class SQL extends \Query\AbstractSQL { /** * Get the query plan for the sql query diff --git a/src/Query/Drivers/Sqlite/Util.php b/src/Query/Drivers/Sqlite/Util.php index 75b97fb..088309a 100644 --- a/src/Query/Drivers/Sqlite/Util.php +++ b/src/Query/Drivers/Sqlite/Util.php @@ -23,7 +23,7 @@ namespace Query\Drivers\Sqlite; * @method mixed query(string $sql) * @method string quote(string $str) */ -class Util extends \Query\Abstract_Util { +class Util extends \Query\AbstractUtil { /** * Create an SQL backup file for the current database's data diff --git a/src/Query/Query_Builder.php b/src/Query/QueryBuilder.php similarity index 99% rename from src/Query/Query_Builder.php rename to src/Query/QueryBuilder.php index 050c310..967e805 100644 --- a/src/Query/Query_Builder.php +++ b/src/Query/QueryBuilder.php @@ -24,7 +24,7 @@ namespace Query; * @package Query * @subpackage Query_Builder */ -class Query_Builder extends Abstract_Query_Builder implements Query_Builder_Interface { +class QueryBuilder extends AbstractQueryBuilder implements QueryBuilderInterface { /** * String class values to be reset diff --git a/src/Query/Query_Builder_Interface.php b/src/Query/QueryBuilderInterface.php similarity index 99% rename from src/Query/Query_Builder_Interface.php rename to src/Query/QueryBuilderInterface.php index 7cb2fac..cb45e8b 100644 --- a/src/Query/Query_Builder_Interface.php +++ b/src/Query/QueryBuilderInterface.php @@ -21,7 +21,7 @@ namespace Query; * @package Query * @subpackage Query_Builder */ -interface Query_Builder_Interface { +interface QueryBuilderInterface { // -------------------------------------------------------------------------- // ! Select Queries diff --git a/src/Query/Query_Parser.php b/src/Query/QueryParser.php similarity index 99% rename from src/Query/Query_Parser.php rename to src/Query/QueryParser.php index d08f76c..5661d9d 100644 --- a/src/Query/Query_Parser.php +++ b/src/Query/QueryParser.php @@ -21,7 +21,7 @@ namespace Query; * @package Query * @subpackage Query_Builder */ -class Query_Parser { +class QueryParser { /** * DB Driver diff --git a/src/Query/SQL_Interface.php b/src/Query/SQLInterface.php similarity index 100% rename from src/Query/SQL_Interface.php rename to src/Query/SQLInterface.php diff --git a/src/common.php b/src/common.php index 24e40c7..ae49a93 100644 --- a/src/common.php +++ b/src/common.php @@ -91,7 +91,7 @@ if ( ! function_exists('from_camel_case')) preg_match_all('!([A-Z][A-Z0-9]*(?=$|[A-Z][a-z0-9])|[A-Za-z][a-z0-9]+)!', $input, $matches); $ret = $matches[0]; foreach ($ret as &$match) { - $match = strtolower($match);// == strtoupper($match) ? strtolower($match) : lcfirst($match); + $match = strtolower($match); } return implode('_', $ret); } @@ -206,7 +206,7 @@ if ( ! function_exists('Query')) */ function Query($params = '') { - $cmanager = \Query\Connection_Manager::get_instance(); + $cmanager = \Query\ConnectionManager::get_instance(); // If you are getting a previously created connection if (is_scalar($params))