Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Phalcon\Mvc\Model return ResultsetInterface #12574

Merged
merged 2 commits into from Jan 25, 2017
Merged

Update Phalcon\Mvc\Model return ResultsetInterface #12574

merged 2 commits into from Jan 25, 2017

Conversation

ibpavlov
Copy link
Contributor

@ibpavlov ibpavlov commented Jan 25, 2017

Hello!

  • Type: bug fix

In raising this pull request, I confirm the following:

  • I have read and understood the Contributing Guidelines?
  • I have checked that another pull request for this purpose does not exist.
  • I wrote some tests for this PR.

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 the correct class.

Let me know if I am missing something

Thanks

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
@sergeyklay sergeyklay merged commit 7c40c44 into phalcon:3.0.x Jan 25, 2017
@sergeyklay
Copy link
Member

Thanks

@ibpavlov ibpavlov deleted the patch-2 branch January 25, 2017 12:10
sergeyklay added a commit that referenced this pull request Feb 25, 2017
* Regenerated build (PHP7)

* Regenerated build (PHP5)

* Regenerated build (PHP5)

* Regenerated build (PHP7)

* Using latest Zephir [ci skip]

* Bump dev version

* Added a number (0) to be a label in a form field. Null, empty string or empty array will keep invalidating a label and using the value instead.

* Update CONTRIBUTING.md [ci skip]

* Include cipher aliases for \Phalcon\Crypt

The older version of Phalcon used aliases for cipher and now they are not available. They are easy to use and migration will be easier if they persist.

* Test Alias cipher for \Phalcon\Crypt

* Update Changelog

* Change test in changelog

* Allow other except fields than unique fields

* Added backers file

* Update tests CHANGELOG.md [ci skip]

Add TEST_MC_WEIGHT to export list

* Fixed #12567 [ci skip]

* Cleaned .gitignorei [ci skip]

* Update Phalcon\Mvc\Model return ResultsetInterface (#12574)

* 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

* Updated backers file

* Fixes #12573

* Updated backers file

* Update BACKERS.md with known links

* Added mctekk and abits logos

* Removing the images to ensure that they are refreshed with the next commit

* Re-added the images for backers

* Added pdffiller in the backers file

* Added links to the BACKERS.md

* Updated backers file

* Removing the images to ensure that they are refreshed with the next commit

* Re-added the images for backers

* Added links to the BACKERS.md

* Updated backers file

* Updated backers file

* Updated backers file

* Updated backers file

* Bump version

* Tune up Travis build

* Fixed ModelsManager tests

* Tune up PHP_CodeSniffer

* Tune up PHP_CodeSniffer

* Tune up the tests

* Updated CHANGELOG.md [ci skip]

* Cleaned Gettext::query

* Fixed Phalcon\Validation\Message\Group::offsetUnset

* Allow role and resource object in isAllowed

* Updated backers file

* Updated backers file

* Updated backers file

* Removing the images to ensure that they are refreshed with the next commit

* Re-added the images for backers

* Added links to the BACKERS.md

* Updated Copyright [ci skip]

* Updated dependencies

* Regenerated build (PHP7)

* Regenerated build (PHP5)

* Using latest Zephir

* Updated CHANGELOG.md [ci skip]

* Restarted Travis build

* Regenerated build [ci skip]

* Regenerating build for php5 [ci skip]

* Cleaned Phalcon\Annotations\AdapterInterface

* Cleaned the Appveyor Build

* Added Phalcon\Validation for Phalcon\Mvc\Collection

* install file refactoring, custom phpize & php-config paths allowed

* install BINs fix

* Rosolved conflicts [ci skip]

* Removed unused variables

* Amended Uniqueness Validator test

* Port Uniquenss Validator changes from 3.0.x

* Regenerated build (PHP7) [ci skip]

* Regenerated build (PHP5) [ci skip]

* Using latest Zephir [ci skip]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants