Merge remote-tracking branch 'origin/2.3.0-release' into MAGETWO-94844

Author: Bohdan Korablov

app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php

@@ -1,16 +1,20 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Store;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
-class DeleteGroupPost extends \Magento\Backend\Controller\Adminhtml\System\Store
+/**
+ * Delete store.
+ */
+class DeleteGroupPost extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpPostActionInterface
 {
     /**
+     * @inheritDoc
      * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()

app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php

@@ -1,14 +1,17 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Store;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
-class DeleteStorePost extends \Magento\Backend\Controller\Adminhtml\System\Store
+/**
+ * Delete store view.
+ */
+class DeleteStorePost extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpPostActionInterface
 {
     /**
      * Delete store view post action

app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php

@@ -9,9 +9,13 @@
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
+/**
+ * Delete website.
+ */
 class DeleteWebsitePost extends \Magento\Backend\Controller\Adminhtml\System\Store implements HttpPostActionInterface
 {
     /**
+     * @inheritDoc
      * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()

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/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml

@@ -16,9 +16,6 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-74"/>
             <group value="CatalogRule"/>
-            <skip>
-                <issueId value="DEVOPS-3618"/>
-            </skip>
         </annotations>
         <before>
             <createData entity="ApiCategory" stepKey="createCategoryOne"/>

app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest.xml

@@ -17,9 +17,6 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-65"/>
             <group value="CatalogRule"/>
-            <skip>
-                <issueId value="DEVOPS-3618"/>
-            </skip>
         </annotations>
         <before>
             <!-- Create the simple product and category that it will be in -->
@@ -77,9 +74,6 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-93"/>
             <group value="CatalogRule"/>
-            <skip>
-                <issueId value="DEVOPS-3618"/>
-            </skip>
         </annotations>
         <before>
             <actionGroup stepKey="createNewPriceRule" ref="newCatalogPriceRuleByUI">
@@ -103,9 +97,6 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-69"/>
             <group value="CatalogRule"/>
-            <skip>
-                <issueId value="DEVOPS-3618"/>
-            </skip>
         </annotations>
         <before>
             <actionGroup stepKey="createNewPriceRule" ref="newCatalogPriceRuleByUI">
@@ -129,9 +120,6 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-60"/>
             <group value="CatalogRule"/>
-            <skip>
-                <issueId value="DEVOPS-3618"/>
-            </skip>
         </annotations>
         <before>
             <actionGroup stepKey="createNewPriceRule" ref="newCatalogPriceRuleByUI">
@@ -155,9 +143,6 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-71"/>
             <group value="CatalogRule"/>
-            <skip>
-                <issueId value="DEVOPS-3618"/>
-            </skip>
         </annotations>
         <before>
             <!-- Create a simple product and a category-->

app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml

@@ -17,9 +17,6 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-160"/>
             <group value="CatalogRule"/>
-            <skip>
-                <issueId value="DEVOPS-3618"/>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml

@@ -17,9 +17,6 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-79"/>
             <group value="CatalogRule"/>
-            <skip>
-                <issueId value="DEVOPS-3618"/>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="login"/>

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));
     }
 }