Merge remote-tracking branch 'mainline/2.3-develop' into chaika_august2

Author: olysenko

app/code/Magento/CatalogUrlRewrite/Plugin/Store/Block/Switcher.php

@@ -487,7 +487,7 @@ public function authenticate($loginUrl = null)
             $this->response->setRedirect($loginUrl);
         } else {
             $arguments = $this->_customerUrl->getLoginUrlParams();
-            if ($this->_session->getCookieShouldBeReceived() && $this->_createUrl()->getUseSession()) {
+            if ($this->_createUrl()->getUseSession()) {
                 $arguments += [
                     '_query' => [
                         $this->sidResolver->getSessionIdQueryParam($this->_session) => $this->_session->getSessionId(),

app/code/Magento/CatalogUrlRewrite/etc/frontend/di.xml

@@ -52,6 +52,9 @@ class SessionTest extends \PHPUnit\Framework\TestCase
      */
     protected $_model;
 
+    /**
+     * @return void
+     */
     protected function setUp()
     {
         $this->_storageMock = $this->createPartialMock(
@@ -82,6 +85,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return void
+     */
     public function testSetCustomerAsLoggedIn()
     {
         $customer = $this->createMock(\Magento\Customer\Model\Customer::class);
@@ -102,6 +108,9 @@ public function testSetCustomerAsLoggedIn()
         $this->assertSame($customer, $this->_model->getCustomer());
     }
 
+    /**
+     * @return void
+     */
     public function testSetCustomerDataAsLoggedIn()
     {
         $customer = $this->createMock(\Magento\Customer\Model\Customer::class);
@@ -126,27 +135,36 @@ public function testSetCustomerDataAsLoggedIn()
         $this->assertSame($customer, $this->_model->getCustomer());
     }
 
+    /**
+     * @return void
+     */
     public function testAuthenticate()
     {
         $urlMock = $this->createMock(\Magento\Framework\Url::class);
         $urlMock->expects($this->exactly(2))
             ->method('getUrl')
-            ->will($this->returnValue(''));
+            ->willReturn('');
         $urlMock->expects($this->once())
             ->method('getRebuiltUrl')
-            ->will($this->returnValue(''));
-        $this->urlFactoryMock->expects($this->exactly(3))
+            ->willReturn('');
+        $this->urlFactoryMock->expects($this->exactly(4))
             ->method('create')
-            ->will($this->returnValue($urlMock));
+            ->willReturn($urlMock);
+        $urlMock->expects($this->once())
+            ->method('getUseSession')
+            ->willReturn(false);
 
         $this->responseMock->expects($this->once())
             ->method('setRedirect')
             ->with('')
-            ->will($this->returnValue(''));
+            ->willReturn('');
 
         $this->assertFalse($this->_model->authenticate());
     }
 
+    /**
+     * @return void
+     */
     public function testLoginById()
     {
         $customerId = 1;
@@ -162,7 +180,7 @@ public function testLoginById()
     }
 
     /**
-     * @param $customerId
+     * @param int $customerId
      * @return \PHPUnit_Framework_MockObject_MockObject
      */
     protected function prepareLoginDataMock($customerId)
@@ -239,6 +257,9 @@ public function getIsLoggedInDataProvider()
         ];
     }
 
+    /**
+     * @return void
+     */
     public function testSetCustomerRemovesFlagThatShowsIfCustomerIsEmulated()
     {
         $customerMock = $this->createMock(\Magento\Customer\Model\Customer::class);

app/code/Magento/Customer/Model/Session.php

@@ -113,7 +113,6 @@ public function __construct(
      *
      * @return int
      * @api
-     * @deprecated 100.2.0 see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
      */
     public function getType()
     {
@@ -125,7 +124,6 @@ public function getType()
      *
      * @return int
      * @api
-     * @deprecated 100.2.0 see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
      */
     public function getTtl()
     {
@@ -255,7 +253,6 @@ protected function _getDesignExceptions()
      *
      * @return bool
      * @api
-     * @deprecated 100.2.0 see \Magento\PageCache\Model\VclGeneratorInterface::generateVcl
      */
     public function isEnabled()
     {

app/code/Magento/Customer/Test/Unit/Model/SessionTest.php

@@ -114,5 +114,6 @@ private function convertIdPathToCodePath(array $patchChunks)
     public function clean()
     {
         $this->data = null;
+        $this->idCodeMap = [];
     }
 }

app/code/Magento/PageCache/Model/Config.php

@@ -171,16 +171,6 @@ public function success($defaultUrl)
      */
     public function updatePathParams(array $arguments)
     {
-        if ($this->_session->getCookieShouldBeReceived()
-            && $this->_sidResolver->getUseSessionInUrl()
-            && $this->_canUseSessionIdInParam
-        ) {
-            $arguments += [
-                '_query' => [
-                    $this->_sidResolver->getSessionIdQueryParam($this->_session) => $this->_session->getSessionId(),
-                ]
-            ];
-        }
         return $arguments;
     }
 

app/code/Magento/Store/App/Config/Type/Scopes.php

@@ -13,6 +13,9 @@
 use Magento\Store\Api\StoreResolverInterface;
 use Magento\Store\Model\Group;
 use Magento\Store\Model\Store;
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Url\Helper\Data as UrlHelper;
 
 /**
  * @api
@@ -30,20 +33,28 @@ class Switcher extends \Magento\Framework\View\Element\Template
      */
     protected $_postDataHelper;
 
+    /**
+     * @var UrlHelper
+     */
+    private $urlHelper;
+
     /**
      * Constructs
      *
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Data\Helper\PostHelper $postDataHelper
      * @param array $data
+     * @param UrlHelper $urlHelper
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         \Magento\Framework\Data\Helper\PostHelper $postDataHelper,
-        array $data = []
+        array $data = [],
+        UrlHelper $urlHelper = null
     ) {
         $this->_postDataHelper = $postDataHelper;
         parent::__construct($context, $data);
+        $this->urlHelper = $urlHelper ?: ObjectManager::getInstance()->get(UrlHelper::class);
     }
 
     /**
@@ -222,15 +233,20 @@ public function getStoreName()
      * @param Store $store
      * @param array $data
      * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getTargetStorePostData(Store $store, $data = [])
     {
-        $data[StoreResolverInterface::PARAM_NAME] = $store->getCode();
+        $data[\Magento\Store\Api\StoreResolverInterface::PARAM_NAME] = $store->getCode();
+        $data['___from_store'] = $this->_storeManager->getStore()->getCode();
+
+        $urlOnTargetStore = $store->getCurrentUrl(false);
+        $data[ActionInterface::PARAM_NAME_URL_ENCODED] = $this->urlHelper->getEncodedUrl($urlOnTargetStore);
+
+        $url = $this->getUrl('stores/store/redirect');
 
-        //We need to set fromStore argument as true because
-        //it will enable proper URL rewriting during store switching.
         return $this->_postDataHelper->getPostData(
-            $store->getCurrentUrl(true),
+            $url,
             $data
         );
     }