MAGETWO-81245: All arguments for mapping methods must be compatible with call_user_func_array #11503
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
orlangur
requested changes
Oct 17, 2017
| @@ -124,7 +124,7 @@ public function map(CriteriaInterface $criteria) | |||
| $mapperMethod = 'map' . $camelCaseKey; | |||
| if (method_exists($this, $mapperMethod)) { | |||
| if (!is_array($value)) { | |||
| $value = [$value]; | |||
| throw \Exception('Wrong type of argument, expecting array for '. $mapperMethod); | |||
There was a problem hiding this comment.
new operator is missing here. Looks like InvalidArgumentException is more suitable.
Besides fixing an existing unit test
There was 1 error:
1) Magento\Framework\DB\Test\Unit\AbstractMapperTest::testMap with data set #0 (array('mapMyMapperMethodOne', 'mapMyMapperMethodTwo'), array('my-test-value1', 'my-test-value2'))
Error: Call to undefined function Exception()
/home/travis/build/magento/magento2/lib/internal/Magento/Framework/DB/AbstractMapper.php:127
/home/travis/build/magento/magento2/lib/internal/Magento/Framework/DB/Test/Unit/AbstractMapperTest.php:141
please cover this new logic with additional test method.
There was a problem hiding this comment.
Thanks. Will update test also in next commit.
There was a problem hiding this comment.
Thanks. Will update test also in next commit.
|
@orlangur Seems to be good now. |
|
@kirmorozov thanks. Since this is a significant system behavior change could you please add a test case ensuring exception is thrown in case of passing not array as a value? Please squash changes into single commit and force push to the same branch. |
Fixed test and set InvalidArgumentException for wrong cases. (cherry picked from commit b44335b)
b44335b to
4122d76
Compare
okorshenko
pushed a commit
that referenced
this pull request
Nov 13, 2017
…be compatible with call_user_func_array #11503 - fixed code style
okorshenko
pushed a commit
that referenced
this pull request
Nov 13, 2017
…be compatible with call_user_func_array #11503 - fixed code style
okorshenko
pushed a commit
that referenced
this pull request
Nov 13, 2017
…be compatible with call_user_func_array #11503
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.
Making standard data structure for use in map().
Description
Making all elements of criteria arrays for use in call_user_func_array.
Throw exception if it not.
Fixed Issues (if relevant)
Contribution checklist