Merge branch 'MC-29567' into MC-29564

dvoskoboinikov · dvoskoboinikov · commit d402d73ece06 · 2020-01-15T16:25:33.000-06:00
# Conflicts:
#	app/code/Magento/Store/Controller/Store/Redirect.php
#	dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php
#	lib/internal/Magento/Framework/Session/SidResolver.php
diff --git a/app/code/Magento/Backend/Block/Media/Uploader.php b/app/code/Magento/Backend/Block/Media/Uploader.php
@@ -87,7 +87,7 @@ protected function _construct()
 
         $this->setId($this->getId() . '_Uploader');
 
-        $uploadUrl = $this->_urlBuilder->addSessionParam()->getUrl('adminhtml/*/upload');
+        $uploadUrl = $this->_urlBuilder->getUrl('adminhtml/*/upload');
         $this->getConfig()->setUrl($uploadUrl);
         $this->getConfig()->setParams(['form_key' => $this->getFormKey()]);
         $this->getConfig()->setFileField('file');
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
@@ -95,7 +95,7 @@ protected function _prepareLayout()
         );
 
         $this->getUploader()->getConfig()->setUrl(
-            $this->_urlBuilder->addSessionParam()->getUrl('catalog/product_gallery/upload')
+            $this->_urlBuilder->getUrl('catalog/product_gallery/upload')
         )->setFileField(
             'image'
         )->setFilters(
diff --git a/app/code/Magento/Catalog/Model/Product/Url.php b/app/code/Magento/Catalog/Model/Product/Url.php
@@ -101,15 +101,10 @@ public function getUrlInStore(\Magento\Catalog\Model\Product $product, $params =
      */
     public function getProductUrl($product, $useSid = null)
     {
-        if ($useSid === null) {
-            $useSid = $this->sidResolver->getUseSessionInUrl();
-        }
-
         $params = [];
         if (!$useSid) {
             $params['_nosid'] = true;
         }
-
         return $this->getUrl($product, $params);
     }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/UrlTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/UrlTest.php
@@ -159,12 +159,11 @@ public function testGetUrl(
                 $this->assertEquals($requestPathProduct, $this->model->getUrlInStore($product, $routeParams));
                 break;
             case 'getProductUrl':
-                $this->assertEquals($requestPathProduct, $this->model->getProductUrl($product, true));
+                $this->assertEquals($requestPathProduct, $this->model->getProductUrl($product, null));
                 $this->sidResolver
-                    ->expects($this->once())
+                    ->expects($this->never())
                     ->method('getUseSessionInUrl')
                     ->will($this->returnValue(true));
-                $this->assertEquals($requestPathProduct, $this->model->getProductUrl($product, null));
                 break;
         }
     }
@@ -212,7 +211,7 @@ public function getUrlDataProvider()
                 1,
                 1,
                 [],
-                ['_direct' => '/product/url/path', '_query' => []],
+                ['_direct' => '/product/url/path', '_query' => [], '_nosid' => true],
                 null,
                 null,
             ]
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Uploader.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Uploader.php
@@ -35,6 +35,8 @@ public function __construct(
     }
 
     /**
+     * Constructor
+     *
      * @return void
      */
     protected function _construct()
