Skip to content

Commit

Permalink
Merge pull request #676 from phalcon/2.0.x
Browse files Browse the repository at this point in the history
2.0.13
  • Loading branch information
sergeyklay committed May 21, 2016
2 parents 031dbcf + bd097d2 commit 660df5e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
1 change: 0 additions & 1 deletion ide/stubs/Phalcon/db/AdapterInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,6 @@ public function getDialect();
* Call it when you need to restore a database connection
*
* @param mixed $descriptor
* @param $array descriptor
* @return
*/
public function connect($descriptor = null);
Expand Down
15 changes: 7 additions & 8 deletions ide/stubs/Phalcon/db/ResultInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,45 +24,45 @@ public function __construct(\Phalcon\Db\AdapterInterface $connection, \PDOStatem
* Allows to executes the statement again. Some database systems don't support scrollable cursors,
* So, as cursors are forward only, we need to execute the cursor again to fetch rows from the begining
*
* @return boolean
* @return boolean
*/
public function execute();

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

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

/**
* Returns an array of arrays containing all the records in the result
* This method is affected by the active fetch flag set using Phalcon\Db\Result\Pdo::setFetchMode
*
* @return array
* @return array
*/
public function fetchAll();

/**
* Gets number of rows returned by a resultset
*
* @return int
* @return int
*/
public function numRows();

/**
* Moves internal resultset cursor to another position letting us to fetch a certain row
*
* @param int $number
* @param int $number
*/
public function dataSeek($number);

Expand All @@ -77,8 +77,7 @@ public function setFetchMode($fetchMode);
/**
* Gets the internal PDO result object
*
* @return \PDOStatement
* @return \PDOStatement
*/
public function getInternalResult();

}
2 changes: 1 addition & 1 deletion ide/stubs/Phalcon/mvc/Model.php
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ public function validationHasFailed() {}
* </code>
*
* @param mixed $filter
* @return \Phalcon\Mvc\Model\Message\MessageInterface[]
* @return \Phalcon\Mvc\Model\Message\MessageInterface[]
*/
public function getMessages($filter = null) {}

Expand Down

0 comments on commit 660df5e

Please sign in to comment.