Merge pull request #1649 from magento-engcom/2.1-develop-prs

Public Pull Requests

#11848 [2.1-develop] X-Magento-Tags header containing whitespaces causes exception by @ihor-sviziev

Fixed Public Issues

#7640 X-Magento-Tags header containing whitespaces causes exception

Author: Oleksii Korshenko

lib/internal/Magento/Framework/Config/Converter/Dom/Flat.php

@@ -100,9 +100,9 @@ public function convert(\DOMNode $source, $basePath = '')
             }
         } else {
             if ($result) {
-                $result['value'] = $value;
+                $result['value'] = trim($value);
             } else {
-                $result = $value;
+                $result = trim($value);
             }
         }
         return $result;

lib/internal/Magento/Framework/Config/Test/Unit/_files/converter/dom/flat/result.php

@@ -3,6 +3,7 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+// @codingStandardsIgnoreFile
 return [
     'root' => [
         'node_one' => [
@@ -11,14 +12,20 @@
             'subnode' => [
                 ['attributeThree' => '30'],
                 ['attributeThree' => '40', 'attributeFour' => '40', 'value' => 'Value1'],
+                ['attributeThree' => '50', 'value' => 'value_from_new_line'],
+                ['attributeThree' => '60', 'value' => 'auto_formatted_by_ide_value_due_to_line_size_restriction']
             ],
             'books' => ['attributeFive' => '50'],
         ],
         'multipleNode' => [
             'one' => ['id' => 'one', 'name' => 'name1', 'value' => '1'],
             'two' => ['id' => 'two', 'name' => 'name2', 'value' => '2'],
+            'three' => ['id' => 'three', 'name' => 'name3', 'value' => 'value_from_new_line'],
+            'four' => ['id' => 'four', 'name' => 'name4', 'value' => 'auto_formatted_by_ide_value_due_to_line_size_restriction'],
         ],
         'someOtherVal' => '',
         'someDataVal' => '',
+        'valueFromNewLine' => 'value_from_new_line',
+        'autoFormattedValue' => 'auto_formatted_by_ide_value_due_to_line_size_restriction'
     ]
 ];

lib/internal/Magento/Framework/Config/Test/Unit/_files/converter/dom/flat/source.xml

@@ -9,6 +9,11 @@
     <node_one attributeOne = '10' attributeTwo = '20'>
         <subnode attributeThree = '30'></subnode>
         <subnode attributeThree = '40' attributeFour = '40' >Value1</subnode>
+        <subnode attributeThree = '50'>
+            value_from_new_line
+        </subnode>
+        <subnode attributeThree = '60'>auto_formatted_by_ide_value_due_to_line_size_restriction
+        </subnode>
         <books attributeFive = '50' />
     </node_one>
     <multipleNode id="one" name="name1">
@@ -19,4 +24,18 @@
     </multipleNode>
     <someOtherVal></someOtherVal>
     <someDataVal><![CDATA[]]></someDataVal>
+    <multipleNode id="three" name="name3">
+        <value>
+            value_from_new_line
+        </value>
+    </multipleNode>
+    <multipleNode id="four" name="name4">
+        <value>auto_formatted_by_ide_value_due_to_line_size_restriction
+        </value>
+    </multipleNode>
+    <valueFromNewLine>
+        value_from_new_line
+    </valueFromNewLine>
+    <autoFormattedValue>auto_formatted_by_ide_value_due_to_line_size_restriction
+    </autoFormattedValue>
 </root>