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

Merge the 3.0.x branch #12644

Merged
merged 72 commits into from
Feb 25, 2017
Merged

Merge the 3.0.x branch #12644

merged 72 commits into from
Feb 25, 2017

Conversation

sergeyklay
Copy link
Contributor

No description provided.

sergeyklay and others added 30 commits February 21, 2017 01:11
…or empty array will keep invalidating a label and using the value instead.
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.
Add TEST_MC_WEIGHT to export list
* 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
@sergeyklay sergeyklay merged commit 2c3786c into phalcon:3.1.x Feb 25, 2017
@sergeyklay sergeyklay deleted the merge-from-3.0.x branch February 25, 2017 09:46
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.

6 participants