Merge remote-tracking branch 'perf-ce/MCP-797' into MCP-792

Author: aa-kashk

setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php

@@ -62,7 +62,7 @@ private function findMissingFactories($file, $classReflection, $methodName, $ent
         $parameters = $constructor->getParameters();
         /** @var $parameter \ReflectionParameter */
         foreach ($parameters as $parameter) {
-            preg_match('/\[\s\<\w+?>\s([\w\\\\]+)/s', $parameter->__toString(), $matches);
+            preg_match('/\[\s\<\w+?>\s\??([\w\\\\]+)/s', $parameter->__toString(), $matches);
             if (isset($matches[1]) && substr($matches[1], -strlen($entityType)) == $entityType) {
                 $missingClassName = $matches[1];
                 if ($this->shouldGenerateClass($missingClassName, $entityType, $file)) {