Merge remote-tracking branch 'origin/2.3.3-develop' into MC-19075

SeruyV · SeruyV · commit 47a1ac16dbbb · 2019-08-14T09:36:52.000+03:00
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Add.php b/app/code/Magento/Catalog/Controller/Product/Compare/Add.php
@@ -6,15 +6,72 @@
  */
 namespace Magento\Catalog\Controller\Product\Compare;
 
-use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\ViewModel\Product\Checker\AddToCompareAvailability;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\View\Result\PageFactory;
 
 /**
  * Add item to compare list action.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Add extends \Magento\Catalog\Controller\Product\Compare implements HttpPostActionInterface
 {
+    /**
+     * @var AddToCompareAvailability
+     */
+    private $compareAvailability;
+
+    /**
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Catalog\Model\Product\Compare\ItemFactory $compareItemFactory
+     * @param \Magento\Catalog\Model\ResourceModel\Product\Compare\Item\CollectionFactory $itemCollectionFactory
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Magento\Customer\Model\Visitor $customerVisitor
+     * @param \Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList
+     * @param \Magento\Catalog\Model\Session $catalogSession
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param Validator $formKeyValidator
+     * @param PageFactory $resultPageFactory
+     * @param ProductRepositoryInterface $productRepository
+     * @param AddToCompareAvailability|null $compareAvailability
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Catalog\Model\Product\Compare\ItemFactory $compareItemFactory,
+        \Magento\Catalog\Model\ResourceModel\Product\Compare\Item\CollectionFactory $itemCollectionFactory,
+        \Magento\Customer\Model\Session $customerSession,
+        \Magento\Customer\Model\Visitor $customerVisitor,
+        \Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList,
+        \Magento\Catalog\Model\Session $catalogSession,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        Validator $formKeyValidator,
+        PageFactory $resultPageFactory,
+        ProductRepositoryInterface $productRepository,
+        AddToCompareAvailability $compareAvailability = null
+    ) {
+        parent::__construct(
+            $context,
+            $compareItemFactory,
+            $itemCollectionFactory,
+            $customerSession,
+            $customerVisitor,
+            $catalogProductCompareList,
+            $catalogSession,
+            $storeManager,
+            $formKeyValidator,
+            $resultPageFactory,
+            $productRepository
+        );
+
+        $this->compareAvailability = $compareAvailability
+            ?: $this->_objectManager->get(AddToCompareAvailability::class);
+    }
+
     /**
      * Add item to compare list.
      *
@@ -37,7 +94,7 @@ public function execute()
                 $product = null;
             }
 
-            if ($product && (int)$product->getStatus() !== Status::STATUS_DISABLED) {
+            if ($product && $this->compareAvailability->isAvailableForCompare($product)) {
                 $this->_catalogProductCompareList->addProduct($product);
                 $productName = $this->_objectManager->get(
                     \Magento\Framework\Escaper::class
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php b/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php
@@ -6,6 +6,7 @@
  */
 namespace Magento\Catalog\Controller\Product\Compare;
 
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 
@@ -17,12 +18,13 @@ class Remove extends \Magento\Catalog\Controller\Product\Compare implements Http
     /**
      * Remove item from compare list.
      *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
         $productId = (int)$this->getRequest()->getParam('product');
-        if ($productId) {
+        if ($this->_formKeyValidator->validate($this->getRequest()) && $productId) {
             $storeId = $this->_storeManager->getStore()->getId();
             try {
                 /** @var \Magento\Catalog\Model\Product $product */
@@ -31,7 +33,7 @@ public function execute()
                 $product = null;
             }
 
-            if ($product && $product->isSalable()) {
+            if ($product && (int)$product->getStatus() !== Status::STATUS_DISABLED) {
                 /** @var $item \Magento\Catalog\Model\Product\Compare\Item */
                 $item = $this->_compareItemFactory->create();
                 if ($this->_customerSession->isLoggedIn()) {
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
@@ -18,45 +18,43 @@
             <testCaseId value="MAGETWO-98644"/>
             <useCaseId value="MAGETWO-98522"/>
             <group value="Catalog"/>
-            <skip>
-                <issueId value="MC-15930"/>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <magentoCLI command="config:set cataloginventory/options/show_out_of_stock 0" stepKey="displayOutOfStockNo"/>
+            <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockDisable.path}} {{CatalogInventoryOptionsShowOutOfStockDisable.value}}" stepKey="setConfigShowOutOfStockFalse"/>
             <magentoCLI command="cache:flush" stepKey="flushCache"/>
             <createData entity="SimpleSubCategory" stepKey="category"/>
             <createData entity="SimpleProduct4" stepKey="product">
                 <requiredEntity createDataKey="category"/>
             </createData>
         </before>
         <after>
-            <magentoCLI command="config:set cataloginventory/options/show_out_of_stock 0" stepKey="displayOutOfStockNo2"/>
+            <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockDisable.path}} {{CatalogInventoryOptionsShowOutOfStockDisable.value}}" stepKey="setConfigShowOutOfStockFalse"/>
             <magentoCLI command="cache:flush" stepKey="flushCache"/>
             <deleteData createDataKey="product" stepKey="deleteProduct"/>
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <!--Open product page-->
         <comment userInput="Open product page" stepKey="openProdPage"/>
-        <amOnPage url="{{StorefrontProductPage.url($$product.name$$)}}" stepKey="goToSimpleProductPage"/>
+        <amOnPage url="{{StorefrontProductPage.url($$product.custom_attributes[url_key]$$)}}" stepKey="goToSimpleProductPage"/>
         <waitForPageLoad stepKey="waitForSimpleProductPage"/>
         <!--'Add to compare' link is not available-->
         <comment userInput="'Add to compare' link is not available" stepKey="addToCompareLinkAvailability"/>
         <dontSeeElement selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="dontSeeAddToCompareLink"/>
         <!--Turn on 'out on stock' config-->
         <comment userInput="Turn on 'out of stock' config" stepKey="onOutOfStockConfig"/>
-        <magentoCLI command="config:set cataloginventory/options/show_out_of_stock 1" stepKey="displayOutOfStockYes"/>
+        <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockEnable.path}} {{CatalogInventoryOptionsShowOutOfStockEnable.value}}" stepKey="setConfigShowOutOfStockTrue"/>
         <!--Clear cache and reindex-->
         <comment userInput="Clear cache and reindex" stepKey="cleanCache"/>
         <magentoCLI command="indexer:reindex" stepKey="reindex"/>
         <magentoCLI command="cache:flush" stepKey="flushCache"/>
         <!--Open product page-->
         <comment userInput="Open product page" stepKey="openProductPage"/>
-        <amOnPage url="{{StorefrontProductPage.url($$product.name$$)}}" stepKey="goToSimpleProductPage2"/>
+        <amOnPage url="{{StorefrontProductPage.url($$product.custom_attributes[url_key]$$)}}" stepKey="goToSimpleProductPage2"/>
         <waitForPageLoad stepKey="waitForSimpleProductPage2"/>
         <!--Click on 'Add to Compare' link-->
+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="seeAddToCompareLink"/>
         <comment userInput="Click on 'Add to Compare' link" stepKey="clickOnAddToCompareLink"/>
         <click selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="clickOnAddToCompare"/>
         <waitForPageLoad stepKey="waitForProdAddToCmpList"/>
diff --git a/app/code/Magento/Catalog/ViewModel/Product/Checker/AddToCompareAvailability.php b/app/code/Magento/Catalog/ViewModel/Product/Checker/AddToCompareAvailability.php
@@ -10,6 +10,7 @@
 use Magento\Framework\View\Element\Block\ArgumentInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
 
 /**
  * Check is available add to compare.
@@ -37,7 +38,11 @@ public function __construct(StockConfigurationInterface $stockConfiguration)
      */
     public function isAvailableForCompare(ProductInterface $product): bool
     {
-        return $this->isInStock($product) || $this->stockConfiguration->isShowOutOfStock();
+        if ((int)$product->getStatus() !== Status::STATUS_DISABLED) {
+            return $this->isInStock($product) || $this->stockConfiguration->isShowOutOfStock();
+        }
+
+        return false;
     }
 
     /**
@@ -53,6 +58,6 @@ private function isInStock(ProductInterface $product): bool
             return $product->isSalable();
         }
 
-        return isset($quantityAndStockStatus['is_in_stock']) && $quantityAndStockStatus['is_in_stock'];
+        return $quantityAndStockStatus['is_in_stock'] ?? false;
     }
 }
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutJsValidationTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutJsValidationTest.xml
@@ -11,6 +11,7 @@
     <test name="StorefrontOnePageCheckoutJsValidationTest">
         <annotations>
             <features value="Checkout"/>
+            <stories value="Checkout"/>
             <title value="Js validation error messages must be absent for required fields after checkout start."/>
             <description value="Js validation error messages must be absent for required fields after checkout start."/>
             <severity value="MAJOR" />
diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/Controller/SendmailTest.php b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/SendmailTest.php
@@ -24,10 +24,11 @@ class SendmailTest extends AbstractController
     /**
      * Share the product to friend as logged in customer
      *
+     * @magentoAppArea frontend
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/sendfriend/email/allow_guest 0
-     * @magentoConfigFixture default/sendfriend/email/enabled 1
+     * @magentoConfigFixture default_store sendfriend/email/allow_guest 0
+     * @magentoConfigFixture default_store sendfriend/email/enabled 1
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Catalog/_files/products.php
      */
diff --git a/lib/internal/Magento/Framework/Escaper.php b/lib/internal/Magento/Framework/Escaper.php
@@ -28,6 +28,11 @@ class Escaper
      */
     private $logger;
 
+    /**
+     * @var \Magento\Framework\Translate\InlineInterface
+     */
+    private $translateInline;
+
     /**
      * @var string[]
      */
@@ -335,8 +340,11 @@ public function escapeJsQuote($data, $quote = '\'')
      */
     public function escapeXssInUrl($data)
     {
+        $data = html_entity_decode((string)$data);
+        $this->getTranslateInline()->processResponseBody($data);
+
         return htmlspecialchars(
-            $this->escapeScriptIdentifiers(html_entity_decode((string)$data)),
+            $this->escapeScriptIdentifiers($data),
             $this->htmlSpecialCharsFlag | ENT_HTML5 | ENT_HTML401,
             'UTF-8',
             false
@@ -430,4 +438,19 @@ private function filterProhibitedTags(array $allowedTags): array
 
         return $allowedTags;
     }
+
+    /**
+     * Resolve inline translator.
+     *
+     * @return \Magento\Framework\Translate\InlineInterface
+     */
+    private function getTranslateInline()
+    {
+        if ($this->translateInline === null) {
+            $this->translateInline = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Magento\Framework\Translate\InlineInterface::class);
+        }
+
+        return $this->translateInline;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php b/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Escaper;
+use Magento\Framework\Translate\Inline;
 
 /**
  * \Magento\Framework\Escaper test case
@@ -16,26 +17,40 @@ class EscaperTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Framework\Escaper
      */
-    protected $escaper = null;
+    protected $escaper;
 
     /**
      * @var \Magento\Framework\ZendEscaper
      */
     private $zendEscaper;
 
+    /**
+     * @var Inline
+     */
+    private $translateInline;
+
     /**
      * @var \Psr\Log\LoggerInterface
      */
     private $loggerMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
+        $objectManagerHelper = new ObjectManager($this);
         $this->escaper = new Escaper();
         $this->zendEscaper = new \Magento\Framework\ZendEscaper();
+        $this->translateInline = $objectManagerHelper->getObject(Inline::class);
         $this->loggerMock = $this->getMockForAbstractClass(\Psr\Log\LoggerInterface::class);
-        $objectManagerHelper = new ObjectManager($this);
         $objectManagerHelper->setBackwardCompatibleProperty($this->escaper, 'escaper', $this->zendEscaper);
         $objectManagerHelper->setBackwardCompatibleProperty($this->escaper, 'logger', $this->loggerMock);
+        $objectManagerHelper->setBackwardCompatibleProperty(
+            $this->escaper,
+            'translateInline',
+            $this->translateInline
+        );
     }
 
     /**
@@ -394,6 +409,10 @@ public function escapeDataProvider()
                 'http://test.com/?redirect=\x64\x61\x74\x61\x3a\x74\x65\x78\x74x2cCPHNjcmlwdD5hbGVydCgxKTwvc2NyaXB0Pg',
                 'http://test.com/?redirect=:\x74\x65\x78\x74x2cCPHNjcmlwdD5hbGVydCgxKTwvc2NyaXB0Pg',
             ],
+            [
+                'http://test.com/?{{{test}}{{test_translated}}{{tes_origin}}{{theme}}}',
+                'http://test.com/?test',
+            ],
         ];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`use Magento\Framework\View\Element\Block\ArgumentInterface;`
`11`	`11`	`use Magento\Catalog\Api\Data\ProductInterface;`
`12`	`12`	`use Magento\CatalogInventory\Api\StockConfigurationInterface;`
	`13`	`+use Magento\Catalog\Model\Product\Attribute\Source\Status;`
`13`	`14`
`14`	`15`	`/**`
`15`	`16`	`* Check is available add to compare.`
`@@ -37,7 +38,11 @@ public function __construct(StockConfigurationInterface $stockConfiguration)`
`37`	`38`	`*/`
`38`	`39`	`public function isAvailableForCompare(ProductInterface $product): bool`
`39`	`40`	`{`
`40`		`- return $this->isInStock($product) \|\| $this->stockConfiguration->isShowOutOfStock();`
	`41`	`+ if ((int)$product->getStatus() !== Status::STATUS_DISABLED) {`
	`42`	`+ return $this->isInStock($product) \|\| $this->stockConfiguration->isShowOutOfStock();`
	`43`	`+ }`
	`44`	`+`
	`45`	`+ return false;`
`41`	`46`	`}`
`42`	`47`
`43`	`48`	`/**`
`@@ -53,6 +58,6 @@ private function isInStock(ProductInterface $product): bool`
`53`	`58`	`return $product->isSalable();`
`54`	`59`	`}`
`55`	`60`
`56`		`- return isset($quantityAndStockStatus['is_in_stock']) && $quantityAndStockStatus['is_in_stock'];`
	`61`	`+ return $quantityAndStockStatus['is_in_stock'] ?? false;`
`57`	`62`	`}`
`58`	`63`	`}`