Merge pull request #1720 from magento-engcom/2.2-develop-prs

ishakhsuvarov · web-flow · commit e18f1d2d8065 · 2017-11-15T10:49:12.000+02:00
[EngCom] Public Pull Requests - 2.2-develop
 - MAGETWO-83815: Fixed php notice when invalid ui_component config is used #12239
diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
@@ -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'];

Original file line number	Diff line number	Diff line change
`@@ -127,12 +127,12 @@ protected function createObject($type, $args)`
`127`	`127`	`protected function resolveArgument(&$argument, $paramType, $paramDefault, $paramName, $requestedType)`
`128`	`128`	`{`
`129`	`129`	`if ($paramType && $argument !== $paramDefault && !is_object($argument)) {`
`130`		`- $argumentType = $argument['instance'];`
`131`	`130`	`if (!isset($argument['instance']) \|\| $argument !== (array)$argument) {`
`132`	`131`	`throw new \UnexpectedValueException(`
`133`	`132`	`'Invalid parameter configuration provided for $' . $paramName . ' argument of ' . $requestedType`
`134`	`133`	`);`
`135`	`134`	`}`
	`135`	`+ $argumentType = $argument['instance'];`
`136`	`136`
`137`	`137`	`if (isset($argument['shared'])) {`
`138`	`138`	`$isShared = $argument['shared'];`