Merge pull request #49 from ikkez/mapper-type-hint

Improved mapper & collection type hints
f3-factory · Apr 20, 2015 · 5ecb68f · 5ecb68f
2 parents 19cdc20 + e510e1f
commit 5ecb68f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/db/cursor.php b/db/cursor.php
@@ -119,7 +119,7 @@ function dry() {
 
 	/**
 	*	Return first record (mapper object) that matches criteria
-	*	@return object|FALSE
+	*	@return \DB\Cursor|FALSE
 	*	@param $filter string|array
 	*	@param $options array
 	*	@param $ttl int

diff --git a/db/jig/mapper.php b/db/jig/mapper.php
@@ -149,7 +149,7 @@ function($expr) use($self) {
 
 	/**
 	*	Return records that match criteria
-	*	@return array|FALSE
+	*	@return \DB\JIG\Mapper[]|FALSE
 	*	@param $filter array
 	*	@param $options array
 	*	@param $ttl int

diff --git a/db/mongo/mapper.php b/db/mongo/mapper.php
@@ -84,7 +84,7 @@ function clear($key) {
 
 	/**
 	*	Convert array to mapper object
-	*	@return object
+	*	@return \DB\Mongo\Mapper
 	*	@param $row array
 	**/
 	protected function factory($row) {
@@ -111,7 +111,7 @@ function cast($obj=NULL) {
 
 	/**
 	*	Build query and execute
-	*	@return array
+	*	@return \DB\Mongo\Mapper[]
 	*	@param $fields string
 	*	@param $filter array
 	*	@param $options array
@@ -177,7 +177,7 @@ function select($fields=NULL,$filter=NULL,array $options=NULL,$ttl=0) {
 
 	/**
 	*	Return records that match criteria
-	*	@return array
+	*	@return \DB\Mongo\Mapper[]
 	*	@param $filter array
 	*	@param $options array
 	*	@param $ttl int

diff --git a/db/sql/mapper.php b/db/sql/mapper.php
@@ -100,10 +100,11 @@ function set($key,$val) {
 				$this->fields[$key]['changed']=TRUE;
 			return $this->fields[$key]['value']=$val;
 		}
-		// Parenthesize expression in case it's a subquery
+		// adjust result on existing expressions
 		if (isset($this->adhoc[$key]))
 			$this->adhoc[$key]['value']=$val;
 		else
+			// Parenthesize expression in case it's a subquery
 			$this->adhoc[$key]=array('expr'=>'('.$val.')','value'=>NULL);
 		return $val;
 	}
@@ -194,7 +195,7 @@ function($row) {
 
 	/**
 	*	Build query string and execute
-	*	@return array
+	*	@return \DB\SQL\Mapper[]
 	*	@param $fields string
 	*	@param $filter string|array
 	*	@param $options array
@@ -298,7 +299,7 @@ function($str) use($db) {
 
 	/**
 	*	Return records that match criteria
-	*	@return array
+	*	@return \DB\SQL\Mapper[]
 	*	@param $filter string|array
 	*	@param $options array
 	*	@param $ttl int