Merge MAGETWO-72048 into 2.3-bugfixes-240918

Author: dvoskoboinikov

app/code/Magento/Catalog/Controller/Adminhtml/Category/Image/Upload.php

@@ -5,12 +5,13 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Category\Image;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
 /**
  * Class Upload
  */
-class Upload extends \Magento\Backend\App\Action
+class Upload extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Image uploader
@@ -54,14 +55,6 @@ public function execute()
 
         try {
             $result = $this->imageUploader->saveFileToTmpDir($imageId);
-
-            $result['cookie'] = [
-                'name' => $this->_getSession()->getName(),
-                'value' => $this->_getSession()->getSessionId(),
-                'lifetime' => $this->_getSession()->getCookieLifetime(),
-                'path' => $this->_getSession()->getCookiePath(),
-                'domain' => $this->_getSession()->getCookieDomain(),
-            ];
         } catch (\Exception $e) {
             $result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
         }

app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php

@@ -501,14 +501,6 @@ public function uploadFile($targetPath, $type = null)
         // create thumbnail
         $this->resizeFile($targetPath . '/' . $uploader->getUploadedFileName(), true);
 
-        $result['cookie'] = [
-            'name' => $this->getSession()->getName(),
-            'value' => $this->getSession()->getSessionId(),
-            'lifetime' => $this->getSession()->getCookieLifetime(),
-            'path' => $this->getSession()->getCookiePath(),
-            'domain' => $this->getSession()->getCookieDomain(),
-        ];
-
         return $result;
     }
 

app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php

@@ -440,14 +440,7 @@ public function testUploadFile()
         $thumbnailDestination = $thumbnailTargetPath . '/' . $fileName;
         $type = 'image';
         $result = [
-            'result',
-            'cookie' => [
-                'name' => 'session_name',
-                'value' => '1',
-                'lifetime' => '50',
-                'path' => 'cookie/path',
-                'domain' => 'cookie_domain',
-            ],
+            'result'
         ];
         $uploader = $this->getMockBuilder(\Magento\MediaStorage\Model\File\Uploader::class)
             ->disableOriginalConstructor()
@@ -507,17 +500,6 @@ public function testUploadFile()
 
         $this->adapterFactoryMock->expects($this->atLeastOnce())->method('create')->willReturn($image);
 
-        $this->sessionMock->expects($this->atLeastOnce())->method('getName')
-            ->willReturn($result['cookie']['name']);
-        $this->sessionMock->expects($this->atLeastOnce())->method('getSessionId')
-            ->willReturn($result['cookie']['value']);
-        $this->sessionMock->expects($this->atLeastOnce())->method('getCookieLifetime')
-            ->willReturn($result['cookie']['lifetime']);
-        $this->sessionMock->expects($this->atLeastOnce())->method('getCookiePath')
-            ->willReturn($result['cookie']['path']);
-        $this->sessionMock->expects($this->atLeastOnce())->method('getCookieDomain')
-            ->willReturn($result['cookie']['domain']);
-
         $this->assertEquals($result, $this->imagesStorage->uploadFile($targetPath, $type));
     }
 }

app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File/Upload.php

@@ -1,14 +1,19 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\File;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
-class Upload extends \Magento\Downloadable\Controller\Adminhtml\Downloadable\File
+/**
+ * Class Upload
+ *
+ * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\File
+ */
+class Upload extends \Magento\Downloadable\Controller\Adminhtml\Downloadable\File implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Downloadable\Model\Link
@@ -96,17 +101,10 @@ public function execute()
                 $relativePath = rtrim($tmpPath, '/') . '/' . ltrim($result['file'], '/');
                 $this->storageDatabase->saveFile($relativePath);
             }
-
-            $result['cookie'] = [
-                'name' => $this->_getSession()->getName(),
-                'value' => $this->_getSession()->getSessionId(),
-                'lifetime' => $this->_getSession()->getCookieLifetime(),
-                'path' => $this->_getSession()->getCookiePath(),
-                'domain' => $this->_getSession()->getCookieDomain(),
-            ];
         } catch (\Exception $e) {
             $result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
         }
+
         return $this->resultFactory->create(ResultFactory::TYPE_JSON)->setData($result);
     }
 }

