MAGETWO-91570: [2.2.x] - [Github]Can not save attribute #5907

- builds stabilization

Author: rganin

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

@@ -181,8 +181,8 @@ define([
             });
         }
         editForm.on('submit', function () {
-                optionPanel.find('input')
-                .each(function() {
+            optionPanel.find('input')
+                .each(function () {
                     optionsValues.push(this.name + '=' + jQuery(this).val());
                 });
             jQuery('<input>')

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

@@ -415,6 +415,7 @@ define([
 
         $(function () {
             var editForm = $('#edit_form');
+
             $('#frontend_input').bind('change', function () {
                 swatchProductAttributes.bindAttributeInputType();
             });
@@ -435,11 +436,11 @@ define([
                     swatchVisualPanel = $('#swatch-visual-options-panel'),
                     swatchTextPanel = $('#swatch-text-options-panel');
 
-                activePanel = swatchTextPanel.is(":visible") ? swatchTextPanel : swatchVisualPanel;
+                activePanel = swatchTextPanel.is(':visible') ? swatchTextPanel : swatchVisualPanel;
 
                 activePanel
                     .find('table input')
-                    .each(function() {
+                    .each(function () {
                         swatchValues.push(this.name + '=' + $(this).val());
                     });
 
@@ -451,7 +452,7 @@ define([
                     .val(JSON.stringify(swatchValues))
                     .prependTo(editForm);
 
-                [swatchVisualPanel, swatchTextPanel].forEach(function(el) {
+                [swatchVisualPanel, swatchTextPanel].forEach(function (el) {
                     $(el).find('table')
                         .replaceWith($('<div>').text($.mage.__('Sending swatch values as package.')));
                 });

dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Swatches\Controller\Adminhtml\Product;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -20,7 +22,7 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
      *
      * @return string
      */
-    private function getRandomColor()
+    private function getRandomColor() : string
     {
         return '#' . str_pad(dechex(mt_rand(0, 0xFFFFFF)), 6, '0', STR_PAD_LEFT);
     }
@@ -31,7 +33,7 @@ private function getRandomColor()
      * @param int $optionsCount
      * @return array
      */
-    private function getSwatchVisualDataSet($optionsCount)
+    private function getSwatchVisualDataSet(int $optionsCount) : array
     {
         $optionsData = [];
         $expectedOptionsLabels = [];
@@ -69,7 +71,7 @@ private function getSwatchVisualDataSet($optionsCount)
      * @param int $optionsCount
      * @return array
      */
-    private function getSwatchTextDataSet($optionsCount)
+    private function getSwatchTextDataSet(int $optionsCount) : array
     {
         $optionsData = [];
         $expectedOptionsLabels = [];
@@ -106,7 +108,7 @@ private function getSwatchTextDataSet($optionsCount)
      *
      * @return array
      */
-    private function getAttributePreset()
+    private function getAttributePreset() : array
     {
         return [
             'serialized_options' => '[]',
@@ -147,7 +149,7 @@ private function getAttributePreset()
      *
      * @return array
      */
-    public function getLargeSwatchesAmountAttributeData()
+    public function getLargeSwatchesAmountAttributeData() : array
     {
         $maxInputVars = ini_get('max_input_vars');
         // Each option is at least 7 variables array for a visual swatch.
@@ -168,8 +170,11 @@ public function getLargeSwatchesAmountAttributeData()
      * @param array $expectedLabels
      * @return void
      */
-    public function testLargeOptionsDataSet($attributeData, $expectedOptionsCount, $expectedLabels)
-    {
+    public function testLargeOptionsDataSet(
+        array $attributeData,
+        int $expectedOptionsCount,
+        array $expectedLabels
+    ) {
         $this->getRequest()->setPostValue($attributeData);
         $this->dispatch('backend/catalog/product_attribute/save');
         $entityTypeId = $this->_objectManager->create(

dev/tests/static/testsuite/Magento/Test/Integrity/HhvmCompatibilityTest.php

@@ -47,6 +47,24 @@ class HhvmCompatibilityTest extends \PHPUnit\Framework\TestCase
         'serialize_precision',
     ];
 
+    /**
+     * Whitelist of variables allowed in files.
+     *
+     * @var array
+     */
+    private $whitelistVarsInFiles = [
+        'max_input_vars' => [
+            'integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php',
+            'integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php',
+        ]
+    ];
+
+    /**
+     * Test allowed directives.
+     *
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
     public function testAllowedIniGetSetDirectives()
     {
         $deniedDirectives = [];
@@ -55,7 +73,19 @@ public function testAllowedIniGetSetDirectives()
             if ($fileDirectives) {
                 $fileDeniedDirectives = array_diff($fileDirectives, $this->allowedDirectives);
                 if ($fileDeniedDirectives) {
-                    $deniedDirectives[$file] = array_unique($fileDeniedDirectives);
+                    $deniedDirectivesInFile = array_unique($fileDeniedDirectives);
+                    foreach ($deniedDirectivesInFile as $key => $deniedDirective) {
+                        if (isset($this->whitelistVarsInFiles[$deniedDirective])) {
+                            foreach ($this->whitelistVarsInFiles[$deniedDirective] as $whitelistFile) {
+                                if (strpos($file, $whitelistFile) !== false) {
+                                    unset($deniedDirectivesInFile[$key]);
+                                }
+                            }
+                        }
+                    }
+                    if ($deniedDirectivesInFile) {
+                        $deniedDirectives[$file] = $deniedDirectivesInFile;
+                    }
                 }
             }
         }