Merge branch '2.3-develop' of https://github.com/magento/magento2ce into PR-13-02-2020

Author: chittima

app/code/Magento/Catalog/Model/Template/Filter.php

@@ -14,8 +14,6 @@
 
 /**
  * Work with catalog(store, website) urls
- *
- * @package Magento\Catalog\Model\Template
  */
 class Filter extends \Magento\Framework\Filter\Template
 {
@@ -30,6 +28,7 @@ class Filter extends \Magento\Framework\Filter\Template
      * Whether to allow SID in store directive: NO
      *
      * @var bool
+     * @deprecated SID query parameter is not used in URLs anymore.
      */
     protected $_useSessionInUrl = false;
 
@@ -81,10 +80,14 @@ public function setUseAbsoluteLinks($flag)
      *
      * @param bool $flag
      * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @deprecated SID query parameter is not used in URLs anymore.
      */
     public function setUseSessionInUrl($flag)
     {
-        $this->_useSessionInUrl = $flag;
+        // phpcs:disable Magento2.Functions.DiscouragedFunction
+        trigger_error('Session ID is not used as URL parameter anymore.', E_USER_DEPRECATED);
+
         return $this;
     }
 
@@ -126,6 +129,7 @@ public function viewDirective($construction)
      */
     public function mediaDirective($construction)
     {
+        // phpcs:disable Magento2.Functions.DiscouragedFunction
         $params = $this->getParameters(html_entity_decode($construction[2], ENT_QUOTES));
         return $this->_storeManager->getStore()
                 ->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) . $params['url'];

app/code/Magento/Cms/Model/Template/Filter.php

@@ -12,25 +12,6 @@
  */
 class Filter extends \Magento\Email\Model\Template\Filter
 {
-    /**
-     * Whether to allow SID in store directive: AUTO
-     *
-     * @var bool
-     */
-    protected $_useSessionInUrl;
-
-    /**
-     * Setter whether SID is allowed in store directive
-     *
-     * @param bool $flag
-     * @return $this
-     */
-    public function setUseSessionInUrl($flag)
-    {
-        $this->_useSessionInUrl = (bool)$flag;
-        return $this;
-    }
-
     /**
      * Retrieve media file URL directive
      *

app/code/Magento/Email/Model/Template/Filter.php

@@ -44,6 +44,7 @@ class Filter extends \Magento\Framework\Filter\Template
      * Whether to allow SID in store directive: NO
      *
      * @var bool
+     * @deprecated SID is not being used as query parameter anymore.
      */
     protected $_useSessionInUrl = false;
 
@@ -263,10 +264,14 @@ public function setUseAbsoluteLinks($flag)
      *
      * @param bool $flag
      * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @deprecated SID query parameter is not used in URLs anymore.
      */
     public function setUseSessionInUrl($flag)
     {
-        $this->_useSessionInUrl = $flag;
+        // phpcs:disable Magento2.Functions.DiscouragedFunction
+        trigger_error('Session ID is not used as URL parameter anymore.', E_USER_DEPRECATED);
+
         return $this;
     }
 

app/code/Magento/Store/Model/StoreSwitcher/CleanTargetUrl.php

@@ -14,6 +14,10 @@
 
 /**
  * Remove SID, from_store, store from target url.
+ *
+ * Used in store-switching process in HTML frontend.
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class CleanTargetUrl implements StoreSwitcherInterface
 {
@@ -22,42 +26,32 @@ class CleanTargetUrl implements StoreSwitcherInterface
      */
     private $urlHelper;
 
-    /**
-     * @var \Magento\Framework\Session\Generic
-     */
-    private $session;
-
-    /**
-     * @var \Magento\Framework\Session\SidResolverInterface
-     */
-    private $sidResolver;
-
     /**
      * @param UrlHelper $urlHelper
      * @param \Magento\Framework\Session\Generic $session
      * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         UrlHelper $urlHelper,
         \Magento\Framework\Session\Generic $session,
         \Magento\Framework\Session\SidResolverInterface $sidResolver
     ) {
         $this->urlHelper = $urlHelper;
-        $this->session = $session;
-        $this->sidResolver = $sidResolver;
     }
 
     /**
+     * Generate target URL to switch stores through other mechanism then via URL params.
+     *
      * @param StoreInterface $fromStore store where we came from
      * @param StoreInterface $targetStore store where to go to
      * @param string $redirectUrl original url requested for redirect after switching
      * @return string redirect url
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function switch(StoreInterface $fromStore, StoreInterface $targetStore, string $redirectUrl): string
     {
         $targetUrl = $redirectUrl;
-        $sidName = $this->sidResolver->getSessionIdQueryParam($this->session);
-        $targetUrl = $this->urlHelper->removeRequestParam($targetUrl, $sidName);
         $targetUrl = $this->urlHelper->removeRequestParam($targetUrl, '___from_store');
         $targetUrl = $this->urlHelper->removeRequestParam($targetUrl, StoreResolverInterface::PARAM_NAME);
 

composer.json

@@ -33,7 +33,7 @@
         "colinmollenhour/cache-backend-redis": "1.10.6",
         "colinmollenhour/credis": "1.10.0",
         "colinmollenhour/php-redis-session-abstract": "~1.4.0",
-        "composer/composer": "^1.6",
+        "composer/composer": "^1.9",
         "elasticsearch/elasticsearch": "~2.0||~5.1||~6.1",
         "guzzlehttp/guzzle": "^6.3.3",
         "laminas/laminas-captcha": "^2.7.1",
@@ -320,7 +320,7 @@
             "Magento\\Framework\\": "lib/internal/Magento/Framework/",
             "Magento\\Setup\\": "setup/src/Magento/Setup/",
             "Magento\\": "app/code/Magento/",
-            "Laminas\\Mvc\\Controller\\": "setup/src/Zend/Mvc/Controller/"
+            "Zend\\Mvc\\Controller\\": "setup/src/Zend/Mvc/Controller/"
         },
         "psr-0": {
             "": [

composer.lock

@@ -225,22 +225,6 @@ public function testSetSessionId()
             $this->assertEquals('test', $this->model->getSessionId());
         }
 
-        /**
-         * @magentoConfigFixture current_store web/session/use_frontend_sid 1
-         */
-        public function testSetSessionIdFromParam()
-        {
-            $this->initializeModel();
-            $this->appState->expects($this->any())
-                ->method('getAreaCode')
-                ->willReturn(\Magento\Framework\App\Area::AREA_FRONTEND);
-            $currentId = $this->model->getSessionId();
-            $this->assertNotEquals('test_id', $this->model->getSessionId());
-            $this->request->getQuery()->set(SidResolverInterface::SESSION_ID_QUERY_PARAM, 'test-id');
-            $this->model->setSessionId($this->sidResolver->getSid($this->model));
-            $this->assertEquals($currentId, $this->model->getSessionId());
-        }
-
         public function testGetSessionIdForHost()
         {
             $this->initializeModel();

dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php

@@ -23,13 +23,6 @@ protected function setUp()
         $this->model = Bootstrap::getObjectManager()->create(\Magento\Framework\Url::class);
     }
 
-    public function testSetGetUseSession()
-    {
-        $this->assertFalse((bool)$this->model->getUseSession());
-        $this->model->setUseSession(false);
-        $this->assertFalse($this->model->getUseSession());
-    }
-
     public function testSetRouteFrontName()
     {
         $value = 'route';

dev/tests/integration/testsuite/Magento/Framework/UrlTest.php

@@ -42,7 +42,7 @@ protected function setUp()
      */
     public function testSwitch(): void
     {
-        $redirectUrl = "http://domain.com/?SID=e5h3e086dce3ckkqt9ia7avl27&___store=fixture_second_store";
+        $redirectUrl = "http://domain.com/?___store=fixture_second_store";
         $expectedUrl = "http://domain.com/";
         $fromStoreCode = 'test';
         /** @var \Magento\Store\Api\StoreRepositoryInterface $storeRepository */

dev/tests/integration/testsuite/Magento/Store/Model/StoreSwitcherTest.php

@@ -10,7 +10,8 @@
 use Magento\Framework\Session\Config\ConfigInterface;
 
 /**
- * Session Manager
+ * Standard session management.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
@@ -200,9 +201,6 @@ public function start()
                     session_commit();
                     session_id($_SESSION['new_session_id']);
                 }
-                $sid = $this->sidResolver->getSid($this);
-                // potential custom logic for session id (ex. switching between hosts)
-                $this->setSessionId($sid);
                 session_start();
                 if (isset($_SESSION['destroyed'])
                     && $_SESSION['destroyed'] < time() - $this->sessionConfig->getCookieLifetime()
@@ -211,7 +209,7 @@ public function start()
                 }
 
                 $this->validator->validate($this);
-                $this->renewCookie($sid);
+                $this->renewCookie(null);
 
                 register_shutdown_function([$this, 'writeClose']);