🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - magento#18290: Fix wrong reference in google analytics module layout xml (by @sambolek)
 - magento#18149: type casted $qty to float in \Magento\Catalog\Model\Product::setQty() (by @jayankaghosh)
 - magento#18273: [Forwardport] Correctly convert config integration api resources (by @mage2pratik)
 - magento#18173: Use version_compare to compare version strings correctly (by @schmengler)
 - magento#18272: [Forwardport] 9830 - Null order in Magento\Sales\Block\Order\PrintShipment.php (by @mage2pratik)
 - magento#18244: Don't set a source model on the attribute when it's not needed. This � (by @hostep)
 - magento#18231: [Forwardport] Update shipment collection to unserialize `packages` attribute after load (by @mage2pratik)
 - magento#18228: [Forwardport] Fix sitemap grid render incorrect base urls for multiple stores (by @nntoan)
 - magento#18212: Allow keyboard navigation in browser on product detail pages, by fixi� (by @hostep)
 - magento#18201: [Forwardport] Allow usage of config-global.php when running Integration Tests (by @mage2pratik)
 - magento#18334: [Forwardport] Integration test for swatches types in attribute configuration added (by @jignesh-baldha)
 - magento#18288: Fix issue 17152 - prevent email being marked as not sent if email cop� (by @sambolek)
 - magento#18331: Fix throwing error by checkout error processor model (by @ihor-sviziev)
 - magento#18322: Fix for removing the dirs while creating a TAR archive (by @haroldclaus)
 - magento#18308: Fix the issue with customer inline edit when password is expired  (by @dmytro-ch)
 - magento#18312: [Forwardport] fix: reset search mini-form when we have no data / an empty response (by @dmytro-ch)
 - magento#18292: Do not use new Phrase in Link Current class (by @VincentMarmiesse)
 - magento#18209: Introducing a dedicated cron.log file for logging cron related info, � (by @hostep)
 - magento#18303: [Forwardport] Cast products getStoreId() to int (by @sreichel)
 - magento#18295: [Forwardport] fix magento#17582 ./bin/magento config:show fails with a fatal error (by @mage2pratik)
 - magento#18064: Fixing Snake Case To Camel Case (by @hryvinskyi)
 - magento#18344: Added unit test for CRON converter plugin (by @rogyar)


Fixed GitHub Issues:
 - magento#16497: Magento 2.2.5: Google Analytics not added to head correctly (reported by @WalterSmulders) has been fixed in magento#18290 by @sambolek in 2.3-develop branch
   Related commits:
     1. f6fcf41

 - magento#18094: Should getQty() return int/float or string? (reported by @sreichel) has been fixed in magento#18149 by @jayankaghosh in 2.3-develop branch
   Related commits:
     1. 76676ce
     2. 2ad1031

 - magento#12095: Update 2.2.1: One or more integrations have been reset because of a change to their xml configs. (reported by @thomvanderboon) has been fixed in magento#18273 by @mage2pratik in 2.3-develop branch
   Related commits:
     1. 6c33d20
     2. 0b3fe71
     3. 31b7f07
     4. 999d8e5
     5. 401b423

 - magento#9830: Null order in Magento\Sales\Block\Order\PrintShipment.php (reported by @dnadle) has been fixed in magento#18272 by @mage2pratik in 2.3-develop branch
   Related commits:
     1. 37ff9e9

 - magento#10530: Print order error on magento 2.1.8 (reported by @ionutdicu) has been fixed in magento#18272 by @mage2pratik in 2.3-develop branch
   Related commits:
     1. 37ff9e9

 - magento#13156: Updating attribute option data through API will set unwanted source_model on the attribute (reported by @koenner01) has been fixed in magento#18244 by @hostep in 2.3-develop branch
   Related commits:
     1. 477ca51

 - magento#17999: Sitemap grid display incorrect base URL in the grid if using multiple stores (reported by @nntoan) has been fixed in magento#18228 by @nntoan in 2.3-develop branch
   Related commits:
     1. 5144320

 - magento#15196: 2.2.4 : Magento 2 integration tests enables all modules (reported by @kanduvisla) has been fixed in magento#18201 by @mage2pratik in 2.3-develop branch
   Related commits:
     1. 0d0b5c0
     2. 81076e1
     3. 421ba0b
     4. c0cb405
     5. 99b1ca7

 - magento#17152: Failure of "Send Order Email Copy" spams customers, every minute, forever. (reported by @lingwooc) has been fixed in magento#18288 by @sambolek in 2.3-develop branch
   Related commits:
     1. 5548c9d
     2. 8c8b0a8
     3. 6fe9303

 - magento#18330: Checkout - Infinite loading indicator when server returned error (reported by @ihor-sviziev) has been fixed in magento#18331 by @ihor-sviziev in 2.3-develop branch
   Related commits:
     1. eea11c7

 - magento#18162: Cannot edit customer using inline edit if password is expired (reported by @JeroenVanLeusden) has been fixed in magento#18308 by @dmytro-ch in 2.3-develop branch
   Related commits:
     1. 2eeb65c
     2. 34830c6

 - magento#17190: system.log rapidly increasing after Magento CE 2.2.5 update (cron logs) (reported by @mad-develop) has been fixed in magento#18209 by @hostep in 2.3-develop branch
   Related commits:
     1. a4f58c8

 - magento#18079: Inconsistent return type for getStoreId() (reported by @sreichel) has been fixed in magento#18303 by @sreichel in 2.3-develop branch
   Related commits:
     1. 5411c0d

 - magento#17582: ./bin/magento config:show fails with a fatal error (reported by @simonworkhouse) has been fixed in magento#18295 by @mage2pratik in 2.3-develop branch
   Related commits:
     1. 20af5a9

app/code/Magento/Catalog/Model/Category.php

@@ -72,6 +72,11 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
 
     const CACHE_TAG = 'cat_c';
 
+    /**
+     * Category Store Id
+     */
+    const STORE_ID = 'store_id';
+
     /**#@-*/
     protected $_eventPrefix = 'catalog_category';
 
@@ -564,12 +569,12 @@ public function getStoreIds()
      *
      * If store id is underfined for category return current active store id
      *
-     * @return integer
+     * @return int
      */
     public function getStoreId()
     {
-        if ($this->hasData('store_id')) {
-            return (int)$this->_getData('store_id');
+        if ($this->hasData(self::STORE_ID)) {
+            return (int)$this->_getData(self::STORE_ID);
         }
         return (int)$this->_storeManager->getStore()->getId();
     }
@@ -585,7 +590,7 @@ public function setStoreId($storeId)
         if (!is_numeric($storeId)) {
             $storeId = $this->_storeManager->getStore($storeId)->getId();
         }
-        $this->setData('store_id', $storeId);
+        $this->setData(self::STORE_ID, $storeId);
         $this->getResource()->setStoreId($storeId);
         return $this;
     }

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

@@ -498,8 +498,9 @@ protected function _getResource()
     }
 
     /**
-     * Get a list of custom attribute codes that belongs to product attribute set. If attribute set not specified for
-     * product will return all product attribute codes
+     * Get a list of custom attribute codes that belongs to product attribute set.
+     *
+     * If attribute set not specified for product will return all product attribute codes
      *
      * @return string[]
      */
