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

Fix #5671 - console routing not correct #5720

Closed

Conversation

mtymek
Copy link
Contributor

@mtymek mtymek commented Jan 14, 2014

This PR fixes problems in console route matching, reported in #5671:

  • CamelCase is now treated as literal
  • ALLCAPS defines value parameter

ping @Thinkscape

BTW, it doesn't merge cleanly with develop branch. What is a workflow for PRs here? Would it work if I did cherry-pick this, cleanup, commit, and create new PR against develop?

@weierophinney
Copy link
Member

@mtymek I'll take care of merge conflicts when I merge to develop for 2.3.0.

@weierophinney weierophinney added this to the 2.3.0 milestone Mar 3, 2014
@weierophinney weierophinney self-assigned this Mar 3, 2014
@weierophinney
Copy link
Member

@mtymek The reason this does not merge cleanly to develop is because of your very own #4449 - which has been against develop since late last May. :) I was able to get things merged in cleanly locally, and am about to push.

weierophinney added a commit that referenced this pull request Mar 4, 2014
Fix #5671 - console routing not correct

Conflicts:
	library/Zend/Mvc/Router/Console/Simple.php
weierophinney added a commit that referenced this pull request Mar 4, 2014
@weierophinney
Copy link
Member

Merged to develop for release with 2.3.0.

@mtymek
Copy link
Contributor Author

mtymek commented Mar 5, 2014

@weierophinney I know, that's exactly why I wanted to help with merge :)

'mandatory-literal-camel-case' => array(
'FooBar',
array('FooBar'),
array(),
Copy link
Member

Choose a reason for hiding this comment

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

I don't understand this test case.

Why is the expected result an empty array() ? If you're defining a mandatory literal parameter, then the result must be array('FooBar' => null) - see previous test cases.

Copy link
Member

Choose a reason for hiding this comment

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

@mtymek
Copy link
Contributor Author

mtymek commented Mar 5, 2014

@Thinkscape I briefly looked at the matching code, and most likely it is just the test - doesn't fail where it should. I will fix it in coming days.

@Thinkscape
Copy link
Member

@mtymek Please handle it before 2.3.0

@mtymek
Copy link
Contributor Author

mtymek commented Mar 11, 2014

As I wrote, it was just an issue with unit test: #5943.

weierophinney added a commit to zendframework/zend-console that referenced this pull request May 15, 2015
…x/5671-console-routing

Fix zendframework/zendframework#5671 - console routing not correct

Conflicts:
	library/Zend/Mvc/Router/Console/Simple.php
weierophinney added a commit to zendframework/zend-console 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.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants