Merge pull request #3807 from magento-tsg/2.2.8-develop-pr81

[TSG] Backporting for 2.2 (pr81) (2.2.8-develop)

Author: Alexander Akimov

app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php

@@ -138,8 +138,8 @@ private function getProductIdsByActions(array $actions)
         $productIds = [];
 
         foreach ($actions as $action) {
-            if (isset($action['product_id']) && is_int($action['product_id'])) {
-                $productIds[] = $action['product_id'];
+            if (isset($action['product_id']) && (int)$action['product_id']) {
+                $productIds[] = (int)$action['product_id'];
             }
         }
 

app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php

@@ -78,27 +78,20 @@ protected function setUp()
         );
     }
 
-    public function testFilterProductActions()
+    /**
+     * @dataProvider filterProductActionsDataProvider
+     *
+     * @param array $productsData
+     * @param bool $correct
+     * @return void
+     */
+    public function testFilterProductActions(array $productsData, bool $correct)
     {
-        $productsData = [
-            1 => [
-                'added_at' => 12,
-                'product_id' => 1,
-            ],
-            2 => [
-                'added_at' => 13,
-                'product_id' => 2,
-            ],
-            3 => [
-                'added_at' => 14,
-                'product_id' => 3,
-            ]
-        ];
         $frontendConfiguration = $this->createMock(\Magento\Catalog\Model\FrontendStorageConfigurationInterface::class);
         $frontendConfiguration->expects($this->once())
             ->method('get')
             ->willReturn([
-                'lifetime' => 2
+                'lifetime' => 2,
             ]);
         $this->frontendStorageConfigurationPoolMock->expects($this->once())
             ->method('get')
@@ -110,7 +103,6 @@ public function testFilterProductActions()
         $action2 = $this->getMockBuilder(ProductFrontendActionInterface::class)
             ->getMockForAbstractClass();
 
-        $frontendAction = $this->createMock(ProductFrontendActionInterface::class);
         $collection = $this->getMockBuilder(Collection::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -126,47 +118,91 @@ public function testFilterProductActions()
         $collection->expects($this->once())
             ->method('addFilterByUserIdentities')
             ->with(1, 34);
-        $collection->expects($this->any())
-            ->method('addFieldToFilter')
-            ->withConsecutive(['type_id'], ['product_id']);
 
-        $iterator = new \IteratorIterator(new \ArrayIterator([$frontendAction]));
-        $collection->expects($this->once())
-            ->method('getIterator')
-            ->willReturn($iterator);
-        $this->entityManagerMock->expects($this->once())
-            ->method('delete')
-            ->with($frontendAction);
-        $this->productFrontendActionFactoryMock->expects($this->exactly(2))
-            ->method('create')
-            ->withConsecutive(
-                [
+        if ($correct) {
+            $frontendAction = $this->createMock(ProductFrontendActionInterface::class);
+            $iterator = new \IteratorIterator(new \ArrayIterator([$frontendAction]));
+            $collection->expects($this->any())
+                ->method('addFieldToFilter')
+                ->withConsecutive(['type_id'], ['product_id']);
+            $collection->expects($this->once())
+                ->method('getIterator')
+                ->willReturn($iterator);
+            $this->entityManagerMock->expects($this->once())
+                ->method('delete')
+                ->with($frontendAction);
+            $this->entityManagerMock->expects($this->exactly(2))
+                ->method('save')
+                ->withConsecutive([$action1], [$action2]);
+            $this->productFrontendActionFactoryMock->expects($this->exactly(2))
+                ->method('create')
+                ->withConsecutive(
                     [
-                        'data' => [
-                            'visitor_id' => null,
-                            'customer_id' => 1,
-                            'added_at' => 12,
-                            'product_id' => 1,
-                            'type_id' => 'recently_compared_product'
-                        ]
-                    ]
-                ],
-                [
+                        [
+                            'data' => [
+                                'visitor_id' => null,
+                                'customer_id' => 1,
+                                'added_at' => 12,
+                                'product_id' => 1,
+                                'type_id' => 'recently_compared_product',
+                            ],
+                        ],
+                    ],
                     [
-                        'data' => [
-                            'visitor_id' => null,
-                            'customer_id' => 1,
-                            'added_at' => 13,
-                            'product_id' => 2,
-                            'type_id' => 'recently_compared_product'
-                        ]
+                        [
+                            'data' => [
+                                'visitor_id' => null,
+                                'customer_id' => 1,
+                                'added_at' => 13,
+                                'product_id' => 2,
+                                'type_id' => 'recently_compared_product',
+                            ],
+                        ],
                     ]
-                ]
-            )
-            ->willReturnOnConsecutiveCalls($action1, $action2);
-        $this->entityManagerMock->expects($this->exactly(2))
-            ->method('save')
-            ->withConsecutive([$action1], [$action2]);
+                )
+                ->willReturnOnConsecutiveCalls($action1, $action2);
+        } else {
+            $this->entityManagerMock->expects($this->never())
+                ->method('delete');
+            $this->entityManagerMock->expects($this->never())
+                ->method('save');
+        }
+
         $this->model->syncActions($productsData, 'recently_compared_product');
     }
