MAGETWO-83202: code refactoring, separate into different methods #10395

Signed-off-by: George Schiopu <[email protected]>

Author: George Schiopu

app/code/Magento/Quote/Setup/UpgradeSchema.php

@@ -26,15 +26,13 @@ class UpgradeSchema implements UpgradeSchemaInterface
     public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
         $setup->startSetup();
-
         if (version_compare($context->getVersion(), '2.0.1', '<')) {
             $setup->getConnection(self::$connectionName)->addIndex(
                 $setup->getTable('quote_id_mask', self::$connectionName),
                 $setup->getIdxName('quote_id_mask', ['masked_id'], '', self::$connectionName),
                 ['masked_id']
             );
         }
-
         if (version_compare($context->getVersion(), '2.0.2', '<')) {
             $setup->getConnection(self::$connectionName)->changeColumn(
                 $setup->getTable('quote_address', self::$connectionName),
@@ -101,34 +99,51 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
             );
         }
         if (version_compare($context->getVersion(), '2.0.7', '<')) {
-            $connection = $setup->getConnection(self::$connectionName);
-            $connection->modifyColumn(
-                $setup->getTable('quote_address', self::$connectionName),
-                'telephone',
-                ['type' => Table::TYPE_TEXT, 'length' => 255]
-            )->modifyColumn(
-                $setup->getTable('quote_address', self::$connectionName),
-                'fax',
-                ['type' => Table::TYPE_TEXT, 'length' => 255]
-            )->modifyColumn(
-                $setup->getTable('quote_address', self::$connectionName),
-                'region',
-                ['type' => Table::TYPE_TEXT, 'length' => 255]
-            )->modifyColumn(
-                $setup->getTable('quote_address', self::$connectionName),
-                'city',
-                ['type' => Table::TYPE_TEXT, 'length' => 255]
-            );
+            $this->expandQuoteAddressFields($setup);
         }
         if (version_compare($context->getVersion(), '2.0.8', '<')) {
-            $connection = $setup->getConnection(self::$connectionName);
-            $connection->modifyColumn(
-                $setup->getTable('quote', self::$connectionName),
-                'remote_ip',
-                ['type' => Table::TYPE_TEXT, 'length' => 45]
-            );
+            $this->expandRemoteIpField($setup);
         }
-
         $setup->endSetup();
     }
+
+    /**
+     * @param SchemaSetupInterface $setup
+     * @return void
+     */
+    private function expandRemoteIpField(SchemaSetupInterface $setup)
+    {
+        $connection = $setup->getConnection(self::$connectionName);
+        $connection->modifyColumn(
+            $setup->getTable('quote', self::$connectionName),
+            'remote_ip',
+            ['type' => Table::TYPE_TEXT, 'length' => 45]
+        );
+    }
+
+    /**
+     * @param SchemaSetupInterface $setup
+     * @return void
+     */
+    private function expandQuoteAddressFields(SchemaSetupInterface $setup)
+    {
+        $connection = $setup->getConnection(self::$connectionName);
+        $connection->modifyColumn(
+            $setup->getTable('quote_address', self::$connectionName),
+            'telephone',
+            ['type' => Table::TYPE_TEXT, 'length' => 255]
+        )->modifyColumn(
+            $setup->getTable('quote_address', self::$connectionName),
+            'fax',
+            ['type' => Table::TYPE_TEXT, 'length' => 255]
+        )->modifyColumn(
+            $setup->getTable('quote_address', self::$connectionName),
+            'region',
+            ['type' => Table::TYPE_TEXT, 'length' => 255]
+        )->modifyColumn(
+            $setup->getTable('quote_address', self::$connectionName),
+            'city',
+            ['type' => Table::TYPE_TEXT, 'length' => 255]
+        );
+    }
 }

app/code/Magento/Sales/Setup/UpgradeSchema.php

@@ -107,15 +107,7 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
             );
         }
         if (version_compare($context->getVersion(), '2.0.10', '<')) {
-            $connection = $installer->getConnection(self::$connectionName);
-            $connection->modifyColumn(
-                $installer->getTable('sales_order', self::$connectionName),
-                'remote_ip',
-                [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-                    'length' => 45
-                ]
-            );
+            $this->expandRemoteIpField($installer);
         }
     }
 
@@ -152,4 +144,21 @@ private function addIndexBaseGrandTotal(SchemaSetupInterface $installer)
             ['base_grand_total']
         );
     }
+
+    /**
+     * @param SchemaSetupInterface $installer
+     * @return void
+     */
+    private function expandRemoteIpField(SchemaSetupInterface $installer)
+    {
+        $connection = $installer->getConnection(self::$connectionName);
+        $connection->modifyColumn(
+            $installer->getTable('sales_order', self::$connectionName),
+            'remote_ip',
+            [
+                'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+                'length' => 45
+            ]
+        );
+    }
 }