Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Fixes #4936 #7152

Merged
merged 7 commits into from
Feb 24, 2015
Merged

Fixes #4936 #7152

merged 7 commits into from
Feb 24, 2015

Conversation

kusmierz
Copy link
Contributor

It will fix #4936 issue.

@Ocramius
Copy link
Member

Requires test case

@kusmierz
Copy link
Contributor Author

@Ocramius I've added. Dunno how it write it better.

@Ocramius
Copy link
Member

@kusmierz the test should be related to Chain, not to the stdlib component: you changed code only in the Mvc component after all ;-)

@kusmierz
Copy link
Contributor Author

Indeed, you've right. I hope there is no more usages of "key()" function on PriorityList in code (I've checked it quickly).

Is it correct now?

@@ -11,6 +11,7 @@

use Zend\Mvc\Router\PriorityList;
use PHPUnit_Framework_TestCase as TestCase;
use Zend\Stdlib\ArrayUtils;
Copy link
Member

Choose a reason for hiding this comment

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

This test should be on ChainTest, as that's where the code changes are.

@kusmierz
Copy link
Contributor Author

I've finally found time to write it. @Ocramius could you check it if it's ok now? Thanks in advance.

Without my fix, the new test will fail on:

Failed asserting that two strings are equal.
Expected :/foo
Actual   :/foo/bar
 <Click to see difference>

zf2/tests/ZendTest/Mvc/Router/Http/ChainTest.php:180
 phar:///usr/share/php/phpunit.phar/phpunit/TextUI/Command.php:151

@Ocramius Ocramius added this to the 2.3.5 milestone Feb 3, 2015
@Ocramius Ocramius self-assigned this Feb 3, 2015
@weierophinney weierophinney modified the milestones: 2.3.5, 2.3.6, 2.4.0 Feb 18, 2015
@kusmierz
Copy link
Contributor Author

@Ocramius, have you added this to v2.3.5?

@Ocramius
Copy link
Member

@kusmierz no, as you can see it's scheduled for 2.4.0

@weierophinney weierophinney merged commit 429717b into zendframework:develop Feb 24, 2015
weierophinney added a commit that referenced this pull request Feb 24, 2015
gianarb pushed a commit to zendframework/zend-stdlib that referenced this pull request May 15, 2015
gianarb pushed a commit to zendframework/zend-stdlib that referenced this pull request May 15, 2015
gianarb pushed a commit to zendframework/zend-stdlib that referenced this pull request May 15, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants