Skip to content

Commit

Permalink
Fix return types
Browse files Browse the repository at this point in the history 
(cherry picked from commit 68cd648)
  • Loading branch information
@sjinks
sjinks committed Oct 3, 2013
1 parent bb0b31c commit 3d03848
Showing 1 changed file with 24 additions and 25 deletions.
49 changes: 24 additions & 25 deletions ext/mvc/model/criteria.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, getDI){
* Set a model on which the query will be executed
*
* @param string $modelName
* @return Phalcon\Mvc\Model\Criteria
* @return Phalcon\Mvc\Model\CriteriaInterface
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, setModelName){

Expand Down Expand Up @@ -158,7 +158,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, getModelName){
* This method replaces all previously set bound parameters
*
* @param string $bindParams
* @return Phalcon\Mvc\Model\Criteria
* @return Phalcon\Mvc\Model\CriteriaInterface
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, bind){

Expand All @@ -180,7 +180,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, bind){
* This method replaces all previously set bound parameters
*
* @param string $bindTypes
* @return Phalcon\Mvc\Model\Criteria
* @return Phalcon\Mvc\Model\CriteriaInterface
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, bindTypes){

Expand All @@ -205,7 +205,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, bindTypes){
*</code>
*
* @param string|array $columns
* @return Phalcon\Mvc\Model\Query\Builder
* @return Phalcon\Mvc\Model\CriteriaInterface
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, columns){

Expand All @@ -231,7 +231,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, columns){
* @param string $conditions
* @param string $alias
* @param string $type
* @return Phalcon\Mvc\Model\Query\Builder
* @return Phalcon\Mvc\Model\CriteriaInterface
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, join){

Expand Down Expand Up @@ -297,8 +297,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, join){
* @param string $model
* @param string $conditions
* @param string $alias
* @param string $type
* @return Phalcon\Mvc\Model\Query\Builder
* @return Phalcon\Mvc\Model\CriteriaInterface
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, innerJoin){

Expand Down Expand Up @@ -360,7 +359,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, innerJoin){
* @param string $model
* @param string $conditions
* @param string $alias
* @return Phalcon\Mvc\Model\Query\Builder
* @return Phalcon\Mvc\Model\CriteriaInterface
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, leftJoin){

Expand Down Expand Up @@ -422,7 +421,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, leftJoin){
* @param string $model
* @param string $conditions
* @param string $alias
* @return Phalcon\Mvc\Model\Query\Builder
* @return Phalcon\Mvc\Model\CriteriaInterface
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, rightJoin){

Expand Down Expand Up @@ -480,7 +479,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, rightJoin){
* @param string $conditions
* @param array $bindParams
* @param array $bindTypes
* @return Phalcon\Mvc\Model\Criteria
* @return Phalcon\Mvc\Model\CriteriaInterface
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, where){

Expand Down Expand Up @@ -555,7 +554,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, where){
* @param string $conditions
* @param array $bindParams
* @param array $bindTypes
* @return Phalcon\Mvc\Model\Criteria
* @return Phalcon\Mvc\Model\CriteriaInterface
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, addWhere){

Expand Down Expand Up @@ -583,7 +582,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, addWhere){
* @param string $conditions
* @param array $bindParams
* @param array $bindTypes
* @return Phalcon\Mvc\Model\Criteria
* @return Phalcon\Mvc\Model\CriteriaInterface
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, andWhere){

Expand Down Expand Up @@ -672,7 +671,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, andWhere){
* @param string $conditions
* @param array $bindParams
* @param array $bindTypes
* @return Phalcon\Mvc\Model\Criteria
* @return Phalcon\Mvc\Model\CriteriaInterface
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, orWhere){

Expand Down Expand Up @@ -765,7 +764,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, orWhere){
* @param string $expr
* @param mixed $minimum
* @param mixed $maximum
* @return Phalcon\Mvc\Model\Query\Builder
* @return Phalcon\Mvc\Model\CriteriaInterface
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, betweenWhere){

Expand Down Expand Up @@ -829,7 +828,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, betweenWhere){
* @param string $expr
* @param mixed $minimum
* @param mixed $maximum
* @return Phalcon\Mvc\Model\Query\Builder
* @return Phalcon\Mvc\Model\CriteriaInterface
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, notBetweenWhere){

Expand Down Expand Up @@ -892,7 +891,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, notBetweenWhere){
*
* @param string $expr
* @param array $values
* @return Phalcon\Mvc\Model\Query\Builder
* @return Phalcon\Mvc\Model\CriteriaInterface
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, inWhere){

Expand Down Expand Up @@ -970,7 +969,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, inWhere){
*
* @param string $expr
* @param array $values
* @return Phalcon\Mvc\Model\Query\Builder
* @return Phalcon\Mvc\Model\CriteriaInterface
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, notInWhere){

Expand Down Expand Up @@ -1043,7 +1042,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, notInWhere){
* Adds the conditions parameter to the criteria
*
* @param string $conditions
* @return Phalcon\Mvc\Model\Criteria
* @return Phalcon\Mvc\Model\CriteriaIntreface
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, conditions){

Expand All @@ -1064,7 +1063,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, conditions){
* Adds the order-by parameter to the criteria (deprecated)
*
* @param string $orderColumns
* @return Phalcon\Mvc\Model\Criteria
* @return Phalcon\Mvc\Model\CriteriaInterface
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, order){

Expand All @@ -1085,7 +1084,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, order){
* Adds the order-by parameter to the criteria
*
* @param string $orderColumns
* @return Phalcon\Mvc\Model\Criteria
* @return Phalcon\Mvc\Model\CriteriaInterface
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, orderBy){

Expand All @@ -1107,7 +1106,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, orderBy){
*
* @param int $limit
* @param int $offset
* @return Phalcon\Mvc\Model\Criteria
* @return Phalcon\Mvc\Model\CriteriaInterface
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, limit){

Expand Down Expand Up @@ -1142,7 +1141,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, limit){
* Adds the "for_update" parameter to the criteria
*
* @param boolean $forUpdate
* @return Phalcon\Mvc\Model\Criteria
* @return Phalcon\Mvc\Model\CriteriaInterface
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, forUpdate){

Expand All @@ -1165,7 +1164,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, forUpdate){
* Adds the "shared_lock" parameter to the criteria
*
* @param boolean $sharedLock
* @return Phalcon\Mvc\Model\Criteria
* @return Phalcon\Mvc\Model\CriteriaInterface
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, sharedLock){

Expand Down Expand Up @@ -1297,7 +1296,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, getOrder){
/**
* Returns all the parameters defined in the criteria
*
* @return string
* @return array
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, getParams){

Expand All @@ -1311,7 +1310,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, getParams){
* @param Phalcon\DiInterface $dependencyInjector
* @param string $modelName
* @param array $data
* @return static
* @return Phalcon\Mvc\Model\Criteria
*/
PHP_METHOD(Phalcon_Mvc_Model_Criteria, fromInput){

Expand Down

0 comments on commit 3d03848

Please sign in to comment.