+
+    /**
+     * @return array
+     */
+    public function filterProductActionsDataProvider(): array
+    {
+        return [
+            [
+                'productsData' => [
+                    1 => [
+                        'added_at' => 12,
+                        'product_id' => 1,
+                    ],
+                    2 => [
+                        'added_at' => 13,
+                        'product_id' => 2,
+                    ],
+                    3 => [
+                        'added_at' => 14,
+                        'product_id' => 3,
+                    ],
+                ],
+                'correct' => true,
+            ],
+            [
+                'productsData' => [
+                    1 => [
+                        'added_at' => 12,
+                        'product_id' => 'test',
+                    ],
+                ],
+                'correct' => false,
+            ],
+        ];
+    }
 }

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php

@@ -115,7 +115,7 @@ private function getUpdatedTierPriceStructure(array $priceMeta)
                             'dataType' => Price::NAME,
                             'component' => 'Magento_Ui/js/form/components/group',
                             'label' => __('Price'),
-                            'enableLabel' => true,
+                            'showLabel' => false,
                             'dataScope' => '',
                             'additionalClasses' => 'control-grouped',
                             'sortOrder' => isset($priceMeta['arguments']['data']['config']['sortOrder'])

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml

@@ -12,8 +12,10 @@
 <?php $_optionId = $_option->getId(); ?>
 <div class="admin__field field<?php if ($_option->getIsRequire()) echo ' required _required' ?>">
   <label class="label admin__field-label">
-      <?= $block->escapeHtml($_option->getTitle()) ?>
-      <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
+      <span>
+          <?= $block->escapeHtml($_option->getTitle()) ?>
+          <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
+      </span>
   </label>
   <div class="admin__field-control control">
 

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml

@@ -64,8 +64,10 @@ require(['prototype'], function(){
 
 <div class="admin__field <?php if ($_option->getIsRequire()) echo ' required _required' ?>">
     <label class="admin__field-label label">
-        <?= $block->escapeHtml($_option->getTitle()) ?>
-        <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
+        <span>
+            <?= $block->escapeHtml($_option->getTitle()) ?>
+            <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
+        </span>
     </label>
     <div class="admin__field-control control">
         <?php if ($_fileExists): ?>

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml

@@ -11,8 +11,10 @@
 <?php $_option = $block->getOption(); ?>
 <div class="field admin__field<?php if ($_option->getIsRequire()) echo ' required _required' ?>">
     <label class="admin__field-label label">
-        <?= $block->escapeHtml($_option->getTitle()) ?>
-        <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
+        <span>
+            <?= $block->escapeHtml($_option->getTitle()) ?>
+            <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
+        </span>
     </label>
     <div class="control admin__field-control">
         <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_FIELD): ?>

app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php

@@ -591,6 +591,7 @@ protected function getColumn(
             'formElement' => Container::NAME,
             'component' => 'Magento_Ui/js/form/components/group',
             'label' => $label,
+            'showLabel' => false,
             'dataScope' => '',
         ];
         $container['children'] = [

app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/price-configurable.js

@@ -11,9 +11,6 @@ define([
 
     return Abstract.extend({
         defaults: {
-            listens: {
-                isConfigurable: 'handlePriceValue'
-            },
             imports: {
                 isConfigurable: '!ns = ${ $.ns }, index = configurable-matrix:isEmpty'
             },
@@ -22,12 +19,15 @@ define([
             }
         },
 
-        /**
-         * Invokes initialize method of parent class,
-         * contains initialization logic
-         */
+        /** @inheritdoc */
         initialize: function () {
             this._super();
+            // resolve initial disable state
+            this.handlePriceValue(this.isConfigurable);
+            // add listener to track "configurable" type
+            this.setListeners({
+                isConfigurable: 'handlePriceValue'
+            });
 
             return this;
         },
@@ -50,11 +50,10 @@ define([
          * @param {String} isConfigurable
          */
         handlePriceValue: function (isConfigurable) {
+            this.disabled(!!this.isUseDefault() || isConfigurable);
+
             if (isConfigurable) {
-                this.disable();
                 this.clear();
-            } else {
-                this.enable();
             }
         }
     });

app/code/Magento/Sales/Model/Order/Status/History.php

@@ -142,7 +142,7 @@ public function getOrder()
      */
     public function getStatusLabel()
     {
-        if ($this->getOrder()) {
+        if ($this->getOrder() && $this->getStatus() !== null) {
             return $this->getOrder()->getConfig()->getStatusLabel($this->getStatus());
         }
         return null;

app/code/Magento/Sales/Test/Unit/Model/Order/Status/HistoryTest.php

@@ -83,6 +83,17 @@ public function testGetStatusLabel()
         $this->assertEquals($status, $this->model->getStatusLabel());
     }
 
+    /**
+     * @return void
+     */
+    public function testGetStatusLabelWithNullStatus()
+    {
+        $this->model->setOrder($this->order);
+        $this->model->setStatus(null);
+
+        $this->assertNull($this->model->getStatusLabel());
+    }
+
     public function testGetStoreFromStoreManager()
     {
         $resultStore = 1;