Completed
Push — master ( 2fc3f2...077ef3 )
by Jean-Christophe
01:35
created
Ubiquity/orm/DAO.php 1 patch
Doc Comments   +7 added lines, -4 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 	 * Loads member associated with $instance by a ManyToOne relationship
33 33
 	 * @param object $instance
34 34
 	 * @param string $member
35
-	 * @param boolean|array $included if true, loads associate members with associations, if array, example : ["client.*","commands"]
35
+	 * @param boolean $included if true, loads associate members with associations, if array, example : ["client.*","commands"]
36 36
 	 * @param boolean|null $useCache
37 37
 	 */
38 38
 	public static function getManyToOne($instance, $member, $included=false,$useCache=NULL) {
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 	 * @param string $className class name of the model to load
148 148
 	 * @param string $condition Part following the WHERE of an SQL statement
149 149
 	 * @param boolean|array $included if true, loads associate members with associations, if array, example : ["client.*","commands"]
150
-	 * @param array|null $parameters
150
+	 * @param boolean $parameters
151 151
 	 * @param boolean $useCache use the active cache if true
152 152
 	 * @return array
153 153
 	 */
@@ -155,6 +155,9 @@  discard block
 block discarded – undo
155 155
 		return self::_getAll($className, new ConditionParser($condition,null,$parameters),$included,$useCache);
156 156
 	}
157 157
 
158
+	/**
159
+	 * @param string $condition
160
+	 */
158 161
 	public static function paginate($className,$page=1,$rowsPerPage=20,$condition=null,$included=true){
159 162
 		if(!isset($condition)){
160 163
 			$condition="1=1";
@@ -175,7 +178,7 @@  discard block
 block discarded – undo
175 178
 	 * @param string $className complete classname of the model to load
176 179
 	 * @param string $condition Part following the WHERE of an SQL statement
177 180
 	 * @param array|null $parameters The query parameters
178
-	 * @return int count of objects
181
+	 * @return string|false count of objects
179 182
 	 */
180 183
 	public static function count($className, $condition='',$parameters=null) {
181 184
 		$tableName=OrmUtils::getTableName($className);
@@ -189,7 +192,7 @@  discard block
 block discarded – undo
189 192
 	 * @param String $className complete classname of the model to load
190 193
 	 * @param Array|string $keyValues primary key values or condition
191 194
 	 * @param boolean|array $included if true, charges associate members with association
192
-	 * @param array|null $parameters the request parameters
195
+	 * @param boolean|null $parameters the request parameters
193 196
 	 * @param boolean|null $useCache use cache if true
194 197
 	 * @return object the instance loaded or null if not found
195 198
 	 */
Please login to merge, or discard this patch.