Merge remote-tracking branch 'remotes/tango-ce/MAGETWO-2204' into MAGETWO-33812

Author: Yuri Kovsher

app/code/Magento/Backup/Controller/Adminhtml/Index/Download.php

@@ -10,11 +10,51 @@
 
 class Download extends \Magento\Backup\Controller\Adminhtml\Index
 {
+    /**
+     * @var \Magento\Framework\Controller\Result\RawFactory
+     */
+    protected $resultRawFactory;
+
+    /**
+     * @var \Magento\Backend\Model\View\Result\RedirectFactory
+     */
+    protected $resultRedirectFactory;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Framework\Backup\Factory $backupFactory
+     * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
+     * @param \Magento\Backup\Model\BackupFactory $backupModelFactory
+     * @param \Magento\Framework\App\MaintenanceMode $maintenanceMode
+     * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+     * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Framework\Backup\Factory $backupFactory,
+        \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
+        \Magento\Backup\Model\BackupFactory $backupModelFactory,
+        \Magento\Framework\App\MaintenanceMode $maintenanceMode,
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
+        \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory) {
+        parent::__construct(
+            $context,
+            $coreRegistry,
+            $backupFactory,
+            $fileFactory,
+            $backupModelFactory,
+            $maintenanceMode
+        );
+        $this->resultRawFactory = $resultRawFactory;
+        $this->resultRedirectFactory = $resultRedirectFactory;
+    }
+
     /**
      * Download backup action
      *
      * @return void|\Magento\Backend\App\Action
-     * @SuppressWarnings(PHPMD.ExitExpression)
      */
     public function execute()
     {
@@ -25,22 +65,25 @@ public function execute()
         );
 
         if (!$backup->getTime() || !$backup->exists()) {
-            return $this->_redirect('backup/*');
+            /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+            $resultRedirect = $this->resultRedirectFactory->create();
+            $resultRedirect->setPath('backup/*');
+            return $resultRedirect;
         }
 
         $fileName = $this->_objectManager->get('Magento\Backup\Helper\Data')->generateBackupDownloadName($backup);
 
-        $response = $this->_fileFactory->create(
+        $this->_fileFactory->create(
             $fileName,
             null,
             DirectoryList::VAR_DIR,
             'application/octet-stream',
             $backup->getSize()
         );
 
-        $response->sendHeaders();
-
-        $backup->output();
-        exit;
+        /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
+        $resultRaw = $this->resultRawFactory->create();
+        $resultRaw->setContents($backup->output());
+        return $resultRaw;
     }
 }

app/code/Magento/Backup/Model/Backup.php

@@ -381,7 +381,7 @@ public function close()
     /**
      * Print output
      *
-     * @return void
+     * @return string
      */
     public function output()
     {
@@ -393,7 +393,7 @@ public function output()
         $directory = $this->_filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
         $directory = $directory->readFile($this->_getFilePath());
 
-        echo $directory;
+        return $directory;
     }
 
     /**

app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php

@@ -20,6 +20,11 @@
  */
 class Viewfile extends \Magento\Customer\Controller\Adminhtml\Index
 {
+    /**
+     * @var \Magento\Framework\Controller\Result\RawFactory
+     */
+    protected $resultRawFactory;
+
     /**
      * @var \Magento\Framework\Url\DecoderInterface
      */
@@ -52,6 +57,7 @@ class Viewfile extends \Magento\Customer\Controller\Adminhtml\Index
      * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
      * @param \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
+     * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
      * @param \Magento\Framework\Url\DecoderInterface $urlDecoder
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -83,6 +89,7 @@ public function __construct(
         \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
         \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory,
         \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory,
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
         \Magento\Framework\Url\DecoderInterface $urlDecoder
     ) {
         parent::__construct(
@@ -113,6 +120,7 @@ public function __construct(
             $resultForwardFactory,
             $resultJsonFactory
         );
+        $this->resultRawFactory = $resultRawFactory;
         $this->urlDecoder  = $urlDecoder;
     }
 
@@ -174,21 +182,22 @@ public function execute()
             $contentLength = $stat['size'];
             $contentModify = $stat['mtime'];
 
-            $this->getResponse()
-                ->setHttpResponseCode(200)
+            /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
+            $resultRaw = $this->resultRawFactory->create();
+            $resultRaw->setHttpResponseCode(200)
                 ->setHeader('Pragma', 'public', true)
                 ->setHeader('Content-type', $contentType, true)
                 ->setHeader('Content-Length', $contentLength)
-                ->setHeader('Last-Modified', date('r', $contentModify))
-                ->clearBody();
-            $this->getResponse()->sendHeaders();
-
-            echo $directory->readFile($fileName);
+                ->setHeader('Last-Modified', date('r', $contentModify));
+            $resultRaw->setContents($directory->readFile($fileName));
+            return $resultRaw;
         } else {
             $name = pathinfo($path, PATHINFO_BASENAME);
-            $this->_fileFactory->create($name, ['type' => 'filename', 'value' => $fileName], DirectoryList::MEDIA)
-                ->sendResponse();
+            $this->_fileFactory->create(
+                $name,
+                ['type' => 'filename', 'value' => $fileName],
+                DirectoryList::MEDIA
+            );
         }
-        exit;
     }
 }