From e10eebb3020cf61dec03964116542e4865596b0b Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Thu, 7 Feb 2013 16:21:02 -0500 Subject: [PATCH] Removed object references --- classes/db_pdo.php | 2 +- classes/db_util.php | 4 +- classes/query_builder.php | 4 +- common.php | 4 +- docs/classes/BadConnectionException.html | 2 +- docs/classes/BadDBDriverException.html | 2 +- docs/classes/DB_PDO.html | 2 +- docs/classes/DB_Util.html | 4 +- docs/classes/Firebird.html | 2 +- docs/classes/Firebird_Result.html | 2 +- docs/classes/Firebird_SQL.html | 2 +- docs/classes/Firebird_Util.html | 2 +- docs/classes/MySQL.html | 2 +- docs/classes/MySQL_SQL.html | 2 +- docs/classes/MySQL_Util.html | 2 +- docs/classes/ODBC.html | 2 +- docs/classes/ODBC_SQL.html | 2 +- docs/classes/ODBC_Util.html | 2 +- docs/classes/PgSQL.html | 2 +- docs/classes/PgSQL_SQL.html | 2 +- docs/classes/PgSQL_Util.html | 2 +- docs/classes/Query_Builder.html | 2 +- docs/classes/Query_Parser.html | 2 +- docs/classes/SQLite.html | 2 +- docs/classes/SQLite_SQL.html | 2 +- docs/classes/SQLite_Util.html | 2 +- docs/classes/iDB_SQL.html | 2 +- docs/classes/iQuery_Builder.html | 2 +- docs/deprecated.html | 2 +- docs/errors.html | 2 +- docs/graph_class.html | 2 +- docs/markers.html | 2 +- docs/namespaces/default.html | 2 +- docs/packages/.html | 2 +- docs/packages/Default.html | 2 +- docs/packages/Query.Drivers.html | 2 +- docs/packages/Query.Query.html | 2 +- docs/packages/Query.html | 2 +- docs/structure.xml | 98 +++++++++++------------ tests/db_files/FB_TEST_DB.FDB | Bin 802816 -> 802816 bytes 40 files changed, 91 insertions(+), 91 deletions(-) mode change 100644 => 100755 tests/db_files/FB_TEST_DB.FDB diff --git a/classes/db_pdo.php b/classes/db_pdo.php index 1139585..202880e 100644 --- a/classes/db_pdo.php +++ b/classes/db_pdo.php @@ -96,7 +96,7 @@ abstract class DB_PDO extends PDO { } // Set the statement in the class variable for easy later access - $this->statement =& $query; + $this->statement = $query; if( ! (is_array($data) || is_object($data))) diff --git a/classes/db_util.php b/classes/db_util.php index 4956bdc..dd8b07f 100644 --- a/classes/db_util.php +++ b/classes/db_util.php @@ -29,9 +29,9 @@ abstract class DB_Util { /** * Save a reference to the connection object for later use * - * @param object &$conn + * @param object $conn */ - public function __construct(&$conn) + public function __construct($conn) { $this->conn = $conn; } diff --git a/classes/query_builder.php b/classes/query_builder.php index b8762a3..6ec348b 100644 --- a/classes/query_builder.php +++ b/classes/query_builder.php @@ -103,7 +103,7 @@ class Query_Builder implements iQuery_Builder { * @param DB_PDO $db * @param object $params - the connection parameters */ - public function __construct(&$db, $params) + public function __construct($db, $params) { $this->db = $db; @@ -117,7 +117,7 @@ class Query_Builder implements iQuery_Builder { $this->parser = new Query_Parser(); // Make things just slightly shorter - $this->sql =& $this->db->sql; + $this->sql = $this->db->sql; } // -------------------------------------------------------------------------- diff --git a/common.php b/common.php index bc0ebd8..6590b12 100644 --- a/common.php +++ b/common.php @@ -198,11 +198,11 @@ function Query($params = '') // Save it for later if (isset($params->alias)) { - $connections[$params->alias] =& $conn; + $connections[$params->alias] = $conn; } else { - $connections[] =& $conn; + $connections[] = $conn; } // Return the Query Builder object diff --git a/docs/classes/BadConnectionException.html b/docs/classes/BadConnectionException.html index 248aae3..9085c7d 100644 --- a/docs/classes/BadConnectionException.html +++ b/docs/classes/BadConnectionException.html @@ -219,7 +219,7 @@
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/classes/BadDBDriverException.html b/docs/classes/BadDBDriverException.html index cc3bb1a..1729ee2 100644 --- a/docs/classes/BadDBDriverException.html +++ b/docs/classes/BadDBDriverException.html @@ -219,7 +219,7 @@
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/classes/DB_PDO.html b/docs/classes/DB_PDO.html index 38e2f75..4e29888 100644 --- a/docs/classes/DB_PDO.html +++ b/docs/classes/DB_PDO.html @@ -743,7 +743,7 @@ the connection/database
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/classes/DB_Util.html b/docs/classes/DB_Util.html index 6847fd5..a2559ef 100644 --- a/docs/classes/DB_Util.html +++ b/docs/classes/DB_Util.html @@ -113,7 +113,7 @@