@@ -49,7 +51,7 @@ protected function _construct()
             $files[] = '*.' . $ext;
         }
         $this->getConfig()->setUrl(
-            $this->_urlBuilder->addSessionParam()->getUrl('cms/*/upload', ['type' => $type])
+            $this->_urlBuilder->getUrl('cms/*/upload', ['type' => $type])
         )->setFileField(
             'image'
         )->setFilters(
diff --git a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
@@ -447,7 +447,7 @@ protected function getRows()
                                 'smallImage' => '${$.provider}:${$.parentScope}.small_image',
                             ],
                             'uploaderConfig' => [
-                                'url' => $this->urlBuilder->addSessionParam()->getUrl(
+                                'url' => $this->urlBuilder->getUrl(
                                     'catalog/product_gallery/upload'
                                 ),
                             ],
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -11,7 +11,7 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
- * @deprecated
+ * @deprecated in favor of new class which adds grid links
  * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Links
  */
 class Links extends \Magento\Backend\Block\Template
@@ -398,7 +398,7 @@ public function getFileFieldName($type)
      */
     public function getUploadUrl($type)
     {
-        return $this->_urlFactory->create()->addSessionParam()->getUrl(
+        return $this->_urlFactory->create()->getUrl(
             'adminhtml/downloadable_file/upload',
             ['type' => $type, '_secure' => true]
         );
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
@@ -10,7 +10,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  *
- * @deprecated
+ * @deprecated because of new class which adds grids samples
  * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Samples
  */
 class Samples extends \Magento\Backend\Block\Widget
@@ -250,7 +250,7 @@ public function getUploadButtonHtml()
      */
     public function getConfigJson()
     {
-        $url = $this->_urlFactory->create()->addSessionParam()->getUrl(
+        $url = $this->_urlFactory->create()->getUrl(
             'adminhtml/downloadable_file/upload',
             ['type' => 'samples', '_secure' => true]
         );
diff --git a/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/LinksTest.php b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/LinksTest.php
@@ -17,7 +17,7 @@
 use Magento\Framework\Stdlib\ArrayManager;
 
 /**
- * Class LinksTest
+ * Test for class Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Links
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class LinksTest extends \PHPUnit\Framework\TestCase
@@ -169,7 +169,7 @@ public function testModifyMeta()
             ->method('toOptionArray');
         $this->shareableMock->expects($this->once())
             ->method('toOptionArray');
-        $this->urlBuilderMock->expects($this->exactly(2))
+        $this->urlBuilderMock->expects($this->never())
             ->method('addSessionParam')
             ->willReturnSelf();
         $this->urlBuilderMock->expects($this->exactly(2))
diff --git a/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/SamplesTest.php b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/SamplesTest.php
@@ -16,7 +16,7 @@
 use Magento\Framework\Stdlib\ArrayManager;
 
 /**
- * Class SamplesTest
+ * Test for class Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Samples
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SamplesTest extends \PHPUnit\Framework\TestCase
@@ -141,7 +141,7 @@ public function testModifyMeta()
             ->method('isSingleStoreMode');
         $this->typeUploadMock->expects($this->once())
             ->method('toOptionArray');
-        $this->urlBuilderMock->expects($this->once())
+        $this->urlBuilderMock->expects($this->never())
             ->method('addSessionParam')
             ->willReturnSelf();
         $this->urlBuilderMock->expects($this->once())
diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Data/Links.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Data/Links.php
@@ -16,7 +16,7 @@
 use Magento\Framework\Exception\ValidatorException;
 
 /**
- * Class Links
+ * Grid class to add links
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Links
@@ -162,7 +162,7 @@ protected function addSampleFile(array $linkData, LinkInterface $link)
                     'name' => $this->downloadableFile->getFileFromPathFile($sampleFile),
                     'size' => $this->downloadableFile->getFileSize($file),
                     'status' => 'old',
-                    'url' => $this->urlBuilder->addSessionParam()->getUrl(
+                    'url' => $this->urlBuilder->getUrl(
                         'adminhtml/downloadable_product_edit/link',
                         ['id' => $link->getId(), 'type' => 'sample', '_secure' => true]
                     ),
@@ -191,7 +191,7 @@ protected function addLinkFile(array $linkData, LinkInterface $link)
                     'name' => $this->downloadableFile->getFileFromPathFile($linkFile),
                     'size' => $this->downloadableFile->getFileSize($file),
                     'status' => 'old',
-                    'url' => $this->urlBuilder->addSessionParam()->getUrl(
+                    'url' => $this->urlBuilder->getUrl(
                         'adminhtml/downloadable_product_edit/link',
                         ['id' => $link->getId(), 'type' => 'link', '_secure' => true]
                     ),
diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Data/Samples.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Data/Samples.php
@@ -16,7 +16,7 @@
 use Magento\Downloadable\Api\Data\SampleInterface;
 
 /**
- * Class Samples
+ * Class to add samples
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Samples
@@ -143,7 +143,7 @@ protected function addSampleFile(array $sampleData, SampleInterface $sample)
                     'name' => $this->downloadableFile->getFileFromPathFile($sampleFile),
                     'size' => $this->downloadableFile->getFileSize($file),
                     'status' => 'old',
-                    'url' => $this->urlBuilder->addSessionParam()->getUrl(
+                    'url' => $this->urlBuilder->getUrl(
                         'adminhtml/downloadable_product_edit/sample',
                         ['id' => $sample->getId(), '_secure' => true]
                     ),
diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php
@@ -339,7 +339,7 @@ protected function getFileColumn()
             'elementTmpl' => 'Magento_Downloadable/components/file-uploader',
             'fileInputName' => 'links',
             'uploaderConfig' => [
-                'url' => $this->urlBuilder->addSessionParam()->getUrl(
+                'url' => $this->urlBuilder->getUrl(
                     'adminhtml/downloadable_file/upload',
                     ['type' => 'links', '_secure' => true]
                 ),
@@ -406,7 +406,7 @@ protected function getSampleColumn()
             'fileInputName' => 'link_samples',
             'labelVisible' => false,
             'uploaderConfig' => [
-                'url' => $this->urlBuilder->addSessionParam()->getUrl(
+                'url' => $this->urlBuilder->getUrl(
                     'adminhtml/downloadable_file/upload',
                     ['type' => 'link_samples', '_secure' => true]
                 ),
diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php
@@ -273,7 +273,7 @@ protected function getSampleColumn()
             'elementTmpl' => 'Magento_Downloadable/components/file-uploader',
             'fileInputName' => 'samples',
             'uploaderConfig' => [
-                'url' => $this->urlBuilder->addSessionParam()->getUrl(
+                'url' => $this->urlBuilder->getUrl(
                     'adminhtml/downloadable_file/upload',
                     ['type' => 'samples', '_secure' => true]
                 ),
diff --git a/app/code/Magento/Email/Model/AbstractTemplate.php b/app/code/Magento/Email/Model/AbstractTemplate.php
@@ -339,7 +339,6 @@ public function loadDefault($templateId)
     public function getProcessedTemplate(array $variables = [])
     {
         $processor = $this->getTemplateFilter()
-            ->setUseSessionInUrl(false)
             ->setPlainTemplateMode($this->isPlain())
             ->setIsChildTemplate($this->isChildTemplate())
             ->setTemplateProcessor([$this, 'getTemplateContent']);
diff --git a/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php b/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php
@@ -69,9 +69,6 @@ protected function setUp()
         $this->design = $this->getMockBuilder(\Magento\Framework\View\DesignInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->registry = $this->getMockBuilder(\Magento\Framework\Registry::class)
-            ->disableOriginalConstructor()
-            ->getMock();
         $this->appEmulation = $this->getMockBuilder(\Magento\Store\Model\App\Emulation::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -177,7 +174,7 @@ public function testGetProcessedTemplate($variables, $templateType, $storeId, $e
             ->disableOriginalConstructor()
             ->getMock();
 
-        $filterTemplate->expects($this->once())
+        $filterTemplate->expects($this->never())
             ->method('setUseSessionInUrl')
             ->with(false)
             ->will($this->returnSelf());
@@ -253,7 +250,6 @@ public function testGetProcessedTemplateException()
         $filterTemplate = $this->getMockBuilder(\Magento\Email\Model\Template\Filter::class)
             ->setMethods(
                 [
-                'setUseSessionInUrl',
                 'setPlainTemplateMode',
                 'setIsChildTemplate',
                 'setDesignParams',
@@ -267,9 +263,7 @@ public function testGetProcessedTemplateException()
             )
             ->disableOriginalConstructor()
             ->getMock();
-        $filterTemplate->expects($this->once())
-            ->method('setUseSessionInUrl')
-            ->will($this->returnSelf());
+
         $filterTemplate->expects($this->once())
             ->method('setPlainTemplateMode')
             ->will($this->returnSelf());
diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php
@@ -268,7 +268,7 @@ class_exists(\Magento\Newsletter\Model\Template\Filter::class, true);
             )
             ->disableOriginalConstructor()
             ->getMock();
-        $filterTemplate->expects($this->once())
+        $filterTemplate->expects($this->never())
             ->method('setUseSessionInUrl')
             ->with(false)
             ->will($this->returnSelf());
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCms/CategoryBlockTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCms/CategoryBlockTest.php
@@ -29,7 +29,7 @@ public function testCategoryCmsBlock()
         $blockRepository = Bootstrap::getObjectManager()->get(BlockRepositoryInterface::class);
         $block = $blockRepository->getById($blockId);
         $filter = Bootstrap::getObjectManager()->get(FilterEmulate::class);
-        $renderedContent = $filter->setUseSessionInUrl(false)->filter($block->getContent());
+        $renderedContent = $filter->filter($block->getContent());
 
         /** @var CategoryRepositoryInterface $categoryRepository */
         $categoryRepository = Bootstrap::getObjectManager()->get(CategoryRepositoryInterface::class);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsBlockTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsBlockTest.php
@@ -43,7 +43,7 @@ public function testGetCmsBlock()
     {
         $cmsBlock = $this->blockRepository->getById('enabled_block');
         $cmsBlockData = $cmsBlock->getData();
-        $renderedContent = $this->filterEmulate->setUseSessionInUrl(false)->filter($cmsBlock->getContent());
+        $renderedContent = $this->filterEmulate->filter($cmsBlock->getContent());
 
         $query =
             <<<QUERY
@@ -77,7 +77,7 @@ public function testGetCmsBlockByBlockId()
         $cmsBlock = $this->blockRepository->getById('enabled_block');
         $cmsBlockData = $cmsBlock->getData();
         $blockId = $cmsBlockData['block_id'];
-        $renderedContent = $this->filterEmulate->setUseSessionInUrl(false)->filter($cmsBlock->getContent());
+        $renderedContent = $this->filterEmulate->filter($cmsBlock->getContent());
 
         $query =
             <<<QUERY
diff --git a/lib/internal/Magento/Framework/App/Router/Base.php b/lib/internal/Magento/Framework/App/Router/Base.php
@@ -374,6 +374,6 @@ protected function _checkShouldBeSecure(\Magento\Framework\App\RequestInterface
      */
     protected function _shouldRedirectToSecure()
     {
-        return $this->_url->getUseSession();
+        return false;
     }
 }
diff --git a/lib/internal/Magento/Framework/Test/Unit/UrlTest.php b/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
@@ -183,7 +183,7 @@ public function testGetUseSession()
         $this->assertFalse((bool)$model->getUseSession());
 
         $model->setUseSession(true);
-        $this->assertTrue($model->getUseSession());
+        $this->assertFalse($model->getUseSession());
     }
 
     public function testGetBaseUrlNotLinkType()
diff --git a/lib/internal/Magento/Framework/Url.php b/lib/internal/Magento/Framework/Url.php
@@ -111,7 +111,7 @@ class Url extends \Magento\Framework\DataObject implements \Magento\Framework\Ur
      *
      * @var bool
      */
-    protected $_useSession;
+    protected $_useSession = false;
 
     /**
      * Url security info list
@@ -292,10 +292,7 @@ public function setUseSession($useSession)
      */
     public function getUseSession()
     {
-        if ($this->_useSession === null) {
-            $this->_useSession = $this->_sidResolver->getUseSessionInUrl();
-        }
-        return $this->_useSession;
+        return false;
     }
 
     /**
@@ -941,10 +938,6 @@ private function createUrl($routePath = null, array $routeParams = null)
             }
         }
 
-        if ($noSid !== true) {
-            $this->_prepareSessionUrl($url);
-        }
-
         $query = $this->_getQuery($escapeQuery);
         if ($query) {
             $mark = strpos($url, '?') === false ? '?' : ($escapeQuery ? '&amp;' : '&');
@@ -992,8 +985,6 @@ public function getRebuiltUrl($url)
         }
         $url = $this->getScheme() . '://' . $this->getHost() . $port . $this->getPath();
 
-        $this->_prepareSessionUrl($url);
-
         $query = $this->_getQuery();
         if ($query) {
             $url .= '?' . $query;
@@ -1101,7 +1092,7 @@ public function isOwnOriginUrl()
     }
 
     /**
-     * Return frontend redirect URL with SID and other session parameters if any
+     * Return frontend redirect URL without SID
      *
      * @param string $url
      *

Original file line number	Diff line number	Diff line change
`@@ -101,15 +101,10 @@ public function getUrlInStore(\Magento\Catalog\Model\Product $product, $params =`
`101`	`101`	`*/`
`102`	`102`	`public function getProductUrl($product, $useSid = null)`
`103`	`103`	`{`
`104`		`- if ($useSid === null) {`
`105`		`- $useSid = $this->sidResolver->getUseSessionInUrl();`
`106`		`- }`
`107`		`-`
`108`	`104`	`$params = [];`
`109`	`105`	`if (!$useSid) {`
`110`	`106`	`$params['_nosid'] = true;`
`111`	`107`	`}`
`112`		`-`
`113`	`108`	`return $this->getUrl($product, $params);`
`114`	`109`	`}`
`115`	`110`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`* @author Magento Core Team <core@magentocommerce.com>`
`12`	`12`	`*`
`13`		`- * @deprecated`
	`13`	`+ * @deprecated because of new class which adds grids samples`
`14`	`14`	`* @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Samples`
`15`	`15`	`*/`
`16`	`16`	`class Samples extends \Magento\Backend\Block\Widget`
`@@ -250,7 +250,7 @@ public function getUploadButtonHtml()`
`250`	`250`	`*/`
`251`	`251`	`public function getConfigJson()`
`252`	`252`	`{`
`253`		`- $url = $this->_urlFactory->create()->addSessionParam()->getUrl(`
	`253`	`+ $url = $this->_urlFactory->create()->getUrl(`
`254`	`254`	`'adminhtml/downloadable_file/upload',`
`255`	`255`	`['type' => 'samples', '_secure' => true]`
`256`	`256`	`);`