@@ -526,9 +527,9 @@ protected function getCustomAttributesCodes()
     public function getStoreId()
     {
         if ($this->hasData(self::STORE_ID)) {
-            return $this->getData(self::STORE_ID);
+            return (int)$this->getData(self::STORE_ID);
         }
-        return $this->_storeManager->getStore()->getId();
+        return (int)$this->_storeManager->getStore()->getId();
     }
 
     /**
@@ -584,8 +585,9 @@ public function getPrice()
     }
 
     /**
-     * @codeCoverageIgnoreStart
      * Get visibility status
+     *
+     * @codeCoverageIgnoreStart
      * @see \Magento\Catalog\Model\Product\Visibility
      *
      * @return int
@@ -662,6 +664,7 @@ public function getStatus()
 
     /**
      * Retrieve type instance of the product.
+     *
      * Type instance implements product type depended logic and is a singleton shared by all products of the same type.
      *
      * @return \Magento\Catalog\Model\Product\Type\AbstractType
@@ -822,9 +825,10 @@ public function getStoreIds()
 
     /**
      * Retrieve product attributes
-     * if $groupId is null - retrieve all product attributes
      *
-     * @param int  $groupId   Retrieve attributes of the specified group
+     * If $groupId is null - retrieve all product attributes
+     *
+     * @param int $groupId Retrieve attributes of the specified group
      * @param bool $skipSuper Not used
      * @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute[]
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -916,6 +920,7 @@ public function beforeSave()
 
     /**
      * Check/set if options can be affected when saving product
+     *
      * If value specified, it will be set.
      *
      * @param   bool $value
@@ -976,7 +981,7 @@ public function setQty($qty)
      */
     public function getQty()
     {
-        return $this->getData('qty');
+        return (float)$this->getData('qty');
     }
 
     /**
@@ -1036,6 +1041,7 @@ public function reindex()
 
     /**
      * Clear cache related with product and protect delete from not admin
+     *
      * Register indexing event before delete product
      *
      * @return \Magento\Catalog\Model\Product
@@ -1545,11 +1551,11 @@ public function hasGalleryAttribute()
     /**
      * Add image to media gallery
      *
-     * @param string        $file              file path of image in file system
-     * @param string|array  $mediaAttribute    code of attribute with type 'media_image',
-     *                                          leave blank if image should be only in gallery
-     * @param boolean       $move              if true, it will move source file
-     * @param boolean       $exclude           mark image as disabled in product page view
+     * @param string $file file path of image in file system
+     * @param string|array $mediaAttribute code of attribute with type 'media_image',
+     * leave blank if image should be only in gallery
+     * @param bool $move if true, it will move source file
+     * @param bool $exclude mark image as disabled in product page view
      * @return \Magento\Catalog\Model\Product
      */
     public function addImageToMediaGallery($file, $mediaAttribute = null, $move = false, $exclude = true)
@@ -1711,6 +1717,7 @@ public function getIsSalable()
 
     /**
      * Check is a virtual product
+     *
      * Data helper wrapper
      *
      * @return bool
@@ -1803,9 +1810,9 @@ public function formatUrlKey($str)
     /**
      * Save current attribute with code $code and assign new value
      *
-     * @param string $code  Attribute code
-     * @param mixed  $value New attribute value
-     * @param int    $store Store ID
+     * @param string $code Attribute code
+     * @param mixed $value New attribute value
+     * @param int $store Store ID
      * @return void
      */
     public function addAttributeUpdate($code, $value, $store)
@@ -1875,6 +1882,7 @@ public function getRequestPath()
 
     /**
      * Custom function for other modules
+     *
      * @return string
      */
     public function getGiftMessageAvailable()
@@ -1993,6 +2001,8 @@ public function getOptions()
     }
 
     /**
+     * Set product options
+     *
      * @param \Magento\Catalog\Api\Data\ProductCustomOptionInterface[] $options
      * @return $this
      */
@@ -2016,10 +2026,10 @@ public function getIsVirtual()
     /**
      * Add custom option information to product
      *
-     * @param   string $code    Option code
-     * @param   mixed  $value   Value of the option
-     * @param   int|Product    $product Product ID
-     * @return  $this
+     * @param string $code Option code
+     * @param mixed $value Value of the option
+     * @param int|Product $product Product ID
+     * @return $this
      */
     public function addCustomOption($code, $value, $product = null)
     {
@@ -2213,6 +2223,7 @@ public function getPreconfiguredValues()
 
     /**
      * Prepare product custom options.
+     *
      * To be sure that all product custom options does not has ID and has product instance
      *
      * @return \Magento\Catalog\Model\Product
@@ -2547,7 +2558,7 @@ public function setTypeId($typeId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\Catalog\Api\Data\ProductExtensionInterface
      */
@@ -2557,7 +2568,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\Catalog\Api\Data\ProductExtensionInterface $extensionAttributes
      * @return $this
@@ -2570,6 +2581,8 @@ public function setExtensionAttributes(\Magento\Catalog\Api\Data\ProductExtensio
     //@codeCoverageIgnoreEnd
 
     /**
+     * Convert array to media gallery interface
+     *
      * @param array $mediaGallery
      * @return \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface[]
      */
@@ -2587,6 +2600,8 @@ protected function convertToMediaGalleryInterface(array $mediaGallery)
     }
 
     /**
+     * Returns media gallery entries
+     *
      * @return \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface[]|null
      */
     public function getMediaGalleryEntries()
@@ -2601,6 +2616,8 @@ public function getMediaGalleryEntries()
     }
 
     /**
+     * Set media gallery entries
+     *
      * @param ProductAttributeMediaGalleryEntryInterface[] $mediaGalleryEntries
      * @return $this
      */