Parameters

$conn

-object

&$conn

+object
@@ -210,7 +210,7 @@
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/classes/Firebird.html b/docs/classes/Firebird.html index fd1b3a0..cd2a8a6 100644 --- a/docs/classes/Firebird.html +++ b/docs/classes/Firebird.html @@ -925,7 +925,7 @@ the last query executed
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/classes/Firebird_Result.html b/docs/classes/Firebird_Result.html index 89f586e..ec63ecc 100644 --- a/docs/classes/Firebird_Result.html +++ b/docs/classes/Firebird_Result.html @@ -505,7 +505,7 @@ the query
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/classes/Firebird_SQL.html b/docs/classes/Firebird_SQL.html index de09374..b274683 100644 --- a/docs/classes/Firebird_SQL.html +++ b/docs/classes/Firebird_SQL.html @@ -234,7 +234,7 @@
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/classes/Firebird_Util.html b/docs/classes/Firebird_Util.html index c7bbb17..529476f 100644 --- a/docs/classes/Firebird_Util.html +++ b/docs/classes/Firebird_Util.html @@ -213,7 +213,7 @@
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/classes/MySQL.html b/docs/classes/MySQL.html index b5aed9a..ae96e5c 100644 --- a/docs/classes/MySQL.html +++ b/docs/classes/MySQL.html @@ -963,7 +963,7 @@ the connection/database
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/classes/MySQL_SQL.html b/docs/classes/MySQL_SQL.html index a4d1e0d..64ff136 100644 --- a/docs/classes/MySQL_SQL.html +++ b/docs/classes/MySQL_SQL.html @@ -239,7 +239,7 @@
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/classes/MySQL_Util.html b/docs/classes/MySQL_Util.html index 5b50eaf..064252b 100644 --- a/docs/classes/MySQL_Util.html +++ b/docs/classes/MySQL_Util.html @@ -209,7 +209,7 @@
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/classes/ODBC.html b/docs/classes/ODBC.html index 0a12641..1902b43 100644 --- a/docs/classes/ODBC.html +++ b/docs/classes/ODBC.html @@ -963,7 +963,7 @@ the connection/database
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/classes/ODBC_SQL.html b/docs/classes/ODBC_SQL.html index e87d8f2..e8d5e74 100644 --- a/docs/classes/ODBC_SQL.html +++ b/docs/classes/ODBC_SQL.html @@ -234,7 +234,7 @@
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/classes/ODBC_Util.html b/docs/classes/ODBC_Util.html index 75c0a04..47b548b 100644 --- a/docs/classes/ODBC_Util.html +++ b/docs/classes/ODBC_Util.html @@ -204,7 +204,7 @@
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/classes/PgSQL.html b/docs/classes/PgSQL.html index 5b3f29b..86fcd3f 100644 --- a/docs/classes/PgSQL.html +++ b/docs/classes/PgSQL.html @@ -965,7 +965,7 @@ the connection/database
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/classes/PgSQL_SQL.html b/docs/classes/PgSQL_SQL.html index c3bc24f..af8f54e 100644 --- a/docs/classes/PgSQL_SQL.html +++ b/docs/classes/PgSQL_SQL.html @@ -234,7 +234,7 @@
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/classes/PgSQL_Util.html b/docs/classes/PgSQL_Util.html index cf8f98e..0293a10 100644 --- a/docs/classes/PgSQL_Util.html +++ b/docs/classes/PgSQL_Util.html @@ -209,7 +209,7 @@
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/classes/Query_Builder.html b/docs/classes/Query_Builder.html index c132365..5c521f4 100644 --- a/docs/classes/Query_Builder.html +++ b/docs/classes/Query_Builder.html @@ -1361,7 +1361,7 @@ passed array with key / value pairs
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/classes/Query_Parser.html b/docs/classes/Query_Parser.html index ea1a88f..8a7bfa1 100644 --- a/docs/classes/Query_Parser.html +++ b/docs/classes/Query_Parser.html @@ -145,7 +145,7 @@
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/classes/SQLite.html b/docs/classes/SQLite.html index 105669f..b7dc868 100644 --- a/docs/classes/SQLite.html +++ b/docs/classes/SQLite.html @@ -980,7 +980,7 @@ method if the database does not support 'TRUNCATE';
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/classes/SQLite_SQL.html b/docs/classes/SQLite_SQL.html index 12d4033..1e7f765 100644 --- a/docs/classes/SQLite_SQL.html +++ b/docs/classes/SQLite_SQL.html @@ -234,7 +234,7 @@
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/classes/SQLite_Util.html b/docs/classes/SQLite_Util.html index dec4dd6..c708647 100644 --- a/docs/classes/SQLite_Util.html +++ b/docs/classes/SQLite_Util.html @@ -209,7 +209,7 @@
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/classes/iDB_SQL.html b/docs/classes/iDB_SQL.html index e42561a..320de39 100644 --- a/docs/classes/iDB_SQL.html +++ b/docs/classes/iDB_SQL.html @@ -244,7 +244,7 @@ specified table
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/classes/iQuery_Builder.html b/docs/classes/iQuery_Builder.html index 7355be2..4c205d6 100644 --- a/docs/classes/iQuery_Builder.html +++ b/docs/classes/iQuery_Builder.html @@ -964,7 +964,7 @@ passed array with key / value pairs
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/deprecated.html b/docs/deprecated.html index edd5070..f6c1461 100644 --- a/docs/deprecated.html +++ b/docs/deprecated.html @@ -68,7 +68,7 @@
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/errors.html b/docs/errors.html index f78322d..fff879c 100644 --- a/docs/errors.html +++ b/docs/errors.html @@ -237,7 +237,7 @@
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/graph_class.html b/docs/graph_class.html index 550fe57..c5e7d6d 100644 --- a/docs/graph_class.html +++ b/docs/graph_class.html @@ -65,7 +65,7 @@
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/markers.html b/docs/markers.html index a8b6333..a81ac24 100644 --- a/docs/markers.html +++ b/docs/markers.html @@ -110,7 +110,7 @@
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/namespaces/default.html b/docs/namespaces/default.html index 55d4e8b..f3cfd7d 100644 --- a/docs/namespaces/default.html +++ b/docs/namespaces/default.html @@ -340,7 +340,7 @@ instantiates the specific db driver

