Revert "Allow copyTo() to save field values to regular PHP variables"

This reverts commit 8364951.
nanawel · Sep 15, 2018 · f19e804 · f19e804
1 parent 71d3799
commit f19e804
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 18 deletions.
diff --git a/db/cursor.php b/db/cursor.php
@@ -96,11 +96,11 @@ abstract function update();
 	abstract function copyfrom($var,$func=NULL);
 
 	/**
-	*	Populate array variable with mapper fields
+	*	Populate hive array variable with mapper fields
 	*	@return NULL
-	*	@param $var mixed
+	*	@param $key string
 	**/
-	abstract function copyto(&$var);
+	abstract function copyto($key);
 
 	/**
 	*	Get cursor's equivalent external iterator

diff --git a/db/jig/mapper.php b/db/jig/mapper.php
@@ -497,13 +497,12 @@ function copyfrom($var,$func=NULL) {
 	}
 
 	/**
-	*	Populate array variable with mapper fields
+	*	Populate hive array variable with mapper fields
 	*	@return NULL
-	*	@param $var mixed
+	*	@param $key string
 	**/
-	function copyto(&$var) {
-		if (is_string($var))
-			$var=&\Base::instance()->ref($key);
+	function copyto($key) {
+		$var=&\Base::instance()->ref($key);
 		foreach ($this->document as $key=>$field)
 			$var[$key]=$field;
 	}

diff --git a/db/mongo/mapper.php b/db/mongo/mapper.php
@@ -347,13 +347,12 @@ function copyfrom($var,$func=NULL) {
 	}
 
 	/**
-	*	Populate array variable with mapper fields
+	*	Populate hive array variable with mapper fields
 	*	@return NULL
-	*	@param $var mixed
+	*	@param $key string
 	**/
-	function copyto($var) {
-		if (is_string($var))
-			$var=&\Base::instance()->ref($key);
+	function copyto($key) {
+		$var=&\Base::instance()->ref($key);
 		foreach ($this->document as $key=>$field)
 			$var[$key]=$field;
 	}

diff --git a/db/sql/mapper.php b/db/sql/mapper.php
@@ -603,13 +603,12 @@ function copyfrom($var,$func=NULL) {
 	}
 
 	/**
-	*	Populate array variable with mapper fields
+	*	Populate hive array variable with mapper fields
 	*	@return NULL
-	*	@param $var mixed
+	*	@param $key string
 	**/
-	function copyto(&$var) {
-		if (is_string($var))
-			$var=&\Base::instance()->ref($var);
+	function copyto($key) {
+		$var=&\Base::instance()->ref($key);
 		foreach ($this->fields+$this->adhoc as $key=>$field)
 			$var[$key]=$field['value'];
 	}