merge magento/2.3-develop into magento-borg/MAGETWO-90719-reorder-exception

Author: Magento CICD

app/code/Magento/Catalog/Controller/Product/Compare/Add.php

@@ -36,7 +36,14 @@ public function execute()
                 $productName = $this->_objectManager->get(
                     \Magento\Framework\Escaper::class
                 )->escapeHtml($product->getName());
-                $this->messageManager->addSuccess(__('You added product %1 to the comparison list.', $productName));
+                $this->messageManager->addComplexSuccessMessage(
+                    'addCompareSuccessMessage',
+                    [
+                        'product_name' => $productName,
+                        'compare_list_url' => $this->_url->getUrl('catalog/product_compare')
+                    ]
+                );
+
                 $this->_eventManager->dispatch('catalog_product_compare_add_product', ['product' => $product]);
             }
 

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php

@@ -456,7 +456,7 @@ protected function getSelect($entityIds = null, $type = null)
         $specialFromExpr = "{$specialFrom} IS NULL OR {$specialFromDate} <= {$currentDate}";
         $specialToExpr = "{$specialTo} IS NULL OR {$specialToDate} >= {$currentDate}";
         $specialPriceExpr = $connection->getCheckSql(
-            "{$specialPrice} IS NOT NULL AND {$specialFromExpr} AND {$specialToExpr}",
+            "{$specialPrice} IS NOT NULL AND ({$specialFromExpr}) AND ({$specialToExpr})",
             $specialPrice,
             $maxUnsignedBigint
         );

app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml

@@ -12,6 +12,7 @@
         <element name="qtyInput" type="button" selector="input.input-text.qty"/>
         <element name="addToCartBtn" type="button" selector="button.action.tocart.primary" timeout="30"/>
         <element name="successMsg" type="button" selector="div.message-success"/>
+        <element name="errorMsg" type="button" selector="div.message-error"/>
         <element name="alertMessage" type="text" selector=".page.messages [role=alert]"/>
         <element name="messagesBlock" type="text" selector=".page.messages"/>
         <element name="addToWishlist" type="button" selector="//a[@class='action towishlist']" timeout="30"/>

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

@@ -79,6 +79,18 @@
             <argument name="typeId" xsi:type="string">recently_compared_product</argument>
         </arguments>
     </virtualType>
+    <type name="Magento\Framework\View\Element\Message\MessageConfigurationsPool">
+        <arguments>
+            <argument name="configurationsMap" xsi:type="array">
+                <item name="addCompareSuccessMessage" xsi:type="array">
+                    <item name="renderer" xsi:type="const">\Magento\Framework\View\Element\Message\Renderer\BlockRenderer::CODE</item>
+                    <item name="data" xsi:type="array">
+                        <item name="template" xsi:type="string">Magento_Catalog::messages/addCompareSuccessMessage.phtml</item>
+                    </item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Catalog\Block\Product\View\Gallery">
         <arguments>
             <argument name="galleryImagesConfig" xsi:type="array">

app/code/Magento/Catalog/view/frontend/templates/messages/addCompareSuccessMessage.phtml

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// @codingStandardsIgnoreFile
+/** @var \Magento\Framework\View\Element\Template $block */
+?>
+<?= $block->escapeHtml(__(
+    'You added product %1 to the <a href="%2">comparison list</a>.',
+    $block->getData('product_name'),
+    $block->getData('compare_list_url')),
+    ['a']
+);

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

@@ -14,7 +14,8 @@
 <?php $methods = $block->getMethods('methods') ?: $block->getMethods('top_methods') ?>
 <ul class="checkout methods items checkout-methods-items">
 <?php foreach ($methods as $method): ?>
-    <?php if ($methodHtml = $block->getMethodHtml($method)): ?>
+    <?php $methodHtml = $block->getMethodHtml($method); ?>
+    <?php if (trim($methodHtml) !== ''): ?>
     <li class="item"><?= /* @escapeNotVerified */ $methodHtml ?></li>
     <?php endif; ?>
 <?php endforeach; ?>

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

@@ -13,7 +13,6 @@
 use Magento\Framework\App\Request\DataPersistorInterface;
 use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\HTTP\PhpEnvironment\Request;
 use Psr\Log\LoggerInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
@@ -68,7 +67,7 @@ public function __construct(
      */
     public function execute()
     {
-        if (!$this->isPostRequest()) {
+        if (!$this->getRequest()->isPost()) {
             return $this->resultRedirectFactory->create()->setPath('*/*/');
         }
         try {
@@ -102,16 +101,6 @@ private function sendEmail($post)
         );
     }
 
-    /**
-     * @return bool
-     */
-    private function isPostRequest()
-    {
-        /** @var Request $request */
-        $request = $this->getRequest();
-        return !empty($request->getPostValue());
-    }
-
     /**
      * @return array
      * @throws \Exception

app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml

@@ -65,6 +65,9 @@ class PostTest extends \PHPUnit\Framework\TestCase
      */
     private $mailMock;
 
+    /**
+     * test setup
+     */
     protected function setUp()
     {
         $this->mailMock = $this->getMockBuilder(MailInterface::class)->getMockForAbstractClass();
@@ -78,7 +81,7 @@ protected function setUp()
             $this->createMock(\Magento\Framework\Message\ManagerInterface::class);
         $this->requestStub = $this->createPartialMock(
             \Magento\Framework\App\Request\Http::class,
-            ['getPostValue', 'getParams', 'getParam']
+            ['getPostValue', 'getParams', 'getParam', 'isPost']
         );
         $this->redirectResultMock = $this->createMock(\Magento\Framework\Controller\Result\Redirect::class);
         $this->redirectResultMock->method('setPath')->willReturnSelf();
@@ -120,13 +123,18 @@ protected function setUp()
         );
     }
 
+    /**
+     * testExecuteEmptyPost
+     */
     public function testExecuteEmptyPost()
     {
         $this->stubRequestPostData([]);
         $this->assertSame($this->redirectResultMock, $this->controller->execute());
     }
 
     /**
+     * @param array $postData
+     * @param bool $exceptionExpected
      * @dataProvider postDataProvider
      */
     public function testExecutePostValidation($postData, $exceptionExpected)
@@ -159,6 +167,9 @@ public function postDataProvider()
         ];
     }
 
+    /**
+     * testExecuteValidPost
+     */
     public function testExecuteValidPost()
     {
         $post = ['name' => 'Name', 'comment' => 'Comment', 'email' => 'valid@mail.com', 'hideit' => null];
@@ -177,6 +188,10 @@ public function testExecuteValidPost()
      */
     private function stubRequestPostData($post)
     {
+        $this->requestStub
+             ->expects($this->once())
+             ->method('isPost')
+             ->willReturn(!empty($post));
         $this->requestStub->method('getPostValue')->willReturn($post);
         $this->requestStub->method('getParams')->willReturn($post);
         $this->requestStub->method('getParam')->willReturnCallback(