#15895: Handle type errors for objects creation

 - Updated test

Author: ishakhsuvarov

dev/tests/integration/testsuite/Magento/Framework/ObjectManager/ObjectManagerTest.php

@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\ObjectManager;
 
-use TypeError;
-
 class ObjectManagerTest extends \PHPUnit\Framework\TestCase
 {
     /**#@+
@@ -147,13 +145,15 @@ public function testNewInstance($actualClassName, array $properties = [], $expec
     }
 
     /**
-     * Test create instance with TypeError
+     * Test creating an object and passing incorrect type of arguments to the constructor.
      *
-     * @expectedException TypeError
+     * @expectedException \Magento\Framework\Exception\RuntimeException
+     * @expectedExceptionMessage Error occurred when creating object
      */
     public function testNewInstanceWithTypeError()
     {
-        self::$_objectManager->create(self::TEST_CLASS_WITH_TYPE_ERROR);
-        $this->fail('No instance for class with TypeError should be created');
+        self::$_objectManager->create(self::TEST_CLASS_WITH_TYPE_ERROR, [
+            'testArgument' => new \stdClass()
+        ]);
     }
 }

dev/tests/integration/testsuite/Magento/Framework/ObjectManager/TestAsset/ConstructorWithTypeError.php

@@ -6,11 +6,21 @@
 
 namespace Magento\Framework\ObjectManager\TestAsset;
 
+/**
+ * Test asset used to test invalid argument types on the constructor invocation.
+ */
 class ConstructorWithTypeError
 {
-    public function __construct()
+    /**
+     * @var Basic
+     */
+    private $testArgument;
+
+    /**
+     * @param Basic $testArgument
+     */
+    public function __construct(Basic $testArgument)
     {
-        // set non-exists property to trigger TypeError
-        throw new \TypeError('test error');
+        $this->testArgument = $testArgument;
     }
 }

lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php

@@ -114,15 +114,15 @@ protected function createObject($type, $args)
     {
         try {
             return new $type(...array_values($args));
-        } catch (\TypeError $e) {
+        } catch (\TypeError $exception) {
             /** @var LoggerInterface $logger */
             $logger = ObjectManager::getInstance()->get(LoggerInterface::class);
             $logger->critical(
-                sprintf('Create object error: %s, %s', $type, $e->getMessage())
+                sprintf('Type Error occurred when creating object: %s, %s', $type, $exception->getMessage())
             );
 
             throw new RuntimeException(
-                new Phrase('Create object error: '.$e->getMessage())
+                new Phrase('Type Error occurred when creating object: %type', ['type' => $type])
             );
         }
     }