MC-29261: [Magento Cloud] - When admin URL is different to front-base URL admin redirects to storefront

Author: serhii-balko

app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php

@@ -5,9 +5,10 @@
  */
 namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol;
 
+use Magento\Backend\App\Action;
 use Magento\Backend\Model\View\Result\Redirect;
 use Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol as CurrencysymbolController;
-use Magento\CurrencySymbol\Model\System\Currencysymbol;
+use Magento\CurrencySymbol\Model\System\CurrencysymbolFactory;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Filter\FilterManager;
@@ -17,6 +18,31 @@
  */
 class Save extends CurrencysymbolController implements HttpPostActionInterface
 {
+    /**
+     * @var FilterManager
+     */
+    private $filterManager;
+
+    /**
+     * @var CurrencysymbolFactory
+     */
+    private $currencySymbolFactory;
+
+    /**
+     * @param Action\Context $context
+     * @param FilterManager $filterManager
+     * @param CurrencysymbolFactory $currencySymbolFactory
+     */
+    public function __construct(
+        Action\Context $context,
+        FilterManager $filterManager,
+        CurrencysymbolFactory $currencySymbolFactory
+    ) {
+        parent::__construct($context);
+        $this->filterManager = $filterManager;
+        $this->currencySymbolFactory = $currencySymbolFactory;
+    }
+
     /**
      * Save custom Currency symbol
      *
@@ -29,15 +55,13 @@ public function execute()
         $symbolsDataArray = $this->getRequest()->getParam('custom_currency_symbol', null);
         if (is_array($symbolsDataArray)) {
             foreach ($symbolsDataArray as &$symbolsData) {
-                /** @var $filterManager FilterManager */
-                $filterManager = $this->_objectManager->get(FilterManager::class);
-                $symbolsData = $filterManager->stripTags($symbolsData);
+                $symbolsData = $this->filterManager->stripTags($symbolsData);
             }
         }
 
         try {
-            $this->_objectManager->create(Currencysymbol::class)
-                ->setCurrencySymbolsData($symbolsDataArray);
+            $currencySymbol = $this->currencySymbolFactory->create();
+            $currencySymbol->setCurrencySymbolsData($symbolsDataArray);
             $this->messageManager->addSuccessMessage(__('You applied the custom currency symbols.'));
         } catch (\Exception $e) {
             $this->messageManager->addErrorMessage($e->getMessage());

app/code/Magento/CurrencySymbol/Test/Unit/Controller/Adminhtml/System/Currencysymbol/SaveTest.php

@@ -10,12 +10,12 @@
 use Magento\Backend\Model\View\Result\RedirectFactory;
 use Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol\Save;
 use Magento\CurrencySymbol\Model\System\Currencysymbol;
+use Magento\CurrencySymbol\Model\System\CurrencysymbolFactory;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\Response\RedirectInterface;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Filter\FilterManager;
 use Magento\Framework\Message\ManagerInterface;
-use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -45,16 +45,6 @@ class SaveTest extends TestCase
      */
     protected $responseMock;
 
-    /**
-     * @var ObjectManagerInterface|MockObject
-     */
-    protected $objectManagerMock;
-
-    /**
-     * @var Currencysymbol|MockObject
-     */
-    protected $currencySymbolMock;
-
     /**
      * @var ManagerInterface|MockObject
      */
@@ -73,7 +63,12 @@ class SaveTest extends TestCase
     /**
      * @var FilterManager|MockObject
      */
-    protected $filterManagerMock;
+    private $filterManager;
+
+    /**
+     * @var CurrencysymbolFactory|MockObject
+     */
+    private $currencySymbolFactory;
 
     /**
      * @inheritdoc
@@ -88,25 +83,25 @@ protected function setUp()
             ResponseInterface::class,
             ['setRedirect', 'sendResponse']
         );
-        $this->currencySymbolMock = $this->createMock(Currencysymbol::class);
-        $this->filterManagerMock = $this->createPartialMock(
+        $this->messageManagerMock = $this->createMock(ManagerInterface::class);
+        $this->resultRedirectFactory = $this->createMock(RedirectFactory::class);
+        $this->filterManager = $this->createPartialMock(
             FilterManager::class,
             ['stripTags']
         );
-        $this->objectManagerMock = $this->createMock(ObjectManagerInterface::class);
-        $this->messageManagerMock = $this->createMock(ManagerInterface::class);
-        $this->resultRedirectFactory = $this->createMock(RedirectFactory::class);
+        $this->currencySymbolFactory = $this->createMock(CurrencysymbolFactory::class);
 
         $this->action = $objectManager->getObject(
             Save::class,
             [
                 'request' => $this->requestMock,
                 'response' => $this->responseMock,
-                'objectManager' => $this->objectManagerMock,
                 'redirect' => $this->redirectMock,
                 'helper' => $this->helperMock,
                 'messageManager' => $this->messageManagerMock,
                 'resultRedirectFactory' => $this->resultRedirectFactory,
+                'filterManager' => $this->filterManager,
+                'currencySymbolFactory' => $this->currencySymbolFactory,
             ]
         );
     }
@@ -124,23 +119,14 @@ public function testExecute()
             ->with('custom_currency_symbol')
             ->willReturn($symbolsDataArray);
 
-        $this->currencySymbolMock->expects($this->once())->method('setCurrencySymbolsData')->with($symbolsDataArray);
-
-        $this->filterManagerMock->expects($this->once())
+        $currencySymbol = $this->createMock(Currencysymbol::class);
+        $currencySymbol->expects($this->once())->method('setCurrencySymbolsData')->with($symbolsDataArray);
+        $this->currencySymbolFactory->method('create')->willReturn($currencySymbol);
+        $this->filterManager->expects($this->once())
             ->method('stripTags')
             ->with($firstElement)
             ->willReturn($firstElement);
 
-        $this->objectManagerMock->expects($this->once())
-            ->method('create')
-            ->with(Currencysymbol::class)
-            ->willReturn($this->currencySymbolMock);
-
-        $this->objectManagerMock->expects($this->once())
-            ->method('get')
-            ->with(FilterManager::class)
-            ->willReturn($this->filterManagerMock);
-
         $this->messageManagerMock->expects($this->once())
             ->method('addSuccessMessage')
             ->with(__('You applied the custom currency symbols.'));