Merge pull request #5652 from magento-tsg/2.4.0-develop-pr33

zakdma · web-flow · commit 29a9f6aef234 · 2020-05-14T12:40:36.000+03:00
[TSG] Fixes for 2.4 (pr33) (2.4.0-develop)
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php
@@ -247,6 +247,11 @@ public function testValidate()
             ->with(FileProcessor::TMP_DIR . '/' . $value['name'])
             ->willReturn(true);
 
+        $this->ioFileSystemMock->expects($this->once())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn(['extension' => 'gif']);
+
         $model = $this->initialize([
             'value' => $value,
             'isAjax' => false,
@@ -300,6 +305,11 @@ public function testValidateMaxFileSize()
             ->with(FileProcessor::TMP_DIR . '/' . $value['name'])
             ->willReturn(true);
 
+        $this->ioFileSystemMock->expects($this->once())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn(['extension' => 'gif']);
+
         $model = $this->initialize([
             'value' => $value,
             'isAjax' => false,
@@ -352,6 +362,11 @@ public function testValidateMaxImageWidth()
             ->with(FileProcessor::TMP_DIR . '/' . $value['name'])
             ->willReturn(true);
 
+        $this->ioFileSystemMock->expects($this->once())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn(['extension' => 'gif']);
+
         $model = $this->initialize([
             'value' => $value,
             'isAjax' => false,
@@ -404,6 +419,11 @@ public function testValidateMaxImageHeight()
             ->with(FileProcessor::TMP_DIR . '/' . $value['name'])
             ->willReturn(true);
 
+        $this->ioFileSystemMock->expects($this->once())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn(['extension' => 'gif']);
+
         $model = $this->initialize([
             'value' => $value,
             'isAjax' => false,
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Download.php b/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Download.php
@@ -20,9 +20,9 @@ class Download extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
      */
     public function _getValue(\Magento\Framework\DataObject $row)
     {
-        return '<p> ' . $row->getData('imported_file') .  '</p><a href="'
+        return '<p> ' . $this->escapeHtml($row->getData('imported_file')) .  '</p><a href="'
         . $this->getUrl('*/*/download', ['filename' => $row->getData('imported_file')]) . '">'
-        . __('Download')
+        . $this->escapeHtml(__('Download'))
         . '</a>';
     }
 }
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Error.php b/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Error.php
@@ -22,9 +22,9 @@ public function _getValue(\Magento\Framework\DataObject $row)
     {
         $result = '';
         if ($row->getData('error_file') != '') {
-            $result = '<p> ' . $row->getData('error_file') .  '</p><a href="'
+            $result = '<p> ' . $this->escapeHtml($row->getData('error_file')) .  '</p><a href="'
                 . $this->getUrl('*/*/download', ['filename' => $row->getData('error_file')]) . '">'
-                . __('Download')
+                . $this->escapeHtml(__('Download'))
                 . '</a>';
         }
         return $result;
diff --git a/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/DownloadTest.php b/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/DownloadTest.php
@@ -10,14 +10,19 @@
 use Magento\Backend\Block\Context;
 use Magento\Backend\Model\Url;
 use Magento\Framework\DataObject;
+use Magento\Framework\Escaper;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\ImportExport\Block\Adminhtml\Grid\Column\Renderer\Download;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * Test for \Magento\ImportExport\Block\Adminhtml\Grid\Column\Renderer\Download class.
+ */
 class DownloadTest extends TestCase
 {
     /**
-     * @var Context
+     * @var Context|MockObject
      */
     protected $context;
 
@@ -32,22 +37,29 @@ class DownloadTest extends TestCase
     protected $download;
 
     /**
-     * Set up
+     * @var Escaper|MockObject
+     */
+    private $escaperMock;
+
+    /**
+     * @inheritdoc
      */
     protected function setUp(): void
     {
+        $this->escaperMock = $this->createMock(Escaper::class);
         $urlModel = $this->createPartialMock(Url::class, ['getUrl']);
         $urlModel->expects($this->any())->method('getUrl')->willReturn('url');
-        $this->context = $this->createPartialMock(Context::class, ['getUrlBuilder']);
+        $this->context = $this->createPartialMock(Context::class, ['getUrlBuilder', 'getEscaper']);
         $this->context->expects($this->any())->method('getUrlBuilder')->willReturn($urlModel);
+        $this->context->expects($this->any())->method('getEscaper')->willReturn($this->escaperMock);
         $data = [];
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->download = $this->objectManagerHelper->getObject(
             Download::class,
             [
                 'context' => $this->context,
-                'data' => $data
+                'data' => $data,
             ]
         );
     }
@@ -59,6 +71,14 @@ public function testGetValue()
     {
         $data = ['imported_file' => 'file.csv'];
         $row = new DataObject($data);
+        $this->escaperMock->expects($this->at(0))
+            ->method('escapeHtml')
+            ->with('file.csv')
+            ->willReturn('file.csv');
+        $this->escaperMock->expects($this->at(1))
+            ->method('escapeHtml')
+            ->with('Download')
+            ->willReturn('Download');
         $this->assertEquals('<p> file.csv</p><a href="url">Download</a>', $this->download->_getValue($row));
     }
 }
diff --git a/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php b/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php
@@ -100,16 +100,23 @@ protected function setUp(): void
             ->willReturn($backendSession);
 
         $templateFactory = $this->createPartialMock(TemplateFactory::class, ['create']);
-        $this->templateMock = $this->createPartialMock(
-            Template::class,
-            [
-                'isPlain',
-                'setId',
-                'setTemplateType',
-                'setTemplateText',
-                'setTemplateStyles',
-            ]
-        );
+        $this->templateMock = $this->getMockBuilder(Template::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'isPlain',
+                    'setId',
+                ]
+            )
+            ->addMethods(
+                [
+                    'setTemplateType',
+                    'setTemplateText',
+                    'setTemplateStyles',
+                ]
+            )
+            ->getMock();
+
         $templateFactory->expects($this->once())
             ->method('create')
             ->willReturn($this->templateMock);
@@ -121,16 +128,22 @@ protected function setUp(): void
             ->willReturn($this->subscriberMock);
 
         $queueFactory = $this->createPartialMock(QueueFactory::class, ['create']);
-        $this->queueMock = $this->createPartialMock(
-            Queue::class,
-            [
-                'load',
-                'getTemplateId',
-                'getNewsletterType',
-                'getNewsletterText',
-                'getNewsletterStyles',
-            ]
-        );
+        $this->queueMock = $this->getMockBuilder(Queue::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'load',
+                ]
+            )
+            ->addMethods(
+                [
+                    'getTemplateId',
+                    'getNewsletterType',
+                    'getNewsletterText',
+                    'getNewsletterStyles',
+                ]
+            )
+            ->getMock();
         $queueFactory->expects($this->any())
             ->method('create')
             ->willReturn($this->queueMock);
@@ -148,7 +161,7 @@ protected function setUp(): void
                 'context' => $context,
                 'templateFactory' => $templateFactory,
                 'subscriberFactory' => $subscriberFactory,
-                'queueFactory' => $queueFactory
+                'queueFactory' => $queueFactory,
             ]
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,9 @@ class Download extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text`
`20`	`20`	`*/`
`21`	`21`	`public function _getValue(\Magento\Framework\DataObject $row)`
`22`	`22`	`{`
`23`		`- return '<p> ' . $row->getData('imported_file') . '</p><a href="'`
	`23`	`+ return '<p> ' . $this->escapeHtml($row->getData('imported_file')) . '</p><a href="'`
`24`	`24`	`. $this->getUrl('//download', ['filename' => $row->getData('imported_file')]) . '">'`
`25`		`- . __('Download')`
	`25`	`+ . $this->escapeHtml(__('Download'))`
`26`	`26`	`. '</a>';`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@ public function _getValue(\Magento\Framework\DataObject $row)`
`22`	`22`	`{`
`23`	`23`	`$result = '';`
`24`	`24`	`if ($row->getData('error_file') != '') {`
`25`		`- $result = '<p> ' . $row->getData('error_file') . '</p><a href="'`
	`25`	`+ $result = '<p> ' . $this->escapeHtml($row->getData('error_file')) . '</p><a href="'`
`26`	`26`	`. $this->getUrl('//download', ['filename' => $row->getData('error_file')]) . '">'`
`27`		`- . __('Download')`
	`27`	`+ . $this->escapeHtml(__('Download'))`
`28`	`28`	`. '</a>';`
`29`	`29`	`}`
`30`	`30`	`return $result;`