Merge pull request #1546 from magento-engcom/2.2-develop-prs

Public Pull Requests:

#11200
#11147
#11154
#11160
#11138
#11127
#11048
#11049
#11069
#11084

Author: Oleksii Korshenko

app/code/Magento/Catalog/Block/Category/Plugin/PriceBoxTags.php

@@ -102,8 +102,8 @@ private function getTaxRateIds(PriceBox $subject)
 
         if (!empty($billingAddress) || !empty($shippingAddress)) {
             $rateRequest = $this->getTaxCalculation()->getRateRequest(
-                $billingAddress,
                 $shippingAddress,
+                $billingAddress,
                 $customerTaxClassId,
                 $this->scopeResolver->getScope()->getId(),
                 $this->customerSession->getCustomerId()

app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php

@@ -33,8 +33,10 @@ protected function processDeletedImages($product, array &$images)
             if (!empty($image['removed'])) {
                 if (!empty($image['value_id']) && !isset($picturesInOtherStores[$image['file']])) {
                     $recordsToDelete[] = $image['value_id'];
-                    // only delete physical files if they are not used by any other products
-                    if (!$this->resourceModel->countImageUses($image['file']) > 1) {
+                    $catalogPath = $this->mediaConfig->getBaseMediaPath();
+                    $isFile = $this->mediaDirectory->isFile($catalogPath . $image['file']);
+                    // only delete physical files if they are not used by any other products and if this file exists
+                    if (!($this->resourceModel->countImageUses($image['file']) > 1) && $isFile) {
                         $filesToDelete[] = ltrim($image['file'], '/');
                     }
                 }

app/code/Magento/Catalog/Test/Unit/Block/Category/Plugin/PriceBoxTagsTest.php

@@ -119,8 +119,8 @@ public function testAfterGetCacheKey()
         $this->session->expects($this->once())->method('getCustomerId')->willReturn($customerId);
         $rateRequest = $this->getMockBuilder(\Magento\Framework\DataObject::class)->getMock();
         $this->taxCalculation->expects($this->once())->method('getRateRequest')->with(
-            new \Magento\Framework\DataObject($billingAddress),
             new \Magento\Framework\DataObject($shippingAddress),
+            new \Magento\Framework\DataObject($billingAddress),
             $customerTaxClassId,
             $scopeId,
             $customerId

app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php

@@ -118,8 +118,12 @@ protected function createCategory($name, $parentId)
         $category->setIsActive(true);
         $category->setIncludeInMenu(true);
         $category->setAttributeSetId($category->getDefaultAttributeSetId());
-        $category->save();
-        $this->categoriesCache[$category->getId()] = $category;
+        try {
+            $category->save();
+            $this->categoriesCache[$category->getId()] = $category;
+        } catch (\Exception $e) {
+            $this->addFailedCategory($category, $e);
+        }
 
         return $category->getId();
     }

app/code/Magento/Cms/Helper/Wysiwyg/Images.php

@@ -177,7 +177,14 @@ public function getImageHtmlDeclaration($filename, $renderAsTag = false)
                 $html = $fileurl; // $mediaPath;
             } else {
                 $directive = $this->urlEncoder->encode($directive);
-                $html = $this->_backendData->getUrl('cms/wysiwyg/directive', ['___directive' => $directive]);
+
+                $html = $this->_backendData->getUrl(
+                    'cms/wysiwyg/directive',
+                    [
+                        '___directive' => $directive,
+                        '_escape_params' => false,
+                    ]
+                );
             }
         }
         return $html;

app/code/Magento/Cms/Test/Unit/Helper/Wysiwyg/ImagesTest.php

@@ -450,7 +450,7 @@ public function testGetImageHtmlDeclaration($baseUrl, $fileName, $isUsingStaticU
 
         $this->backendDataMock->expects($this->any())
             ->method('getUrl')
-            ->with('cms/wysiwyg/directive', ['___directive' => $directive])
+            ->with('cms/wysiwyg/directive', ['___directive' => $directive, '_escape_params' => false])
             ->willReturn($directive);
 
         $this->assertEquals($expectedHtml, $this->imagesHelper->getImageHtmlDeclaration($fileName));

app/code/Magento/Review/i18n/en_US.csv

@@ -132,3 +132,4 @@ Summary,Summary
 "Allow Guests to Write Reviews","Allow Guests to Write Reviews"
 Active,Active
 Inactive,Inactive
+"Please select one of each of the ratings above.","Please select one of each of the ratings above."

app/code/Magento/Review/view/frontend/templates/form.phtml

@@ -35,7 +35,7 @@
                                     id="<?= $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?= $block->escapeHtmlAttr($_option->getValue()) ?>"
                                     value="<?= $block->escapeHtmlAttr($_option->getId()) ?>"
                                     class="radio"
-                                    data-validate="{required:true, messages:{required:'Please select one of each of the ratings above.'}}"
+                                    data-validate="{ 'rating-required':true}"
                                     aria-labelledby="<?= $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_rating_label <?= $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?= $block->escapeHtmlAttr($_option->getValue()) ?>_label" />
                                 <label
                                     class="rating-<?= $block->escapeHtmlAttr($iterator) ?>"
@@ -85,7 +85,8 @@
         "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>
     },
     "#review-form": {
-        "Magento_Review/js/error-placement": {}
+        "Magento_Review/js/error-placement": {},
+        "Magento_Review/js/validate-review": {}
     }
 }
 </script>

app/code/Magento/Review/view/frontend/web/js/validate-review.js

@@ -0,0 +1,18 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'jquery/ui',
+    'jquery/validate',
+    'mage/translate'
+], function ($) {
+    'use strict';
+
+    $.validator.addMethod(
+        'rating-required', function (value) {
+            return value !== undefined;
+        }, $.mage.__('Please select one of each of the ratings above.'));
+});