app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/File/UploadTest.php

@@ -59,11 +59,6 @@ class UploadTest extends \PHPUnit\Framework\TestCase
      */
     protected $fileHelper;
 
-    /**
-     * @var  \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\Model\Session
-     */
-    protected $session;
-
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Controller\ResultFactory
      */
@@ -81,9 +76,6 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $this->session = $this->getMockBuilder(\Magento\Backend\Model\Session::class)
-            ->disableOriginalConstructor()
-            ->getMock();
         $this->resultFactory = $this->getMockBuilder(\Magento\Framework\Controller\ResultFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
@@ -108,9 +100,6 @@ protected function setUp()
         $this->context->expects($this->any())
             ->method('getRequest')
             ->will($this->returnValue($this->request));
-        $this->context->expects($this->any())
-            ->method('getSession')
-            ->will($this->returnValue($this->session));
         $this->context->expects($this->any())
             ->method('getResultFactory')
             ->will($this->returnValue($this->resultFactory));
@@ -154,11 +143,6 @@ public function testExecute()
         $this->uploaderFactory->expects($this->once())->method('create')->willReturn($uploader);
         $this->fileHelper->expects($this->once())->method('uploadFromTmp')->willReturn($data);
         $this->storageDatabase->expects($this->once())->method('saveFile');
-        $this->session->expects($this->once())->method('getName')->willReturn('Name');
-        $this->session->expects($this->once())->method('getSessionId')->willReturn('SessionId');
-        $this->session->expects($this->once())->method('getCookieLifetime')->willReturn('CookieLifetime');
-        $this->session->expects($this->once())->method('getCookiePath')->willReturn('CookiePath');
-        $this->session->expects($this->once())->method('getCookieDomain')->willReturn('CookieDomain');
         $this->resultFactory->expects($this->once())->method('create')->willReturn($resultJson);
         $resultJson->expects($this->once())->method('setData')->willReturnSelf();
 

app/code/Magento/Theme/Model/Wysiwyg/Storage.php

@@ -11,6 +11,11 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 
+/**
+ * Class Storage
+ *
+ * @package Magento\Theme\Model\Wysiwyg
+ */
 class Storage
 {
     /**
@@ -127,14 +132,6 @@ public function uploadFile($targetPath)
 
         $this->_createThumbnail($targetPath . '/' . $uploader->getUploadedFileName());
 
-        $result['cookie'] = [
-            'name' => $this->_helper->getSession()->getName(),
-            'value' => $this->_helper->getSession()->getSessionId(),
-            'lifetime' => $this->_helper->getSession()->getCookieLifetime(),
-            'path' => $this->_helper->getSession()->getCookiePath(),
-            'domain' => $this->_helper->getSession()->getCookieDomain()
-        ];
-
         return $result;
     }
 

app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php

@@ -152,8 +152,7 @@ public function testUploadFile()
         $this->_helperStorage->expects($this->any())->method('getSession')->will($this->returnValue($session));
 
         $expectedResult = [
-            'not_empty',
-            'cookie' => ['name' => null, 'value' => null, 'lifetime' => null, 'path' => null, 'domain' => null],
+            'not_empty'
         ];
 
         $this->assertEquals($expectedResult, $this->_storageModel->uploadFile($this->_storageRoot));

dev/tests/integration/testsuite/Magento/Downloadable/Controller/Adminhtml/Downloadable/FileTest.php

@@ -37,6 +37,7 @@ public function testUploadAction()
             ],
         ];
 
+        $this->getRequest()->setMethod('POST');
         $this->dispatch('backend/admin/downloadable_file/upload/type/samples');
         $body = $this->getResponse()->getBody();
         $result = Bootstrap::getObjectManager()->get(Json::class)->unserialize($body);
@@ -64,6 +65,7 @@ public function testUploadProhibitedExtensions($fileName)
             ],
         ];
 
+        $this->getRequest()->setMethod('POST');
         $this->dispatch('backend/admin/downloadable_file/upload/type/samples');
         $body = $this->getResponse()->getBody();
         $result = Bootstrap::getObjectManager()->get(Json::class)->unserialize($body);