Merge remote-tracking branch 'origin/MAGETWO-93118' into 2.3-develop-pr28

Author: zakdma

app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml

@@ -6,14 +6,15 @@
 
 // @codingStandardsIgnoreFile
 
+$totals = $block->getTotals();
 ?>
-<?php if (sizeof($block->getTotals()) > 0): ?>
+<?php if ($totals && count($totals) > 0): ?>
 <table class="items-to-invoice">
     <tr>
-    <?php foreach ($block->getTotals() as $_total): ?>
-        <td <?php if ($_total['grand']): ?>class="grand-total"<?php endif; ?>>
-            <?= /* @escapeNotVerified */ $_total['label'] ?><br />
-            <?= /* @escapeNotVerified */ $_total['value'] ?>
+    <?php foreach ($totals as $total): ?>
+        <td <?php if ($total['grand']): ?>class="grand-total"<?php endif; ?>>
+            <?= $block->escapeHtml($total['label']) ?><br />
+            <?= $block->escapeHtml($total['value']) ?>
         </td>
     <?php endforeach; ?>
     </tr>

app/code/Magento/Ui/Model/Export/MetadataProvider.php

@@ -118,6 +118,13 @@ public function getHeaders(UiComponentInterface $component)
         foreach ($this->getColumns($component) as $column) {
             $row[] = $column->getData('config/label');
         }
+
+        array_walk($row, function (&$header) {
+            if (mb_strpos($header, 'ID') === 0) {
+                $header = '"' . $header . '"';
+            }
+        });
+
         return $row;
     }
 

app/code/Magento/Ui/Test/Unit/Model/Export/MetadataProviderTest.php

@@ -40,18 +40,37 @@ protected function setUp()
         );
     }
 
-    public function testGetHeaders()
+    /**
+     * @param array $columnLabels
+     * @param array $expected
+     * @return void
+     * @dataProvider getColumnsDataProvider
+     */
+    public function testGetHeaders(array $columnLabels, array $expected): void
     {
         $componentName = 'component_name';
         $columnName = 'column_name';
-        $columnLabel = 'column_label';
-
-        $component = $this->prepareColumns($componentName, $columnName, $columnLabel);
 
+        $component = $this->prepareColumns($componentName, $columnName, $columnLabels[0]);
         $result = $this->model->getHeaders($component);
         $this->assertTrue(is_array($result));
         $this->assertCount(1, $result);
-        $this->assertEquals($columnLabel, $result[0]);
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * @return array
+     */
+    public function getColumnsDataProvider(): array
+    {
+        return [
+            [['ID'],['"ID"']],
+            [['Name'],['Name']],
+            [['Id'],['Id']],
+            [['id'],['id']],
+            [['IDTEST'],['"IDTEST"']],
+            [['ID TEST'],['"ID TEST"']],
+        ];
     }
 
     public function testGetFields()