🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - magento#18427: [Backport] Fix wrong return type in StockRegistryInterface API (by @lewisvoncken)
 - magento#18390: Backport 2.2 - Don't set a source model on the attribute when it's no� (by @hostep)
 - magento#18403: Fix setup wizard page logo (by @rafaelstz)
 - magento#18425: [Backport] Fixing Snake Case To Camel Case (by @lewisvoncken)
 - magento#18422: [BACKPORT] Replace sort callbacks to spaceship operator (by @lewisvoncken)
 - magento#18389: Backport 2.2 - Introducing a dedicated cron.log file for logging cron� (by @hostep)
 - magento#17823: [FEATURE] [issue-3283] Added Filter Support for Yes/No (boolean) attr� (by @lewisvoncken)
 - magento#18166: Fix table rate failing for zip+4 address magento#17770 (by @magently)
 - magento#18175: Fix category tree in cart price rule magento#17493 (by @magently)


Fixed GitHub Issues:
 - magento#15085: StockRegistryInterface :: getLowStockItems() returns StockStatusCollection instead of StockItemCollection (reported by @jesse-dev) has been fixed in magento#18427 by @lewisvoncken in 2.2-develop branch
   Related commits:
     1. adfb130

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

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

 - magento#3283: «Yes/No» attributes should be allowed in the Layered Navigation (reported by @dmitry-fedyuk) has been fixed in magento#17823 by @lewisvoncken in 2.2-develop branch
   Related commits:
     1. 952b333
     2. a2d9a6a

 - magento#17770: Table rate fail when using ZIP+4 shipping address (reported by @werfu) has been fixed in magento#18166 by @magently in 2.2-develop branch
   Related commits:
     1. 6e4a4b2

 - magento#17493: Catalog Rule & Selected Categories with level > 3 (reported by @SKovbel) has been fixed in magento#18175 by @magently in 2.2-develop branch
   Related commits:
     1. 9f19592

Author: magento-engcom-team

app/code/Magento/Backend/Block/Widget/Button/ButtonList.php

@@ -127,12 +127,6 @@ public function getItems()
      */
     public function sortButtons(Item $itemA, Item $itemB)
     {
-        $sortOrderA = (int)$itemA->getSortOrder();
-        $sortOrderB = (int)$itemB->getSortOrder();
-
-        if ($sortOrderA == $sortOrderB) {
-            return 0;
-        }
-        return ($sortOrderA < $sortOrderB) ? -1 : 1;
+        return (int)$itemA->getSortOrder() <=> (int)$itemB->getSortOrder();
     }
 }

app/code/Magento/Bundle/Model/Product/Type.php

@@ -1013,10 +1013,8 @@ public function shakeSelections($firstItem, $secondItem)
             $secondItem->getPosition(),
             $secondItem->getSelectionId(),
         ];
