Skip to content

Commit

Permalink
Update Phalcon\Mvc\Model return ResultsetInterface (#12574)
Browse files Browse the repository at this point in the history
* Update Phalcon\Mvc\Model return ResultsetInterface

ResultsetInterface is not imported and causes problems when generating Stubs for IDE. It is generating @return type of Phalcon\Mvc\ResultsetInterface and not Phalcon\Mvc\Model\ResultsetInterface

I think it should be imported in order to easily find correct class

* Update CHANGELOG.md
  • Loading branch information
ibpavlov authored and sergeyklay committed Jan 25, 2017
1 parent 67f0737 commit 7c40c44
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
- Fixed Isnull check is not correct when the model field defaults to an empty string. [#12507](https://github.com/phalcon/cphalcon/issues/12507)
- Fixed `Phalcon\Forms\Element::label` to accept 0 as label instead of validating it as empty. [#12148](https://github.com/phalcon/cphalcon/issues/12148)
- Added Aliases for ciphers in `Phalcon\Crypt`
- Fixed `Phalcon\Mvc\Model` return type ResultsetInterface

# [3.0.3](https://github.com/phalcon/cphalcon/releases/tag/v3.0.3) (2016-12-24)
- Fixed implementation of Iterator interface in a `Phalcon\Forms\Form` that could cause a run-time warning
Expand Down
1 change: 1 addition & 0 deletions phalcon/mvc/model.zep
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ use Phalcon\Db\DialectInterface;
use Phalcon\Mvc\Model\CriteriaInterface;
use Phalcon\Mvc\Model\TransactionInterface;
use Phalcon\Mvc\Model\Resultset;
use Phalcon\Mvc\Model\ResultsetInterface;
use Phalcon\Mvc\Model\Query;
use Phalcon\Mvc\Model\Query\Builder;
use Phalcon\Mvc\Model\Relation;
Expand Down

0 comments on commit 7c40c44

Please sign in to comment.