@@ -2643,6 +2660,8 @@ public function setId($value)
     }
 
     /**
+     * Returns link repository instance
+     *
      * @return ProductLinkRepositoryInterface
      */
     private function getLinkRepository()
@@ -2655,6 +2674,8 @@ private function getLinkRepository()
     }
 
     /**
+     * Returns media gallery processor instance
+     *
      * @return Product\Gallery\Processor
      */
     private function getMediaGalleryProcessor()

app/code/Magento/Checkout/view/frontend/web/js/model/error-processor.js

@@ -8,8 +8,9 @@
  */
 define([
     'mage/url',
-    'Magento_Ui/js/model/messageList'
-], function (url, globalMessageList) {
+    'Magento_Ui/js/model/messageList',
+    'consoleLogger'
+], function (url, globalMessageList, consoleLogger) {
     'use strict';
 
     return {
@@ -25,8 +26,12 @@ define([
             if (response.status == 401) { //eslint-disable-line eqeqeq
                 window.location.replace(url.build('customer/account/login/'));
             } else {
-                error = JSON.parse(response.responseText);
-                messageContainer.addErrorMessage(error);
+                try {
+                    error = JSON.parse(response.responseText);
+                    messageContainer.addErrorMessage(error);
+                } catch (e) {
+                    consoleLogger.error(e);
+                }
             }
         }
     };

app/code/Magento/Config/Console/Command/ConfigShow/ValueProcessor.php

@@ -97,7 +97,7 @@ public function process($scope, $scopeCode, $value, $path)
         $field = $configStructure->getElementByConfigPath($path);
 
         /** @var Value $backendModel */
-        $backendModel = $field && $field->hasBackendModel()
+        $backendModel = $field instanceof Field && $field->hasBackendModel()
             ? $field->getBackendModel()
             : $this->configValueFactory->create();
 

app/code/Magento/Cron/Test/Unit/Model/System/Config/Initial/ConverterTest.php

@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cron\Test\Unit\Model\System\Config\Initial;
+
+use Magento\Cron\Model\Groups\Config\Data as GroupsConfigModel;
+use Magento\Cron\Model\System\Config\Initial\Converter as ConverterPlugin;
+use Magento\Framework\App\Config\Initial\Converter;
+
+/**
+ * Class ConverterTest
+ *
+ * Unit test for \Magento\Cron\Model\System\Config\Initial\Converter
+ */
+class ConverterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var GroupsConfigModel|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $groupsConfigMock;
+
+    /**
+     * @var Converter|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $converterMock;
+
+    /**
+     * @var ConverterPlugin
+     */
+    private $converterPlugin;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->groupsConfigMock = $this->getMockBuilder(
+            GroupsConfigModel::class
+        )->disableOriginalConstructor()->getMock();
+        $this->converterMock = $this->getMockBuilder(Converter::class)->getMock();
+        $this->converterPlugin = new ConverterPlugin($this->groupsConfigMock);
+    }
+
+    /**
+     * Tests afterConvert method with no $result['data']['default']['system'] set
+     */
+    public function testAfterConvertWithNoData()
+    {
+        $expectedResult = ['test'];
+        $this->groupsConfigMock->expects($this->never())
+            ->method('get');
+
+        $result = $this->converterPlugin->afterConvert($this->converterMock, $expectedResult);
+
+        self::assertSame($expectedResult, $result);
+    }
+
+    /**
+     * Tests afterConvert method with $result['data']['default']['system'] set
+     */
+    public function testAfterConvertWithData()
+    {
+        $groups = [
+            'group1' => ['val1' => ['value' => '1']],
+            'group2' => ['val2' => ['value' => '2']]
+        ];
+        $expectedResult['data']['default']['system']['cron'] = [
+            'group1' => [
+                'val1' => '1'
+            ],
+            'group2' => [
+                'val2' => '2'
+            ]
+        ];
+        $result['data']['default']['system']['cron'] = '1';
+
+        $this->groupsConfigMock->expects($this->once())
+            ->method('get')
+            ->willReturn($groups);
+
+        $result = $this->converterPlugin->afterConvert($this->converterMock, $result);
+
+        self::assertEquals($expectedResult, $result);
+    }
+}