Merge pull request #2159 from magento-trigger/MAGETWO-88054

- MAGETWO-88054 Move declarative setup from setup to framework
- MAGETWO-88507 Allow Magento to generate factories from di.xml

Author: Sergii Kovalenko

app/code/Magento/Bundle/etc/db_schema.xml

@@ -45,10 +45,6 @@
         <constraint xsi:type="foreign" name="CAT_PRD_BNDL_OPT_VAL_OPT_ID_CAT_PRD_BNDL_OPT_OPT_ID"
                     table="catalog_product_bundle_option_value" column="option_id"
                     referenceTable="catalog_product_bundle_option" referenceColumn="option_id" onDelete="CASCADE"/>
-        <constraint xsi:type="unique" name="CATALOG_PRODUCT_BUNDLE_OPTION_VALUE_OPTION_ID_STORE_ID">
-            <column name="option_id"/>
-            <column name="store_id"/>
-        </constraint>
         <constraint xsi:type="unique" name="CAT_PRD_BNDL_OPT_VAL_OPT_ID_PARENT_PRD_ID_STORE_ID">
             <column name="option_id"/>
             <column name="parent_product_id"/>

lib/internal/Magento/Framework/Module/Dir/Reader.php

@@ -105,11 +105,11 @@ public function getComposerJsonFiles()
      */
     private function getFilesIterator($filename, $subDir = '')
     {
-        #if (!isset($this->fileIterators[$subDir][$filename])) {
+        if (!isset($this->fileIterators[$subDir][$filename])) {
             $this->fileIterators[$subDir][$filename] = $this->fileIteratorFactory->create(
                 $this->getFiles($filename, $subDir)
             );
-        #}
+        }
         return $this->fileIterators[$subDir][$filename];
     }
 

lib/internal/Magento/Framework/Setup/Patch/PatchApplier.php

@@ -10,8 +10,8 @@
 use Magento\Framework\Module\ModuleResource;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Phrase;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Exception;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
 
 /**
  * Apply patches per specific module

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

@@ -30,13 +30,21 @@ public function __construct(\Magento\Setup\Module\Di\Compiler\Log\Log $log)
      */
     public function collectEntities(array $files)
     {
+        $virtualTypes = [];
         $output = [];
+        $factoriesOutput = [];
         foreach ($files as $file) {
             $dom = new \DOMDocument();
             $dom->load($file);
             $xpath = new \DOMXPath($dom);
             $xpath->registerNamespace("php", "http://php.net/xpath");
             $xpath->registerPhpFunctions('preg_match');
+            $virtualTypeQuery = "//virtualType/@name";
+
+            foreach ($xpath->query($virtualTypeQuery) as $virtualNode) {
+                $virtualTypes[] = $virtualNode->nodeValue;
+            }
+
             $regex = '/^(.*)\\\(.*)Proxy$/';
             $query = "/config/preference[ php:functionString('preg_match', '{$regex}', @type) > 0]/@type | " .
                 "//argument[@xsi:type='object' and php:functionString('preg_match', '{$regex}', text()) > 0] |" .
@@ -46,9 +54,33 @@ public function collectEntities(array $files)
             foreach ($xpath->query($query) as $node) {
                 $output[] = $node->nodeValue;
             }
+
+            $factoriesOutput = array_merge($factoriesOutput, $this->scanFactories($xpath));
         }
+
         $output = array_unique($output);
-        return $this->_filterEntities($output);
+        $factoriesOutput = array_unique($factoriesOutput);
+        $factoriesOutput = array_diff($factoriesOutput, $virtualTypes);
+        return array_merge($this->_filterEntities($output), $factoriesOutput);
+    }
+
+    /**
+     * Scan factories from all di.xml and retrieve non virtual one
+     *
+     * @param \DOMXPath $domXpath
+     * @return array
+     */
+    private function scanFactories(\DOMXPath $domXpath)
+    {
+        $output = [];
+        $regex = '/^(.*)Factory$/';
+        $query = "//argument[@xsi:type='object' and php:functionString('preg_match', '{$regex}', text()) > 0] |" .
+            "//item[@xsi:type='object' and php:functionString('preg_match', '{$regex}', text()) > 0]";
+        foreach ($domXpath->query($query) as $node) {
+            $output[] = $node->nodeValue;
+        }
+
+        return $output;
     }
 
     /**