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

[EngCom] Public Pull Requests - 2.2-develop - MAGETWO-83815: Fixed php notice when invalid ui_component config is used #12239
magento · Nov 15, 2017 · e18f1d2 · e18f1d2
2 parents 22f54a4 + dc31103
commit e18f1d2
Showing 1 changed file with 1 addition and 1 deletion.
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'];