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.

Sign up for GitHub

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

Jump to bottom

Fix issue #11395 #11390 #11406

Merged
merged 6 commits into from
Feb 24, 2016
Merged

Fix issue #11395 #11390 #11406

merged 6 commits into from
Feb 24, 2016

Conversation

DestinyMKas
Copy link
Contributor

No description provided.

@sergeyklay
Copy link
Contributor

Can you please create a small test that shows that these issues has successfully solved?

@DestinyMKas
Copy link
Contributor Author

You mean about unit test?

@sergeyklay
Copy link
Contributor

Yes. Here https://github.com/phalcon/cphalcon/blob/master/unit-tests/PaginatorTest.php

@DestinyMKas
Copy link
Contributor Author

Double check before merge please

sergeyklay
sergeyklay reviewed Feb 23, 2016
View reviewed changes
unit-tests/ModelsMetadataAdaptersTest.php
$this->assertEquals(apc_fetch('$PMM$my-local-appmeta-robots-robots'), $this->_data['meta-robots-robots']);
$this->assertEquals(apc_fetch('$PMM$my-local-appmap-robots'), $this->_data['map-robots']);
$this->assertEquals(xcache_get('$PMM$my-local-appmeta-robots-robots'), $this->_data['meta-robots-robots']);
$this->assertEquals(xcache_get('$PMM$my-local-appmap-robots'), $this->_data['map-robots']);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rollback this changes please

@sergeyklay
Copy link
Contributor

So, you're indicated that your PR has fixed the #11395 issue. Can you please add a test that covers #11395 issue?

@DestinyMKas
Copy link
Contributor Author

First part of this #11395 issue was fixed and tests has covered it in 362a5a93
Second part (I fixed) is duplicate of #11390

sergeyklay added a commit that referenced this pull request Feb 24, 2016
@sergeyklay
Merge pull request #11406 from DestinyMKas/2.0.x
3c144c2 
Fix issue #11395 #11390
@sergeyklay sergeyklay merged commit 3c144c2 into phalcon:2.0.x Feb 24, 2016
@sergeyklay
Copy link
Contributor

Thanks

@DestinyMKas DestinyMKas deleted the 2.0.x branch February 24, 2016 08:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@DestinyMKas @sergeyklay