From 9c55ed51c01dbe1d52aa8edad3e89e7ce04ac198 Mon Sep 17 00:00:00 2001 From: "Timothy J. Warren" Date: Wed, 2 Apr 2014 11:52:55 -0400 Subject: [PATCH] Remove an unneeded parameter from Query Builder and fix some docs --- classes/abstract_driver.php | 2 +- classes/connection_manager.php | 2 +- classes/query_builder.php | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/classes/abstract_driver.php b/classes/abstract_driver.php index 56b493d..a438b91 100644 --- a/classes/abstract_driver.php +++ b/classes/abstract_driver.php @@ -407,7 +407,7 @@ abstract class Abstract_Driver extends PDO implements Driver_Interface { /** * Method to simplify retreiving db results for meta-data queries * - * @param string $sql + * @param string|array|null $sql * @param bool $filtered_index * @return array */ diff --git a/classes/connection_manager.php b/classes/connection_manager.php index 6dc1cdd..95097b9 100644 --- a/classes/connection_manager.php +++ b/classes/connection_manager.php @@ -148,7 +148,7 @@ final class Connection_Manager { } // Create the Query Builder object - $conn = new Query_Builder($db, $params); + $conn = new Query_Builder($db); // Save it for later if (isset($params->alias)) diff --git a/classes/query_builder.php b/classes/query_builder.php index c94e2e4..dc11f60 100644 --- a/classes/query_builder.php +++ b/classes/query_builder.php @@ -177,9 +177,8 @@ class Query_Builder implements Query_Builder_Interface { * Constructor * * @param Abstract_driver $db - * @param ArrayObject $params - the connection parameters */ - public function __construct(Driver_Interface $db, ArrayObject $params) + public function __construct(Driver_Interface $db) { $this->db = $db;