Merge remote-tracking branch 'tango/MC-33898' into Chaika-PR-2020-05-12

Author: veloraven

lib/internal/Magento/Framework/Code/Reader/ClassReader.php

@@ -7,8 +7,6 @@
 
 /**
  * Class ClassReader
- *
- * @package Magento\Framework\Code\Reader
  */
 class ClassReader implements ClassReaderInterface
 {
@@ -39,7 +37,11 @@ public function getConstructor($className)
                         $parameter->isVariadic(),
                     ];
                 } catch (\ReflectionException $e) {
-                    $message = $e->getMessage();
+                    $message = sprintf(
+                        'Impossible to process constructor argument %s of %s class',
+                        $parameter->__toString(),
+                        $className
+                    );
                     throw new \ReflectionException($message, 0, $e);
                 }
             }

lib/internal/Magento/Framework/Code/Test/Unit/Reader/ClassReaderTest.php

@@ -60,6 +60,27 @@ public function testGetParents()
         );
     }
 
+    /**
+     * Check that while processing nonexistent argument of constructor exception message contains original class name
+     */
+    public function testGetConstructorWithNonexistentDependency()
+    {
+        $testClass = new class {
+            private $arg;
+
+            // phpstan:ignore
+            public function __construct(?\NonexistentDependency $arg = null)
+            {
+                $this->arg = $arg;
+            }
+        };
+
+        $className = get_class($testClass);
+        $this->expectException(\ReflectionException::class);
+        $this->expectExceptionMessage($className);
+        $this->model->getConstructor($className);
+    }
+
     /**
      * Data provider
      *