Merge branch '1.2-develop' into 2.2-develop_12705

Author: vinayshah

COPYING.txt

@@ -1,4 +1,4 @@
-Copyright © 2013-2017 Magento, Inc.
+Copyright © 2013-2018 Magento, Inc.
 
 Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
 

app/code/Magento/Checkout/view/frontend/web/js/model/shipping-save-processor/payload-extender.js

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 define(function () {

app/code/Magento/Customer/view/frontend/web/js/invalidation-processor.js

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 define([

app/code/Magento/Customer/view/frontend/web/js/invalidation-rules/website-rule.js

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 define([

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

@@ -5,6 +5,7 @@
  */
 namespace Magento\Quote\Setup;
 
+use Magento\Framework\DB\Ddl\Table;
 use Magento\Framework\Setup\UpgradeSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
@@ -40,7 +41,7 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
                 'street',
                 'street',
                 [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+                    'type' => Table::TYPE_TEXT,
                     'length' => 255,
                     'comment' => 'Street'
                 ]
@@ -61,7 +62,7 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
                 $setup->getTable('quote_address', self::$connectionName),
                 'shipping_method',
                 [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+                    'type' => Table::TYPE_TEXT,
                     'length' => 120
                 ]
             );
@@ -72,33 +73,53 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
                 $setup->getTable('quote_address', self::$connectionName),
                 'firstname',
                 [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+                    'type' => Table::TYPE_TEXT,
                     'length' => 255,
                 ]
             )->modifyColumn(
                 $setup->getTable('quote_address', self::$connectionName),
                 'middlename',
                 [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+                    'type' => Table::TYPE_TEXT,
                     'length' => 40,
                 ]
             )->modifyColumn(
                 $setup->getTable('quote_address', self::$connectionName),
                 'lastname',
                 [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+                    'type' => Table::TYPE_TEXT,
                     'length' => 255,
                 ]
             )->modifyColumn(
                 $setup->getTable('quote', self::$connectionName),
                 'updated_at',
                 [
-                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+                    'type' => Table::TYPE_TIMESTAMP,
                     'nullable' => false,
-                    'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE,
+                    'default' => Table::TIMESTAMP_INIT_UPDATE,
                 ]
             );
         }
+        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]
+            );
+        }
         $setup->endSetup();
     }
 }

app/code/Magento/Quote/etc/module.xml

@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Quote" setup_version="2.0.6">
+    <module name="Magento_Quote" setup_version="2.0.7">
     </module>
 </config>

app/code/Magento/Theme/Block/Html/Topmenu.php

@@ -235,7 +235,13 @@ protected function _getHtml(
 
             if ($childLevel == 0 && $outermostClass) {
                 $outermostClassCode = ' class="' . $outermostClass . '" ';
-                $child->setClass($outermostClass);
+                $currentClass = $child->getClass();
+
+                if (empty($currentClass)) {
+                    $child->setClass($outermostClass);
+                } else {
+                    $child->setClass($currentClass . ' ' . $outermostClass);
+                }
             }
 
             if (count($colBrakes) && $colBrakes[$counter]['colbrake']) {

app/code/Magento/Theme/etc/config.xml

@@ -45,7 +45,7 @@ Disallow: /*SID=
                 <welcome>Default welcome msg!</welcome>
             </header>
             <footer translate="copyright">
-                <copyright>Copyright &#169; 2013-2017 Magento, Inc. All rights reserved.</copyright>
+                <copyright>Copyright &#169; 2013-2018 Magento, Inc. All rights reserved.</copyright>
             </footer>
         </design>
         <theme>

app/code/Magento/Theme/i18n/en_US.csv

@@ -142,7 +142,7 @@ Empty,Empty
 "1 column","1 column"
 Configuration,Configuration
 "Default welcome msg!","Default welcome msg!"
-"Copyright © 2013-2017 Magento, Inc. All rights reserved.","Copyright © 2013-2017 Magento, Inc. All rights reserved."
+"Copyright © 2013-2018 Magento, Inc. All rights reserved.","Copyright © 2013-2018 Magento, Inc. All rights reserved."
 "Design Config Grid","Design Config Grid"
 "Rebuild design config grid index","Rebuild design config grid index"
 "Admin empty","Admin empty"

dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php

@@ -67,7 +67,7 @@ private function getRequestParams()
             'header_logo_height' => '',
             'header_logo_alt' => '',
             'header_welcome' => 'Default welcome msg!',
-            'footer_copyright' => 'Copyright © 2013-2017 Magento, Inc. All rights reserved.',
+            'footer_copyright' => 'Copyright © 2013-2018 Magento, Inc. All rights reserved.',
             'footer_absolute_footer' => '',
             'default_robots' => 'INDEX,FOLLOW',
             'custom_instructions' => '',