Merge remote-tracking branch 'origin/MC-35302' into 2.3-develop-pr51

Author: rostyslav-hymon

app/code/Magento/Analytics/Model/ReportWriter.php

@@ -10,7 +10,6 @@
 
 /**
  * Writes reports in files in csv format
- * @inheritdoc
  */
 class ReportWriter implements ReportWriterInterface
 {
@@ -54,7 +53,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function write(WriteInterface $directory, $path)
     {
@@ -81,7 +80,7 @@ public function write(WriteInterface $directory, $path)
                     $headers = array_keys($row);
                     $stream->writeCsv($headers);
                 }
-                $stream->writeCsv($row);
+                $stream->writeCsv($this->prepareRow($row));
             }
             $stream->unlock();
             $stream->close();
@@ -98,4 +97,18 @@ public function write(WriteInterface $directory, $path)
 
         return true;
     }
+
+    /**
+     * Replace wrong symbols in row
+     *
+     * @param array $row
+     * @return array
+     */
+    private function prepareRow(array $row): array
+    {
+        $row = preg_replace('/(?<!\\\\)"/', '\\"', $row);
+        $row = preg_replace('/[\\\\]+/', '\\', $row);
+
+        return $row;
+    }
 }

app/code/Magento/Analytics/Test/Unit/Model/ReportWriterTest.php

@@ -3,38 +3,43 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Analytics\Test\Unit\Model;
 
 use Magento\Analytics\Model\ConfigInterface;
 use Magento\Analytics\Model\ProviderFactory;
 use Magento\Analytics\Model\ReportWriter;
 use Magento\Analytics\ReportXml\DB\ReportValidator;
 use Magento\Analytics\ReportXml\ReportProvider;
-use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Filesystem\Directory\WriteInterface as DirectoryWriteInterface;
+use Magento\Framework\Filesystem\File\WriteInterface as FileWriteInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class ReportWriterTest extends \PHPUnit\Framework\TestCase
+class ReportWriterTest extends TestCase
 {
     /**
-     * @var ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ConfigInterface|MockObject
      */
     private $configInterfaceMock;
 
     /**
-     * @var ReportValidator|\PHPUnit_Framework_MockObject_MockObject
+     * @var ReportValidator|MockObject
      */
     private $reportValidatorMock;
 
     /**
-     * @var ProviderFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var ProviderFactory|MockObject
      */
     private $providerFactoryMock;
 
     /**
-     * @var ReportProvider|\PHPUnit_Framework_MockObject_MockObject
+     * @var ReportProvider|MockObject
      */
     private $reportProviderMock;
 
@@ -44,7 +49,7 @@ class ReportWriterTest extends \PHPUnit\Framework\TestCase
     private $objectManagerHelper;
 
     /**
-     * @var WriteInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var DirectoryWriteInterface|MockObject
      */
     private $directoryMock;
 
@@ -80,7 +85,7 @@ protected function setUp()
             ->disableOriginalConstructor()->getMock();
         $this->reportProviderMock = $this->getMockBuilder(ReportProvider::class)
             ->disableOriginalConstructor()->getMock();
-        $this->directoryMock = $this->getMockBuilder(WriteInterface::class)->getMockForAbstractClass();
+        $this->directoryMock = $this->getMockBuilder(DirectoryWriteInterface::class)->getMockForAbstractClass();
         $this->objectManagerHelper = new ObjectManagerHelper($this);
 
         $this->reportWriter = $this->objectManagerHelper->getObject(
@@ -95,16 +100,15 @@ protected function setUp()
 
     /**
      * @param array $configData
+     * @param array $fileData
+     * @param array $expectedFileData
      * @return void
      *
      * @dataProvider configDataProvider
      */
-    public function testWrite(array $configData)
+    public function testWrite(array $configData, array $fileData, array $expectedFileData)
     {
         $errors = [];
-        $fileData = [
-            ['number' => 1, 'type' => 'Shoes Usual']
-        ];
         $this->configInterfaceMock
             ->expects($this->once())
             ->method('get')
@@ -123,7 +127,7 @@ public function testWrite(array $configData)
             ->with($parameterName ?: null)
             ->willReturn($fileData);
         $errorStreamMock = $this->getMockBuilder(
-            \Magento\Framework\Filesystem\File\WriteInterface::class
+            FileWriteInterface::class
         )->getMockForAbstractClass();
         $errorStreamMock
             ->expects($this->once())
@@ -133,8 +137,8 @@ public function testWrite(array $configData)
             ->expects($this->exactly(2))
             ->method('writeCsv')
             ->withConsecutive(
-                [array_keys($fileData[0])],
-                [$fileData[0]]
+                [array_keys($expectedFileData[0])],
+                [$expectedFileData[0]]
             );
         $errorStreamMock->expects($this->once())->method('unlock');
         $errorStreamMock->expects($this->once())->method('close');
@@ -166,7 +170,7 @@ public function testWriteErrorFile($configData)
         $errors = ['orders', 'SQL Error: test'];
         $this->configInterfaceMock->expects($this->once())->method('get')->willReturn([$configData]);
         $errorStreamMock = $this->getMockBuilder(
-            \Magento\Framework\Filesystem\File\WriteInterface::class
+            FileWriteInterface::class
         )->getMockForAbstractClass();
         $errorStreamMock->expects($this->once())->method('lock');
         $errorStreamMock->expects($this->once())->method('writeCsv')->with($errors);
@@ -196,7 +200,7 @@ public function configDataProvider()
     {
         return [
             'reportProvider' => [
-                [
+                'configData' => [
                     'providers' => [
                         [
                             'name' => $this->providerName,
@@ -206,6 +210,12 @@ public function configDataProvider()
                             ],
                         ]
                     ]
+                ],
+                'fileData' => [
+                    ['number' => 1, 'type' => 'Shoes\"" Usual\\\\"']
+                ],
+                'expectedFileData' => [
+                    ['number' => 1, 'type' => 'Shoes\"\" Usual\\"']
                 ]
             ],
         ];