+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/packages/.html b/docs/packages/.html index 3c9e6f4..730c09d 100644 --- a/docs/packages/.html +++ b/docs/packages/.html @@ -68,7 +68,7 @@
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/packages/Default.html b/docs/packages/Default.html index f8812a3..871e8b9 100644 --- a/docs/packages/Default.html +++ b/docs/packages/Default.html @@ -95,7 +95,7 @@
+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/packages/Query.Drivers.html b/docs/packages/Query.Drivers.html index c83eac8..9e99ff2 100644 --- a/docs/packages/Query.Drivers.html +++ b/docs/packages/Query.Drivers.html @@ -212,7 +212,7 @@ data-fetching methods

+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/packages/Query.Query.html b/docs/packages/Query.Query.html index 8a80a05..83849c1 100644 --- a/docs/packages/Query.Query.html +++ b/docs/packages/Query.Query.html @@ -150,7 +150,7 @@ instantiates the specific db driver

+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/packages/Query.html b/docs/packages/Query.html index a189c65..b8d3533 100644 --- a/docs/packages/Query.html +++ b/docs/packages/Query.html @@ -362,7 +362,7 @@ instantiates the specific db driver

+ generated on 2013-02-07T16:20:40-05:00.
diff --git a/docs/structure.xml b/docs/structure.xml index 7fb8138..4ec2f15 100644 --- a/docs/structure.xml +++ b/docs/structure.xml @@ -1,12 +1,12 @@ - + Free Query Builder / Database Abstraction Layer

]]>
- +
@@ -98,13 +98,13 @@
- + Free Query Builder / Database Abstraction Layer

]]>
- +
@@ -579,13 +579,13 @@ the connection/database]]>
- + Free Query Builder / Database Abstraction Layer

]]>
- +
@@ -2060,12 +2060,12 @@ in place of the get() method]]>
- + Free Query Builder / Database Abstraction Layer

]]>
- + @@ -2247,13 +2247,13 @@ specified table]]>
- + Free Query Builder / Database Abstraction Layer

]]>
- +
@@ -3281,13 +3281,13 @@ in place of the get() method]]>
- + Free Query Builder / Database Abstraction Layer

]]>
- +
@@ -3315,7 +3315,7 @@ in place of the get() method]]> - + object @@ -3439,13 +3439,13 @@ in place of the get() method]]>
- + Free Query Builder / Database Abstraction Layer

]]>
- +
@@ -3485,13 +3485,13 @@ in place of the get() method]]>
- + Free Query Builder / Database Abstraction Layer

]]>
- +
@@ -3601,12 +3601,12 @@ with array_map and glob]]>
- + Free Query Builder / Database Abstraction Layer

]]>
- +
@@ -3787,13 +3787,13 @@ with array_map and glob]]>
- + Free Query Builder / Database Abstraction Layer

]]>
- +
@@ -3923,13 +3923,13 @@ with array_map and glob]]>
- + Free Query Builder / Database Abstraction Layer

]]>
- +
@@ -4012,13 +4012,13 @@ with array_map and glob]]>
- + Free Query Builder / Database Abstraction Layer

]]>
- +
@@ -4137,13 +4137,13 @@ with array_map and glob]]>
- + Free Query Builder / Database Abstraction Layer

]]>
- +
@@ -4324,13 +4324,13 @@ with array_map and glob]]>
- + Free Query Builder / Database Abstraction Layer

]]>
- +
@@ -4413,13 +4413,13 @@ with array_map and glob]]>
- + Free Query Builder / Database Abstraction Layer

]]>
- +
@@ -4546,13 +4546,13 @@ with array_map and glob]]>
- + Free Query Builder / Database Abstraction Layer

]]>
- +
@@ -4635,13 +4635,13 @@ with array_map and glob]]>
- + Free Query Builder / Database Abstraction Layer

]]>
- +
@@ -4830,13 +4830,13 @@ with array_map and glob]]>
- + Free Query Builder / Database Abstraction Layer

]]>
- +
@@ -4963,13 +4963,13 @@ with array_map and glob]]>
- + Free Query Builder / Database Abstraction Layer

]]>
- +
@@ -5106,13 +5106,13 @@ with array_map and glob]]>
- + Free Query Builder / Database Abstraction Layer

]]>
- +
@@ -5293,13 +5293,13 @@ with array_map and glob]]>
- + Free Query Builder / Database Abstraction Layer

]]>
- +
@@ -5480,13 +5480,13 @@ with array_map and glob]]>
- + Free Query Builder / Database Abstraction Layer

]]>
- +
@@ -5856,13 +5856,13 @@ the query]]>
- + Free Query Builder / Database Abstraction Layer

]]>
- +
@@ -6153,13 +6153,13 @@ the last query executed]]>
- + Free Query Builder / Database Abstraction Layer

]]>
- +
diff --git a/tests/db_files/FB_TEST_DB.FDB b/tests/db_files/FB_TEST_DB.FDB old mode 100644 new mode 100755 index bdd86091da5b9245129b93e585a5f36f8de0c592..6d31427097cc41687f32a9b52b9dd41d8cd5b9dc GIT binary patch delta 1111 zcmZ9Kzl#$=6vy9gk~6!LaD!SMdSq|eY@!^O=!Nq@RDxKfI4q7UY>c31BNk#|x#q$M z{>T-A1KL>G*oex-Kfpp8wb9~0Y%B$>uCVeulX+*@EZI-Ko8i6h_wCEFc9yl*JX&pK z4f_9)A}cs$*hz^_;Y;Lu&vuE{S3akMxyb=ZKCZqM9`2p=P1JuqJCI6xO8QC`lq@P) zQgTMg14@>a40dE#l-}yNR13cZkI%{K_-iwqpHZ!FrzMIPFaMmB-oIb+4$=8?LWe62 z8dhp_JFLcY=hj;>;fr(>iEA{mKF@m#cK6T-Ps0 zBJvkgtuoQ`mh_c}VqX8wMABVE$agqgAP*N2Yv1VW*KVYYXwsdYZS!Z=vICfHuCNi4U6iUPpg?AR_&DD2|zD zb_-Ufwt(yL7+CWdSo0X#x&Cd}AGBitZGX^?0kmTPb7MF;Jq9kzV_?l=V9jIT<>WD7 z!8c57(2l{->2Hs)1<-RNQJ-GDl6kl}5+@9wI>O^ke`&HJ2e}DnpKNrUH+qbXj$i!) D)rQ%V delta 1096 zcmZ9LKWG#|6vp4o-6dw<{Tb9E1PymtZtqNWu@NCCS zK@bPDRS|81hMa|^g@yR9un0)NK4_4O1PS_Pc3za*<@R^q?%aFdck?z$rjlf8PQcOD z=_dR;6ec;ZEJXt#Pagm&9dpYGhRfc_j+HLN)j}())HO7$3UZF6maV+QR(Vi_2N%-RlLh5AFqZn66Af zr&xt{aRT0zo6xRQ;Z3mwqm>Y*iy^Gg_ow9$9ufB!oA3iec#CxyE!SPGPEdl^L1dnH zu_kvSqZ6E!eJ%E#wWV?L>Hgv;(yQL&v2b=_vLO~ z-hF<~@$DO7r-gT4nDYyGMhNpbLqEgG6i?928@I4#o~1a6_ILg;>nYBNocWaCxN+gR zD2Hdw;aPKd9!WMqBRy}!5?y#pufN=(y(c}^#pwTmE7+TtyLj00fhYYlSM7U2QyK5& RCY(H*