MAGETWO-87551: Convert existing data install/upgrade scripts

--create generate command for patches

Author: Sergii Kovalenko

app/code/Magento/Customer/Setup/Patch/Data/DefaultCustomerGroupsAndAttributes.php

@@ -57,7 +57,7 @@ public function __construct(
     public function apply()
     {
         /** @var CustomerSetup $customerSetup */
-        $customerSetup = $this->customerSetupFactory->create(['resourceConnection' => $this->resourceConnection]);
+        $customerSetup = $this->customerSetupFactory->create(['setup' => $this->moduleDataSetup]);
 
         // insert default customer groups
         $this->resourceConnection->getConnection()->insertForce(

app/code/Magento/Customer/Setup/Patch/Data/MigrateStoresAllowedCountriesToWebsite.php

@@ -7,6 +7,7 @@
 namespace Magento\Customer\Setup\Patch\Data;
 
 use Magento\Directory\Model\AllowedCountries;
+use Magento\Directory\Model\AllowedCountriesFactory;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\App\ResourceConnection;
@@ -34,12 +35,12 @@ class MigrateStoresAllowedCountriesToWebsite implements DataPatchInterface, Patc
      * MigrateStoresAllowedCountriesToWebsite constructor.
      * @param ResourceConnection $resourceConnection
      * @param StoreManagerInterface $storeManager
-     * @param AllowedCountriesFactory $allowedCountries
+     * @param AllowedCountries $allowedCountries
      */
     public function __construct(
         ResourceConnection $resourceConnection,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Directory\Model\AllowedCountriesFactory $allowedCountries
+        \Magento\Directory\Model\AllowedCountries $allowedCountries
     ) {
         $this->resourceConnection = $resourceConnection;
         $this->storeManager = $storeManager;

app/code/Magento/Eav/Setup/EavSetup.php

@@ -578,7 +578,7 @@ public function addAttributeGroup($entityTypeId, $setId, $name, $sortOrder = nul
                 $data['attribute_group_code'] = $attributeGroupCode;
             }
             $this->resourceConnection->getConnection()->insert(
-                $this->resourceConnection->getTable('eav_attribute_group'),
+                $this->resourceConnection->getTableName('eav_attribute_group'),
                 $data
             );
         }

setup/src/Magento/Setup/Model/Installer.php

@@ -906,7 +906,10 @@ private function handleDBSchemaData($setup, $type)
         if ($type === 'schema') {
             $patchApplier = $this->patchApplierFactory->create(['schemaSetup' => $setup]);
         } elseif ($type === 'data') {
-            $patchApplier = $this->patchApplierFactory->create(['moduleDataSetup' => $setup]);
+            $patchApplier = $this->patchApplierFactory->create([
+                'moduleDataSetup' => $setup,
+                'objectManager' => $this->objectManagerProvider->get()
+            ]);
         }
 
         foreach ($moduleNames as $moduleName) {
@@ -922,6 +925,11 @@ private function handleDBSchemaData($setup, $type)
                     if ($upgrader) {
                         $this->log->logInline("Upgrading $type.. ");
                         $upgrader->upgrade($setup, $moduleContextList[$moduleName]);
+                        if ($type === 'schema') {
+                            $resource->setDbVersion($moduleName, $configVer);
+                        } elseif ($type === 'data') {
+                            $resource->setDataVersion($moduleName, $configVer);
+                        }
                     }
                 }
             } elseif ($configVer) {
@@ -935,7 +943,16 @@ private function handleDBSchemaData($setup, $type)
                     $this->log->logInline("Upgrading $type... ");
                     $upgrader->upgrade($setup, $moduleContextList[$moduleName]);
                 }
+
+                if ($installer || $upgrader) {
+                    if ($type === 'schema') {
+                        $resource->setDbVersion($moduleName, $configVer);
+                    } elseif ($type === 'data') {
+                        $resource->setDataVersion($moduleName, $configVer);
+                    }
+                }
             }
+
             /**
              * Applying data patches after old upgrade data scripts
              */
@@ -945,12 +962,6 @@ private function handleDBSchemaData($setup, $type)
                 $patchApplier->applyDataPatch($moduleName);
             }
 
-            if ($type === 'schema') {
-                $resource->setDbVersion($moduleName, $configVer);
-            } elseif ($type === 'data') {
-                $resource->setDataVersion($moduleName, $configVer);
-            }
-
             $this->logProgress();
         }
 

setup/src/Magento/Setup/Model/Patch/PatchApplier.php

@@ -8,6 +8,7 @@
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Module\ModuleResource;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
 use Magento\Setup\Exception;
@@ -62,6 +63,11 @@ class PatchApplier
      */
     private $moduleDataSetup;
 
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
     /**
      * PatchApplier constructor.
      * @param PatchReader $dataPatchReader
@@ -71,6 +77,7 @@ class PatchApplier
      * @param ModuleResource $moduleResource
      * @param PatchHistory $patchHistory
      * @param PatchFactory $patchFactory
+     * @param ObjectManagerInterface $objectManager
      * @param \Magento\Framework\Setup\SchemaSetupInterface $schemaSetup
      * @param ModuleDataSetupInterface $moduleDataSetup
      */
@@ -82,6 +89,7 @@ public function __construct(
         ModuleResource $moduleResource,
         PatchHistory $patchHistory,
         PatchFactory $patchFactory,
+        ObjectManagerInterface $objectManager,
         \Magento\Framework\Setup\SchemaSetupInterface $schemaSetup = null,
         \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup = null
     ) {
@@ -94,6 +102,7 @@ public function __construct(
         $this->patchFactory = $patchFactory;
         $this->schemaSetup = $schemaSetup;
         $this->moduleDataSetup = $moduleDataSetup;
+        $this->objectManager = $objectManager;
     }
 
     /**
@@ -121,9 +130,6 @@ public function applyDataPatch($moduleName = null)
         $dataPatches = $this->dataPatchReader->read($moduleName);
         $registry = $this->prepareRegistry($dataPatches);
         $adapter = $this->resourceConnection->getConnection();
-        /**
-         * @var DataPatchInterface $dataPatch
-         */
         foreach ($registry as $dataPatch) {
 
             /**
@@ -135,7 +141,7 @@ public function applyDataPatch($moduleName = null)
 
             try {
                 $adapter->beginTransaction();
-                $dataPatch = $this->patchFactory->create($dataPatch, ['moduleDataSetup' => $this->moduleDataSetup]);
+                $dataPatch = $this->objectManager->create('\\' . $dataPatch, ['moduleDataSetup' => $this->moduleDataSetup]);
                 if (!$dataPatch instanceof DataPatchInterface) {
                     throw new Exception(
                         sprintf("Patch %s should implement DataPatchInterface", $dataPatch)