Merge branch 'MAGETWO-67283' into 2.2-develop-pr8

Author: nmalevanec

app/code/Magento/OfflineShipping/Setup/UpgradeData.php

@@ -18,12 +18,12 @@ class UpgradeData implements UpgradeDataInterface
     /**
      * @var string
      */
-    private static $quoteConnectionName = 'checkout';
+    private $quoteConnectionName = 'checkout';
 
     /**
      * @var string
      */
-    private static $salesConnectionName = 'sales';
+    private $salesConnectionName = 'sales';
 
     /**
      * {@inheritdoc}
@@ -50,17 +50,17 @@ private function updateQuoteShippingAddresses(ModuleDataSetupInterface $setup)
             ['simple_free_shipping' => 0],
             [new \Zend_Db_Expr('simple_free_shipping IS NULL')]
         );
-        $setup->getConnection(self::$salesConnectionName)->update(
+        $setup->getConnection($this->salesConnectionName)->update(
             $setup->getTable('sales_order_item'),
             ['free_shipping' => 0],
             [new \Zend_Db_Expr('free_shipping IS NULL')]
         );
-        $setup->getConnection(self::$quoteConnectionName)->update(
+        $setup->getConnection($this->quoteConnectionName)->update(
             $setup->getTable('quote_address'),
             ['free_shipping' => 0],
             [new \Zend_Db_Expr('free_shipping IS NULL')]
         );
-        $setup->getConnection(self::$quoteConnectionName)->update(
+        $setup->getConnection($this->quoteConnectionName)->update(
             $setup->getTable('quote_item'),
             ['free_shipping' => 0],
             [new \Zend_Db_Expr('free_shipping IS NULL')]

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

@@ -18,12 +18,12 @@ class UpgradeSchema implements UpgradeSchemaInterface
     /**
      * @var string
      */
-    private static $quoteConnectionName = 'checkout';
+    private $quoteConnectionName = 'checkout';
 
     /**
      * @var string
      */
-    private static $salesConnectionName = 'sales';
+    private $salesConnectionName = 'sales';
 
     /**
      * @inheritdoc
@@ -58,8 +58,8 @@ private function updateFreeShippingColumns(SchemaSetupInterface $setup)
                 'comment' => 'Simple Free Shipping',
             ]
         );
-        $setup->getConnection(self::$salesConnectionName)->modifyColumn(
-            $setup->getTable('sales_order_item', self::$salesConnectionName),
+        $setup->getConnection($this->salesConnectionName)->modifyColumn(
+            $setup->getTable('sales_order_item', $this->salesConnectionName),
             'free_shipping',
             [
                 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
@@ -69,8 +69,8 @@ private function updateFreeShippingColumns(SchemaSetupInterface $setup)
                 'comment' => 'Free Shipping',
             ]
         );
-        $setup->getConnection(self::$quoteConnectionName)->modifyColumn(
-            $setup->getTable('quote_address', self::$quoteConnectionName),
+        $setup->getConnection($this->quoteConnectionName)->modifyColumn(
+            $setup->getTable('quote_address', $this->quoteConnectionName),
             'free_shipping',
             [
                 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
@@ -80,8 +80,8 @@ private function updateFreeShippingColumns(SchemaSetupInterface $setup)
                 'comment' => 'Free Shipping',
             ]
         );
-        $setup->getConnection(self::$quoteConnectionName)->modifyColumn(
-            $setup->getTable('quote_item', self::$quoteConnectionName),
+        $setup->getConnection($this->quoteConnectionName)->modifyColumn(
+            $setup->getTable('quote_item', $this->quoteConnectionName),
             'free_shipping',
             [
                 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
@@ -91,8 +91,8 @@ private function updateFreeShippingColumns(SchemaSetupInterface $setup)
                 'comment' => 'Free Shipping',
             ]
         );
-        $setup->getConnection(self::$quoteConnectionName)->modifyColumn(
-            $setup->getTable('quote_address_item', self::$quoteConnectionName),
+        $setup->getConnection($this->quoteConnectionName)->modifyColumn(
+            $setup->getTable('quote_address_item', $this->quoteConnectionName),
             'free_shipping',
             [
                 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,