Fix #2902 #2922

Closed
wants to merge 1 commit into
from

3 participants

@cybercandyman

When a route is defined with a query part, the router will only match the first part of the url and the route matched name would not contains the "query" part. This is not the case with a 'wildcard' subroute.
So this contribution fixed that.

@weierophinney
Zend Framework member

Please provide a unit test -- I'm not even 100% sure what the change accomplishes at this point just looking at the code.

@cybercandyman

Ok no problem, i'm searching howto attach code ...

@weierophinney
Zend Framework member
@cybercandyman

Ok thanks :)

@weierophinney
Zend Framework member

Two things:

  • Please restore the phpunit.xml.dist file (it's been deleted in your commit)
  • I can't figure out what changed in the PartTest, due to the fact that the entire file was reformatted. Can you re-commit, without changing formatting, please?
@cybercandyman

Sorry, I did all the changes, it is more clear.

@weierophinney weierophinney added a commit that referenced this pull request Dec 11, 2012
@weierophinney weierophinney [#2922] CS fixes
- lineendings
78e8145
@weierophinney weierophinney added a commit that referenced this pull request Dec 11, 2012
@weierophinney weierophinney Merge branch 'hotfix/2922' into develop
Forward port #2922
692fdc4
@weierophinney weierophinney added a commit that closed this pull request Dec 11, 2012
@weierophinney weierophinney Merge branch 'hotfix/2922'
Close #2922
Fixes #2902
37277ab
@DASPRiD
Zend Framework member

Just as a side note: this PR completely screwed up the part route tests.

@DASPRiD DASPRiD commented on the diff Apr 28, 2013
tests/ZendTest/Mvc/Router/Http/PartTest.php
@@ -122,14 +153,14 @@ public static function routeProvider()
'offset-does-not-enable-partial-matching' => array(
self::getRoute(),
'/foo/foo',
- 0,
+ null,
@DASPRiD
Zend Framework member
DASPRiD added a line comment Apr 28, 2013

This test case was testing with an offset, as the name of it said. Now this test is invalid without an offset, and thus, it is actually broken. Needs to be reverted.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@ghost Unknown pushed a commit that referenced this pull request Jul 14, 2013
@weierophinney weierophinney [#2922] CS fixes
- lineendings
b73ae15
@ghost Unknown pushed a commit that referenced this pull request Jul 14, 2013
@weierophinney weierophinney Merge branch 'hotfix/2922'
Close #2922
Fixes #2902
e15a218
@ghost Unknown pushed a commit that referenced this pull request Jul 14, 2013
@weierophinney weierophinney Merge branch 'hotfix/2922' into develop
Forward port #2922
a0f719f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment