This repository has been archived by the owner on Jan 8, 2020. It is now read-only.
View: correctly validate input in PartialLoop #4546
Closed
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
Change the condition to be more safe and intuitive. Closes #4545
| } else if (is_object($values) && method_exists($values, 'toArray')) { | ||
| $values = $values->toArray(); | ||
| } else { | ||
| throw new Exception\InvalidArgumentException('PartialLoop helper requires iterable data'); | ||
| } |
There was a problem hiding this comment.
maybe wrap with if (!is_array($values)) {
if (!is_array($values)) {
if ($values instanceof Traversable) {
$values = ArrayUtils::iteratorToArray($values);
} else if (is_object($values) && method_exists($values, 'toArray')) {
$values = $values->toArray();
} else {
throw new Exception\InvalidArgumentException('PartialLoop helper requires iterable data');
}
}
|
Please add a unit test to ensure we don't have a regression in the future (i.e., ensure the exception gets thrown under the right conditions). |
|
@weierophinney done |
| try { | ||
| $result = $this->helper->__invoke('partialLoop.phtml', null); | ||
| $this->fail('PartialLoop should throw exception when passed null data.'); | ||
| } catch (\Zend\View\Exception\InvalidArgumentException $e) { |
There was a problem hiding this comment.
Use $this->setExpectedException() here instead of a try/catch. I'll do this when merging.
ghost
assigned
weierophinney
added a commit
that referenced
this pull request
Jun 10, 2013
View: correctly validate input in PartialLoop
weierophinney
added a commit
that referenced
this pull request
Jun 10, 2013
- to use setExpectedException()
weierophinney
added a commit
to zendframework/zend-view
that referenced
this pull request
May 15, 2015
…x/4545 View: correctly validate input in PartialLoop
weierophinney
added a commit
to zendframework/zend-view
that referenced
this pull request
May 15, 2015
- to use setExpectedException()
weierophinney
added a commit
to zendframework/zend-view
that referenced
this pull request
May 15, 2015
weierophinney
added a commit
to zendframework/zend-view
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.
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.
Change the condition to be more safe and intuitive.
Closes #4545