Skip to content

Commit 660df5e

Browse files
committed
Merge pull request #676 from phalcon/2.0.x
2.0.13
2 parents 031dbcf + bd097d2 commit 660df5e

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

ide/stubs/Phalcon/db/AdapterInterface.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,6 @@ public function getDialect();
350350
* Call it when you need to restore a database connection
351351
*
352352
* @param mixed $descriptor
353-
* @param $array descriptor
354353
* @return
355354
*/
356355
public function connect($descriptor = null);

ide/stubs/Phalcon/db/ResultInterface.php

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,45 +24,45 @@ public function __construct(\Phalcon\Db\AdapterInterface $connection, \PDOStatem
2424
* Allows to executes the statement again. Some database systems don't support scrollable cursors,
2525
* So, as cursors are forward only, we need to execute the cursor again to fetch rows from the begining
2626
*
27-
* @return boolean
27+
* @return boolean
2828
*/
2929
public function execute();
3030

3131
/**
3232
* Fetches an array/object of strings that corresponds to the fetched row, or FALSE if there are no more rows.
3333
* This method is affected by the active fetch flag set using Phalcon\Db\Result\Pdo::setFetchMode
3434
*
35-
* @return mixed
35+
* @return mixed
3636
*/
3737
public function fetch();
3838

3939
/**
4040
* Returns an array of strings that corresponds to the fetched row, or FALSE if there are no more rows.
4141
* This method is affected by the active fetch flag set using Phalcon\Db\Result\Pdo::setFetchMode
4242
*
43-
* @return mixed
43+
* @return mixed
4444
*/
4545
public function fetchArray();
4646

4747
/**
4848
* Returns an array of arrays containing all the records in the result
4949
* This method is affected by the active fetch flag set using Phalcon\Db\Result\Pdo::setFetchMode
5050
*
51-
* @return array
51+
* @return array
5252
*/
5353
public function fetchAll();
5454

5555
/**
5656
* Gets number of rows returned by a resultset
5757
*
58-
* @return int
58+
* @return int
5959
*/
6060
public function numRows();
6161

6262
/**
6363
* Moves internal resultset cursor to another position letting us to fetch a certain row
6464
*
65-
* @param int $number
65+
* @param int $number
6666
*/
6767
public function dataSeek($number);
6868

@@ -77,8 +77,7 @@ public function setFetchMode($fetchMode);
7777
/**
7878
* Gets the internal PDO result object
7979
*
80-
* @return \PDOStatement
80+
* @return \PDOStatement
8181
*/
8282
public function getInternalResult();
83-
8483
}

ide/stubs/Phalcon/mvc/Model.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ public function validationHasFailed() {}
605605
* </code>
606606
*
607607
* @param mixed $filter
608-
* @return \Phalcon\Mvc\Model\Message\MessageInterface[]
608+
* @return \Phalcon\Mvc\Model\Message\MessageInterface[]
609609
*/
610610
public function getMessages($filter = null) {}
611611

0 commit comments

Comments
 (0)