This repository has been archived by the owner on Jan 8, 2020. It is now read-only.
Hotfix/additional form options error case #7309
Merged
Conversation
This file contains 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
| @@ -163,6 +163,11 @@ public function handleComposedObjectAnnotation($e) | |||
| $specification['type'] = 'Zend\Form\Fieldset'; | |||
| } | |||
|
|
|||
| if (isset($elementSpec['spec']['options'])) { | |||
| $specification['options'] = isset($specification['options']) ? $specification['options'] : array(); | |||
| $specification['options'] = array_merge($elementSpec['spec']['options'], $specification['options']); | |||
There was a problem hiding this comment.
Can't be
if (isset($elementSpec['spec']['options']) && isset($specification['options'])) {
$specification['options'] = array_merge($elementSpec['spec']['options'], $specification['options']);
}??
There was a problem hiding this comment.
@malukenho Good point; I'll take care of that on merge.
There was a problem hiding this comment.
Actually, @malukenho, it's correct as specified; we're trying to set the $specification['options'] and/or update it; if the conditional is changed as you specify, $specification['options'] will be empty later.
There was a problem hiding this comment.
Thanks for explanation @weierophinney :)
weierophinney
added a commit
that referenced
this pull request
Mar 17, 2015
…error-case Hotfix/additional form options error case
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Reopened #7131 against develop