[#3711] Fix regression in query string matching #3778

Closed
wants to merge 1 commit into from

2 participants

@weierophinney
Zend Framework member

If a route is marked may_terminate, and a query string is present, in
most cases, we should match; the query route is primarily for the
convenience of generating URIs via the assemble() method, and only
matches if a query string is present.

This patch adds tests that do the following:

  • If the route is marked may_terminate and a query string is present, but there is no Query route child, match and return immediately.
  • If the route is marked may_terminate, and a query string is present, and a Query route child is present, pass matching on to child routes.

This fixes #3711 and replaces #3712

@weierophinney weierophinney [#3711] Fix regression in query string matching
If a route is marked may_terminate, and a query string is present, in
most cases, we should match; the query route is primarily for the
convenience of _generating_ URIs via the assemble() method, and only
matches if a query string is present.

This patch adds tests that do the following:

- If the route is marked may_terminate and a query string is present,
  but there is no Query route child, match and return immediately.
- If the route is marked may_terminate, and a query string is present,
  and a Query route child is present, pass matching on to child routes.
f9fad6e
@ralphschindler ralphschindler added a commit that closed this pull request Feb 19, 2013
@ralphschindler ralphschindler Closes #3778
Also closes #3711
Also closes #3652
Also closes #3636

Merge branch 'weierophinney-hotfix/3711'
a3df97c
@ralphschindler ralphschindler added a commit that referenced this pull request Feb 19, 2013
@ralphschindler ralphschindler Forward #3778
Merge branch 'weierophinney-hotfix/3711' into develop
0823436
@ghost Unknown pushed a commit that referenced this pull request Jul 14, 2013
@ralphschindler ralphschindler Closes #3778
Also closes #3711
Also closes #3652
Also closes #3636

Merge branch 'weierophinney-hotfix/3711'
c30a935
@ghost Unknown pushed a commit that referenced this pull request Jul 14, 2013
@ralphschindler ralphschindler Forward #3778
Merge branch 'weierophinney-hotfix/3711' into develop
36ba5ae
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment