Skip to content

Commit

Permalink
Merge forwardport of #12239 to 2.3-develop branch
Browse files Browse the repository at this point in the history
Applied pull request patch https://github.com/magento/magento2/pull/12239.patch (created by @vovayatsyuk) based on commit(s):
  1. 7f6b560
  • Loading branch information
magento-engcom-team authored Jan 24, 2018
2 parents 39ed21f + 90addb7 commit 9aa036d
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,12 @@ protected function createObject($type, $args)
protected function resolveArgument(&$argument, $paramType, $paramDefault, $paramName, $requestedType)
{
if ($paramType && $argument !== $paramDefault && !is_object($argument)) {
$argumentType = $argument['instance'];
if (!isset($argument['instance']) || $argument !== (array)$argument) {
throw new \UnexpectedValueException(
'Invalid parameter configuration provided for $' . $paramName . ' argument of ' . $requestedType
);
}
$argumentType = $argument['instance'];

if (isset($argument['shared'])) {
$isShared = $argument['shared'];
Expand Down

0 comments on commit 9aa036d

Please sign in to comment.