[Forwardport] [Correct code formatting]

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php

@@ -69,6 +69,7 @@ class Save extends Attribute
      * @var LayoutFactory
      */
     private $layoutFactory;
+
     /**
      * @var Presentation
      */
@@ -124,6 +125,7 @@ public function execute()
     {
         $data = $this->getRequest()->getPostValue();
         if ($data) {
+            $this->preprocessOptionsData($data);
             $setId = $this->getRequest()->getParam('set');
 
             $attributeSet = null;
@@ -313,6 +315,28 @@ public function execute()
         return $this->returnResult('catalog/*/', [], ['error' => true]);
     }
 
+    /**
+     * Extract options data from serialized options field and append to data array.
+     *
+     * This logic is required to overcome max_input_vars php limit
+     * that may vary and/or be inaccessible to change on different instances.
+     *
+     * @param array $data
+     * @return void
+     */
+    private function preprocessOptionsData(&$data)
+    {
+        if (isset($data['serialized_options'])) {
+            $serializedOptions = json_decode($data['serialized_options'], JSON_OBJECT_AS_ARRAY);
+            foreach ($serializedOptions as $serializedOption) {
+                $option = [];
+                parse_str($serializedOption, $option);
+                $data = array_replace_recursive($data, $option);
+            }
+        }
+        unset($data['serialized_options']);
+    }
+
     /**
      * @param string $path
      * @param array $params

app/code/Magento/Catalog/view/adminhtml/web/js/options.js

@@ -13,12 +13,16 @@ define([
     'jquery/ui',
     'prototype',
     'form',
-    'validation'
+    'validation',
+    'mage/translate'
 ], function (jQuery, mageTemplate, rg) {
     'use strict';
 
     return function (config) {
-        var attributeOption = {
+        var optionPanel = jQuery('#manage-options-panel'),
+            optionsValues = [],
+            editForm = jQuery('#edit_form'),
+            attributeOption = {
                 table: $('attribute-options-table'),
                 itemCount: 0,
                 totalItems: 0,
@@ -150,7 +154,7 @@ define([
             attributeOption.remove(event);
         });
 
-        jQuery('#manage-options-panel').on('render', function () {
+        optionPanel.on('render', function () {
             attributeOption.ignoreValidate();
 
             if (attributeOption.rendered) {
@@ -176,7 +180,31 @@ define([
                 });
             });
         }
+        editForm.on('submit', function () {
+            optionPanel.find('input')
+                .each(function () {
+                    if (this.disabled) {
+                        return;
+                    }
 
+                    if (this.type === 'checkbox' || this.type === 'radio') {
+                        if (this.checked) {
+                            optionsValues.push(this.name + '=' + jQuery(this).val());
+                        }
+                    } else {
+                        optionsValues.push(this.name + '=' + jQuery(this).val());
+                    }
+                });
+            jQuery('<input>')
+                .attr({
+                    type: 'hidden',
+                    name: 'serialized_options'
+                })
+                .val(JSON.stringify(optionsValues))
+                .prependTo(editForm);
+            optionPanel.find('table')
+                .replaceWith(jQuery('<div>').text(jQuery.mage.__('Sending attribute values as package.')));
+        });
         window.attributeOption = attributeOption;
         window.optionDefaultInputType = attributeOption.getOptionInputType();
 

app/code/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php

@@ -11,7 +11,7 @@
 use Magento\Swatches\Model\Swatch;
 
 /**
- * Class Save
+ * Plugin for product attribute save controller.
  */
 class Save
 {
@@ -24,7 +24,17 @@ class Save
     public function beforeDispatch(Attribute\Save $subject, RequestInterface $request)
     {
         $data = $request->getPostValue();
+
         if (isset($data['frontend_input'])) {
+            //Data is serialized to overcome issues caused by max_input_vars value if it's modification is unavailable.
+            //See subject controller code and comments for more info.
+            if (isset($data['serialized_swatch_values'])
+                && in_array($data['frontend_input'], ['swatch_visual', 'swatch_text'])
+            ) {
+                $data['serialized_options'] = $data['serialized_swatch_values'];
+                unset($data['serialized_swatch_values']);
+            }
+
             switch ($data['frontend_input']) {
                 case 'swatch_visual':
                     $data[Swatch::SWATCH_INPUT_TYPE_KEY] = Swatch::SWATCH_INPUT_TYPE_VISUAL;

app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js

@@ -414,6 +414,8 @@ define([
             };
 
         $(function () {
+            var editForm = $('#edit_form');
+
             $('#frontend_input').bind('change', function () {
                 swatchProductAttributes.bindAttributeInputType();
             });
@@ -427,6 +429,34 @@ define([
             $('.attribute-popup .collapse, [data-role="advanced_fieldset-content"]')
                 .collapsable()
                 .collapse('hide');
+
+            editForm.on('submit', function () {
+                var activePanel,
+                    swatchValues = [],
+                    swatchVisualPanel = $('#swatch-visual-options-panel'),
+                    swatchTextPanel = $('#swatch-text-options-panel');
+
+                activePanel = swatchTextPanel.is(':visible') ? swatchTextPanel : swatchVisualPanel;
+
+                activePanel
+                    .find('table input')
+                    .each(function () {
+                        swatchValues.push(this.name + '=' + $(this).val());
+                    });
+
+                $('<input>')
+                    .attr({
+                        type: 'hidden',
+                        name: 'serialized_swatch_values'
+                    })
+                    .val(JSON.stringify(swatchValues))
+                    .prependTo(editForm);
+
+                [swatchVisualPanel, swatchTextPanel].forEach(function (el) {
+                    $(el).find('table')
+                        .replaceWith($('<div>').text($.mage.__('Sending swatch values as package.')));
+                });
+            });
         });
 
         window.saveAttributeInNewSet = swatchProductAttributes.saveAttributeInNewSet;

app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_authentication.less

@@ -25,6 +25,7 @@
             padding: @block-auth__dropdown__padding;
         }
     }
+
     .authentication-wrapper {
         float: right;
         margin-top: -1.5*@indent__xl;

app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payment-options.less

@@ -198,6 +198,7 @@
         .payment-option-title {
             .lib-css(padding-left, @checkout-payment-option-content__padding__xl);
         }
+
         .payment-option-content {
             .payment-option-inner {
                 + .actions-toolbar {

app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_shipping.less

@@ -188,6 +188,7 @@
                     }
                 }
             }
+
             .row-error {
                 td {
                     border-top: none;
@@ -285,6 +286,7 @@
             .lib-css(max-width, @checkout-shipping-address__max-width);
         }
     }
+
     .table-checkout-shipping-method {
         width: auto;
     }
@@ -324,6 +326,7 @@
             }
         }
     }
+
     .table-checkout-shipping-method {
         min-width: 500px;
     }

app/design/frontend/Magento/blank/Magento_GiftRegistry/web/css/source/_module.less

@@ -15,6 +15,7 @@
         .actions-toolbar:not(:last-child) {
             margin-bottom: @indent__xl;
         }
+
         .fieldset {
             .nested {
                 .field:not(.choice) {

app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less

@@ -35,20 +35,24 @@
                     .shipping-item {
                         margin-left:84px;
                     }
+
                     .shipping-label {
                         font-weight: @font-weight__bold;
                         margin-right: @indent__s;
                     }
+
                     .shipping-address {
                         font-weight: @font-weight__regular;
                     }
+
                     .error-block {
                         color: @color-red10;
 
                         .error-label {
                             font-weight: @font-weight__bold;
                             margin-right: @indent__s;
                         }
+
                         .error-description {
                             font-weight: @font-weight__regular;
                         }
@@ -64,6 +68,7 @@
                         .order-id {
                             float:left;
                         }
+
                         .shipping-item {
                             margin-left:100px;
                         }

app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_shipping.less

@@ -296,6 +296,7 @@
             }
         }
     }
+
     .opc-wrapper {
         .form-login,
         .form-shipping-address {
@@ -307,6 +308,7 @@
             padding-bottom: @indent__base;
         }
     }
+
     .table-checkout-shipping-method {
         width: auto;
     }
@@ -346,6 +348,7 @@
             }
         }
     }
+
     .table-checkout-shipping-method {
         min-width: 500px;
     }

app/design/frontend/Magento/luma/Magento_InstantPurchase/web/css/source/_module.less

@@ -1,28 +1,28 @@
 & when (@media-common = true) {
-  .box-tocart {
-    .action.instant-purchase {
-      &:extend(.abs-button-l all);
-      &:extend(.abs-button-responsive all);
+    .box-tocart {
+        .action.instant-purchase {
+            &:extend(.abs-button-l all);
+            &:extend(.abs-button-responsive all);
 
-      &:not(:last-child) {
-        margin-bottom: 15px;
-      }
+            &:not(:last-child) {
+                margin-bottom: 15px;
+            }
 
-      vertical-align: top;
+            vertical-align: top;
+        }
     }
-  }
 }
 
 //
 //  Desktop
 //  _____________________________________________
 
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
-  .box-tocart {
-    .action.instant-purchase {
-      margin-bottom: 0;
-      margin-right: 1%;
-      width: 49%;
+    .box-tocart {
+        .action.instant-purchase {
+            margin-bottom: 0;
+            margin-right: 1%;
+            width: 49%;
+        }
     }
-  }
 }