MC-38254: Minor changes in downloadcss controller

Author: Viktor Sevch

app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCss.php

@@ -6,12 +6,18 @@
  */
 namespace Magento\Theme\Controller\Adminhtml\System\Design\Theme;
 
+use Magento\Backend\App\Action\Context;
 use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Response\Http\FileFactory;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Theme\Controller\Adminhtml\System\Design\Theme;
+use Magento\Framework\Escaper;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Registry;
 use Magento\Framework\Url\DecoderInterface;
+use Magento\Framework\View\Asset\Repository;
 use Magento\Framework\View\Design\ThemeInterface;
+use Magento\Theme\Controller\Adminhtml\System\Design\Theme;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -22,6 +28,32 @@
  */
 class DownloadCss extends Theme implements HttpGetActionInterface
 {
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * DownloadCss constructor.
+     * @param Context $context
+     * @param Registry $coreRegistry
+     * @param FileFactory $fileFactory
+     * @param Repository $assetRepo
+     * @param Filesystem $appFileSystem
+     * @param Escaper|null $escaper
+     */
+    public function __construct(
+        Context $context,
+        Registry $coreRegistry,
+        FileFactory $fileFactory,
+        Repository $assetRepo,
+        Filesystem $appFileSystem,
+        Escaper $escaper = null
+    ) {
+        $this->escaper = $escaper ?? $context->getObjectManager()->get(Escaper::class);
+        parent::__construct($context, $coreRegistry, $fileFactory, $assetRepo, $appFileSystem);
+    }
+
     /**
      * Download css file
      *
@@ -54,11 +86,11 @@ public function execute()
                 DirectoryList::ROOT
             );
         } catch (\InvalidArgumentException $e) {
-            $this->messageManager->addException($e, sprintf('Theme not found: "%d".', $themeId));
+            $this->messageManager->addException($e, __('Theme not found: "%1".', $this->escaper->escapeHtml($themeId)));
             $this->getResponse()->setRedirect($this->_redirect->getRefererUrl());
             $this->_objectManager->get(LoggerInterface::class)->critical($e);
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, sprintf('File not found: "%d".', $fileId));
+            $this->messageManager->addException($e, __('File not found: "%1".', $this->escaper->escapeHtml($fileId)));
             $this->getResponse()->setRedirect($this->_redirect->getRefererUrl());
             $this->_objectManager->get(LoggerInterface::class)->critical($e);
         }

app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/DownloadCssTest.php

@@ -14,6 +14,7 @@
 use Magento\Framework\App\Response\RedirectInterface;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Escaper;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\ReadInterface;
 use Magento\Framework\Message\ManagerInterface;
@@ -88,6 +89,11 @@ class DownloadCssTest extends TestCase
      */
     protected $controller;
 
+    /**
+     * @var Escaper|MockObject
+     */
+    private $escaperMock;
+
     protected function setUp(): void
     {
         $context = $this->getMockBuilder(Context::class)
@@ -123,14 +129,18 @@ protected function setUp(): void
         $this->filesystem = $this->getMockBuilder(Filesystem::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->escaperMock = $this->getMockBuilder(Escaper::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         /** @var Context $context */
         $this->controller = new DownloadCss(
             $context,
             $this->registry,
             $this->fileFactory,
             $this->repository,
-            $this->filesystem
+            $this->filesystem,
+            $this->escaperMock
         );
     }
 
@@ -184,7 +194,7 @@ public function testExecute()
             ->method('create')
             ->with($relPath, ['type' => 'filename', 'value' => $relPath], DirectoryList::ROOT)
             ->willReturn($this->getMockBuilder(ResponseInterface::class)
-            ->getMock());
+                ->getMock());
 
         $this->assertInstanceOf(ResponseInterface::class, $this->controller->execute());
     }
@@ -231,6 +241,7 @@ public function testExecuteInvalidArgument()
         $logger->expects($this->once())->method('critical');
         $this->redirect->expects($this->once())->method('getRefererUrl')->willReturn($refererUrl);
         $this->response->expects($this->once())->method('setRedirect')->with($refererUrl);
+        $this->escaperMock->expects($this->once())->method('escapeHtml')->with($themeId)->willReturn($themeId);
 
         $this->controller->execute();
     }