-        if ($aPosition == $bPosition) {
-            return 0;
-        }
-        return $aPosition < $bPosition ? -1 : 1;
+
+        return $aPosition <=> $bPosition;
     }
 
     /**

app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php

@@ -462,7 +462,7 @@ protected function _isOriginalIndexable()
         $backendType = $this->getOrigData('backend_type');
         $frontendInput = $this->getOrigData('frontend_input');
 
-        if ($backendType == 'int' && $frontendInput == 'select') {
+        if ($backendType == 'int' && ($frontendInput == 'select' || $frontendInput == 'boolean')) {
             return true;
         } elseif ($backendType == 'varchar' && $frontendInput == 'multiselect') {
             return true;

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php

@@ -84,7 +84,7 @@ protected function _getIndexableAttributes($multiSelect)
         if ($multiSelect == true) {
             $select->where('ea.backend_type = ?', 'varchar')->where('ea.frontend_input = ?', 'multiselect');
         } else {
-            $select->where('ea.backend_type = ?', 'int')->where('ea.frontend_input = ?', 'select');
+            $select->where('ea.backend_type = ?', 'int')->where('ea.frontend_input IN( ? )', ['select', 'boolean']);
         }
 
         return $this->getConnection()->fetchCol($select);

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml

@@ -55,7 +55,7 @@ function bindAttributeInputType()
 {
     checkOptionsPanelVisibility();
     switchDefaultValueField();
-    if($('frontend_input') && ($('frontend_input').value=='select' || $('frontend_input').value=='multiselect' || $('frontend_input').value=='price')){
+    if($('frontend_input') && ($('frontend_input').value=='boolean' || $('frontend_input').value=='select' || $('frontend_input').value=='multiselect' || $('frontend_input').value=='price')){
         if($('is_filterable') && !$('is_filterable').getAttribute('readonly')){
             $('is_filterable').disabled = false;
         }

app/code/Magento/Catalog/view/adminhtml/web/js/category-checkbox-tree.js

@@ -230,6 +230,7 @@ define([
 
             categoryLoader.on('beforeload', function (treeLoader, node) {
                 treeLoader.baseParams.id = node.attributes.id;
+                treeLoader.baseParams.selected = options.jsFormObject.updateElement.value;
             });
 
             /* eslint-disable */

app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php

@@ -72,7 +72,7 @@ public function getProductStockStatusBySku($productSku, $scopeId = null);
      * @param float $qty
      * @param int $currentPage
      * @param int $pageSize
-     * @return \Magento\CatalogInventory\Api\Data\StockStatusCollectionInterface
+     * @return \Magento\CatalogInventory\Api\Data\StockItemCollectionInterface
      */
     public function getLowStockItems($scopeId, $qty, $currentPage = 1, $pageSize = 0);
 

app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php

@@ -77,10 +77,11 @@ public function execute()
             if (!($category = $this->_initCategory())) {
                 return;
             }
+            $selected = $this->getRequest()->getPost('selected', '');
             $block = $this->_view->getLayout()->createBlock(
                 \Magento\Catalog\Block\Adminhtml\Category\Checkboxes\Tree::class
             )->setCategoryIds(
-                [$categoryId]
+                explode(',', $selected)
             );
             $this->getResponse()->representJson(
                 $block->getTreeJson($category)

app/code/Magento/Config/Model/Config/Structure/Mapper/Sorting.php

@@ -62,10 +62,6 @@ protected function _cmp($elementA, $elementB)
             $sortIndexB = (float)$elementB['sortOrder'];
         }
 
-        if ($sortIndexA == $sortIndexB) {
-            return 0;
-        }
-
-        return $sortIndexA < $sortIndexB ? -1 : 1;
+        return $sortIndexA <=> $sortIndexB;
     }
 }

app/code/Magento/Cron/etc/di.xml

@@ -16,6 +16,18 @@
     <type name="Magento\Framework\App\Config\Initial\Converter">
         <plugin name="cron_system_config_initial_converter_plugin" type="Magento\Cron\Model\System\Config\Initial\Converter" />
     </type>
+    <virtualType name="Magento\Cron\Model\VirtualLoggerHandler" type="Magento\Framework\Logger\Handler\Base">
+        <arguments>
+            <argument name="fileName" xsi:type="string">/var/log/cron.log</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\Cron\Model\VirtualLogger" type="Magento\Framework\Logger\Monolog">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="system" xsi:type="object">Magento\Cron\Model\VirtualLoggerHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
     <!-- @api -->
     <virtualType name="shellBackground" type="Magento\Framework\Shell">
         <arguments>
@@ -25,6 +37,7 @@
     <type name="Magento\Cron\Observer\ProcessCronQueueObserver">
         <arguments>
             <argument name="shell" xsi:type="object">shellBackground</argument>
+            <argument name="logger" xsi:type="object">Magento\Cron\Model\VirtualLogger</argument>
         </arguments>
     </type>
     <type name="Magento\Framework\Console\CommandListInterface">