app/code/Magento/Sales/Model/Order/Shipment/ItemCreation.php

@@ -43,6 +43,7 @@ public function getOrderItemId()
     public function setOrderItemId($orderItemId)
     {
         $this->orderItemId = $orderItemId;
+        return $this;
     }
 
     /**
@@ -59,6 +60,7 @@ public function getQty()
     public function setQty($qty)
     {
         $this->qty = $qty;
+        return $this;
     }
 
     /**

app/code/Magento/Sales/Model/Service/OrderService.php

@@ -87,7 +87,8 @@ public function __construct(
     public function cancel($id)
     {
         $order = $this->orderRepository->get($id);
-        if ((bool)$order->cancel()) {
+        if ($order->canCancel()) {
+            $order->cancel();
             $this->orderRepository->save($order);
             return true;
         }

app/code/Magento/Sales/Test/Unit/Model/Service/OrderServiceTest.php

@@ -163,9 +163,30 @@ public function testCancel()
         $this->orderMock->expects($this->once())
             ->method('cancel')
             ->willReturn($this->orderMock);
+        $this->orderMock->expects($this->once())
+            ->method('canCancel')
+            ->willReturn(true);
         $this->assertTrue($this->orderService->cancel(123));
     }
 
+    /**
+     * test for Order::cancel() fail case
+     */
+    public function testCancelFailed()
+    {
+        $this->orderRepositoryMock->expects($this->once())
+            ->method('get')
+            ->with(123)
+            ->willReturn($this->orderMock);
+        $this->orderMock->expects($this->never())
+            ->method('cancel')
+            ->willReturn($this->orderMock);
+        $this->orderMock->expects($this->once())
+            ->method('canCancel')
+            ->willReturn(false);
+        $this->assertFalse($this->orderService->cancel(123));
+    }
+
     public function testGetCommentsList()
     {
         $this->filterBuilderMock->expects($this->once())

app/code/Magento/Store/Model/Address/Renderer.php

@@ -15,6 +15,12 @@
  */
 class Renderer
 {
+    const DEFAULT_TEMPLATE = "{{var name}}\n" .
+        "{{var street_line1}}\n" .
+        "{{depend street_line2}}{{var street_line2}}\n{{/depend}}" .
+        "{{depend city}}{{var city}},{{/depend}} {{var region}} {{depend postcode}}{{var postcode}},{{/depend}}\n" .
+        "{{var country}}";
+
     /**
      * @var EventManager
      */
@@ -25,18 +31,26 @@ class Renderer
      */
     protected $filterManager;
 
+    /**
+     * @var string
+     */
+    private $template;
+
     /**
      * Constructor
      *
      * @param EventManager $eventManager
      * @param FilterManager $filterManager
+     * @param string $template
      */
     public function __construct(
         EventManager $eventManager,
-        FilterManager $filterManager
+        FilterManager $filterManager,
+        $template = self::DEFAULT_TEMPLATE
     ) {
         $this->eventManager = $eventManager;
         $this->filterManager = $filterManager;
+        $this->template = $template;
     }
 
     /**
@@ -50,9 +64,7 @@ public function format(DataObject $storeInfo, $type = 'html')
     {
         $this->eventManager->dispatch('store_address_format', ['type' => $type, 'store_info' => $storeInfo]);
         $address = $this->filterManager->template(
-            "{{var name}}\n{{var street_line1}}\n{{depend street_line2}}{{var street_line2}}\n{{/depend}}" .
-            "{{depend city}}{{var city}},{{/depend}} {{var region}} {{depend postcode}}{{var postcode}},{{/depend}}\n" .
-            "{{var country}}",
+            $this->template,
             ['variables' => $storeInfo->getData()]
         );
 

app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js

@@ -244,7 +244,7 @@ define([
         ],
         'stripped-min-length': [
             function (value, param) {
-                return $(value).text().length >= param;
+                return value.length >= param;
             },
             $.mage.__('Please enter at least {0} characters')
         ],

lib/internal/Magento/Framework/App/Response/Http/FileFactory.php

@@ -99,19 +99,7 @@ public function create(
             if (!empty($content['rm'])) {
                 $dir->delete($file);
             }
-            $this->callExit();
         }
         return $this->_response;
     }
-
-    /**
-     * Call exit
-     *
-     * @return void
-     * @SuppressWarnings(PHPMD.ExitExpression)
-     */
-    protected function callExit()
-    {
-        exit(0);
-    }
 }

lib/internal/Magento/Framework/App/Test/Unit/Response/Http/FileFactoryTest.php

@@ -235,7 +235,7 @@ private function getModel()
     private function getModelMock()
     {
         $modelMock = $this->getMockBuilder(\Magento\Framework\App\Response\Http\FileFactory::class)
-            ->setMethods(['callExit'])
+            ->setMethods(null)
             ->setConstructorArgs(
                 [
                     'response' => $this->responseMock,