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

2.0.x #10247

Merged
merged 24 commits into from
May 7, 2015
Merged

2.0.x #10247

merged 24 commits into from
May 7, 2015

Conversation

andresgutierrez
Copy link
Contributor

No description provided.

@KorsaR-ZN
Copy link
Contributor

@andresgutierrez
Please, Don't merge in master, see #10100
Regression bug in Phalcon\Paginator\Adapter\Model, example:

$robots = Robots::find();

$paginator= new Phalcon\Paginator\Adapter\Model([
   'data' => $robots,
   'limit' => 3,
   'page' => 1
]);

$paginate = $paginator->getPaginate();

foreach ($paginate->items as $item) {
   echo $item->id . ',';
}

// Result in 2.0.x: 1,1,1
// Result in 2.0.0: 1,2,3

@Green-Cat
Copy link
Contributor

@KorsaR-ZN I think the paginator tests should be strengthened a little. First they didn't catch the last page bug (was always 1 smaller than what it should be) and now this. I'll look into expanding the test suite for it during the weekend.

@andresgutierrez
Copy link
Contributor Author

Probably introduced after: #10100

@Green-Cat
Copy link
Contributor

ping @patrick-zippenfenig

@KorsaR-ZN
Copy link
Contributor

@Green-Cat I did improve Paginator tests.
I will do the PR after fix #10100

@patrick-zippenfenig
Copy link
Contributor

@Green-Cat I'll check #10100 in a few hours. I literally just put my phalcon project into production. Linked in my github profile if someone cares

@Green-Cat
Copy link
Contributor

@KorsaR-ZN 👍 More tests is always great.
@patrick-zippenfenig thanks.

@SidRoberts
Copy link
Contributor

Possible fix: #10251

@sergeyklay
Copy link
Contributor

@andresgutierrez Give me an hour if it is possible. It seems I found another bug with model cache. Need test in new clean project.

@sergeyklay
Copy link
Contributor

Please see this #10252. I'm not sure, but I think it's a bug

patrick-zippenfenig and others added 17 commits May 5, 2015 19:40
…ition = 0) was not called before and rolling pointers are in use. Covered now by unit-test
[2.0.x] Model\Resultset: Bugfix for seek(position > 0) operations on plain resultset
[2.0.x] The Model Paginator now iterates over the models.
[2.0.x] Queue methods now return exceptional circumstances first.
[2.0.x] Methods returning `this` in Mvc\Router\Route now have the correct return type
order -> orderBy  (order is depreceted)
@SidRoberts
Copy link
Contributor

Before merging, please see #10277.

SidRoberts and others added 2 commits May 7, 2015 11:00
andresgutierrez added a commit that referenced this pull request May 7, 2015
@andresgutierrez andresgutierrez merged commit 234dce9 into master May 7, 2015
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.

7 participants