Removing global reference to $db from pudlOrm::collect()

darkain · Oct 16, 2018 · d0e2fdc · d0e2fdc
1 parent cfbc43c
commit d0e2fdc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/pudlOrm.php b/pudlOrm.php
@@ -169,9 +169,7 @@ public static function select(/* ...$selex */) {
 	////////////////////////////////////////////////////////////////////////////
 	//GET A COLLECTION OF OBJECTS
 	////////////////////////////////////////////////////////////////////////////
-	public static function collect(/* ...$selex */) {
-		global $db;  //TODO: REMOVE GLOBAL REFERENCE
-
+	public static function collect($db /*, ...$selex */) {
 		if (static::collector === __CLASS__) {
 			throw new pudlException(
 				$db,
@@ -180,6 +178,7 @@ public static function collect(/* ...$selex */) {
 		}
 
 		$args			= func_get_args();
+		array_shift($args);
 		array_unshift($args, static::schema());
 
 		$collector		= static::collector;
@@ -221,7 +220,7 @@ public static function collection($db, $items /*, ...$selex */) {
 			}
 		}
 
-		$args[0]	= ['clause' => [pudl::column(
+		$args[1]	= ['clause' => [pudl::column(
 			[static::prefix, static::column],
 			$items
 		)]];

diff --git a/test/collection.inc.php b/test/collection.inc.php
@@ -32,13 +32,13 @@ class test_orm extends pudlOrm {
 
 
 $db->string();
-test_orm::collect();
+test_orm::collect($db);
 pudlTest($db, 'SELECT * FROM `pudl`');
 
 
 
 $db->string();
-test_orm::collect(['clause'=>['x'=>1], 'limit'=>10]);
+test_orm::collect($db, ['clause'=>['x'=>1], 'limit'=>10]);
 pudlTest($db, 'SELECT * FROM `pudl` WHERE (`x`=1) LIMIT 10');