Fixed router doesn't take additional default values #18111
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
simonhayre
commented
Mar 11, 2016
| Q | A |
|---|---|
| Branch | 2.3 |
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Tests pass? | Yes |
| Fixed tickets | #18035 |
| License | MIT |
| Doc PR |
… default is provided
… default is provided
… default is provided
… default is provided
… default is provided
… default is provided
… default is provided
… default is provided
… default is provided
… default is provided
…ues' of github.com:simonhayre/symfony into 18035-fix-for-router-doesnt-take-additional-default-values
| if (isset($defaults[$key]) && | ||
| !array_key_exists($key, $variables) && | ||
| $defaults[$key] !== $value | ||
| ) { |
There was a problem hiding this comment.
Can you put the condition in a single line please? It would be more consistent with rest of the code base.
|
fixes #10940 |
|
@simonhayre can you do the changes requested from jakzal ? Thanks |
|
Changes look good @simonhayre but you'll need to make the change that @jakzal proposed to be consistent with the rest of the class. |
| @@ -258,6 +258,11 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa | |||
|
|
|||
| // add a query string if needed | |||
| $extra = array_diff_key($parameters, $variables, $defaults); | |||
| foreach($parameters as $key => $value) { | |||
There was a problem hiding this comment.
missing space after foreach
This was referenced Mar 23, 2016
|
Replaced by #18280 which uses a different implementation and weak comparison on purpose. @simonhayre thanks for your work on this. |
fabpot
added a commit
that referenced
this pull request
Apr 15, 2016
…lt (Tobion) This PR was merged into the 2.3 branch. Discussion ---------- [Routing] add query param if value is different from default | Q | A | ------------- | --- | Branch? | 2.3 | Bug fix? | yes | New feature? | yes | BC breaks? | most likely not | Deprecations? | no | Tests pass? | no | Fixed tickets | #10940, #18111, #18035 | License | MIT | Doc PR | - Commits ------- 1ef2edf [Routing] add query param if value is different from default
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.