Correct the error message when creating wrong object for block #2037
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
|
👍 |
| @@ -260,7 +260,7 @@ protected function getBlockInstance($block, array $arguments = []) | |||
| } | |||
| if (!$block instanceof \Magento\Framework\View\Element\AbstractBlock) { | |||
| throw new \Magento\Framework\Exception\LocalizedException( | |||
| new \Magento\Framework\Phrase('Invalid block type: %1', [$block]) | |||
| new \Magento\Framework\Phrase('Invalid block type: %1', [is_string($block) ? $block : get_class($block)]) | |||
There was a problem hiding this comment.
This code assumes that only string or object may be provided.
Please use more secure version:
is_object($block) ? get_class($block) : $block
|
Hi @hiephm could you please make those changes mentioned by @vkublytskyi ? |
… an AbstractBlock
|
Hiep Ho Minh seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account. |
hiephm
force-pushed
the
bugs-error-message
branch
from
2867ee8 to
47ad2c7
Compare
|
@MomotenkoNatalia OK, I have updated the code. |
|
Internal ticket: MAGETWO-58370 |
vkorotun
added
Issue: Ready for Work
|
@vkorotun @mmansoorebay is this PR going to be included in 2.1.3? |
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.
In case the $block is neither string nor AbstractBlock (e.g in case use wrong class for block), the error message will become:
Should add the check for object and use get_class in that case.