Merge branch '2.3-develop' into 2.3-develop-pr19

Author: serhii-balko

dev/tests/static/framework/Magento/TestFramework/Dependency/DeclarativeSchemaRule.php

@@ -7,11 +7,13 @@
  */
 namespace Magento\TestFramework\Dependency;
 
-use DOMDocument;
-use DOMXPath;
+use Magento\Framework\App\Utility\Classes;
 use Magento\Framework\App\Utility\Files;
 use Magento\TestFramework\Dependency\VirtualType\VirtualTypeMapper;
 
+/**
+ * Class provide dependency rule for di.xml config files.
+ */
 class DiRule implements RuleInterface
 {
     /**
@@ -33,6 +35,8 @@ public function __construct(VirtualTypeMapper $mapper)
     }
 
     /**
+     * Get class name pattern.
+     *
      * @return string
      * @throws \Exception
      */
@@ -73,6 +77,7 @@ private function getPattern()
      */
     public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
     {
+        //phpcs:ignore Magento2.Functions.DiscouragedFunction
         if (pathinfo($file, PATHINFO_BASENAME) !== 'di.xml') {
             return [];
         }
@@ -99,12 +104,14 @@ public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
     }
 
     /**
+     * Fetch all possible dependencies.
+     *
      * @param string $contents
      * @return array
      */
     private function fetchPossibleDependencies($contents)
     {
-        $doc = new DOMDocument();
+        $doc = new \DOMDocument();
         $doc->loadXML($contents);
         return [
             RuleInterface::TYPE_SOFT => $this->getSoftDependencies($doc),
@@ -113,16 +120,22 @@ private function fetchPossibleDependencies($contents)
     }
 
     /**
-     * @param DOMDocument $doc
+     * Collect soft dependencies.
+     *
+     * @param \DOMDocument $doc
      * @return array
      */
-    private function getSoftDependencies(DOMDocument $doc)
+    private function getSoftDependencies(\DOMDocument $doc)
     {
         $result = [];
         foreach (self::$tagNameMap as $tagName => $attributeNames) {
             $nodes = $doc->getElementsByTagName($tagName);
         /** @var \DOMElement $node */
             foreach ($nodes as $node) {
+                if ($tagName === 'virtualType' && !$node->getAttribute('type')) {
+                    $result[] = Classes::resolveVirtualType($node->getAttribute('name'));
+                    continue;
+                }
                 foreach ($attributeNames as $attributeName) {
                     $result[] = $node->getAttribute($attributeName);
                 }
@@ -133,13 +146,15 @@ private function getSoftDependencies(DOMDocument $doc)
     }
 
     /**
-     * @param DOMDocument $doc
+     * Collect hard dependencies.
+     *
+     * @param \DOMDocument $doc
      * @return array
      */
-    private function getHardDependencies(DOMDocument $doc)
+    private function getHardDependencies(\DOMDocument $doc)
     {
         $result = [];
-        $xpath = new DOMXPath($doc);
+        $xpath = new \DOMXPath($doc);
         $textNodes = $xpath->query('//*[@xsi:type="object"]');
         /** @var \DOMElement $node */
         foreach ($textNodes as $node) {