Merge branch '2.3-develop' of github.com:magento/magento2ce into borg-2.3

Author: nathanjosiah

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php

@@ -573,11 +573,10 @@ public function prepareProductIndex($indexData, $productData, $storeId)
             foreach ($attributeData as $attributeId => $attributeValues) {
                 $value = $this->getAttributeValue($attributeId, $attributeValues, $storeId);
                 if (!empty($value)) {
-                    if (isset($index[$attributeId])) {
-                        $index[$attributeId][$entityId] = $value;
-                    } else {
-                        $index[$attributeId] = [$entityId => $value];
+                    if (!isset($index[$attributeId])) {
+                        $index[$attributeId] = [];
                     }
+                        $index[$attributeId][$entityId] = $value;
                 }
             }
         }
@@ -645,9 +644,12 @@ private function getAttributeOptionValue($attributeId, $valueIds, $storeId)
                 $attribute->setStoreId($storeId);
                 $options = $attribute->getSource()->toOptionArray();
                 $this->attributeOptions[$optionKey] = array_column($options, 'label', 'value');
-                $this->attributeOptions[$optionKey] = array_map(function ($value) {
-                    return $this->filterAttributeValue($value);
-                }, $this->attributeOptions[$optionKey]);
+                $this->attributeOptions[$optionKey] = array_map(
+                    function ($value) {
+                        return $this->filterAttributeValue($value);
+                    },
+                    $this->attributeOptions[$optionKey]
+                );
             } else {
                 $this->attributeOptions[$optionKey] = null;
             }

app/code/Magento/Cms/Model/Block.php

@@ -12,8 +12,8 @@
 /**
  * CMS block model
  *
- * @method Block setStoreId(array $storeId)
- * @method array getStoreId()
+ * @method Block setStoreId(int $storeId)
+ * @method int getStoreId()
  */
 class Block extends AbstractModel implements BlockInterface, IdentityInterface
 {
@@ -41,6 +41,8 @@ class Block extends AbstractModel implements BlockInterface, IdentityInterface
     protected $_eventPrefix = 'cms_block';
 
     /**
+     * Construct.
+     *
      * @return void
      */
     protected function _construct()

app/code/Magento/Cms/Model/Page.php

@@ -16,8 +16,8 @@
  * Cms Page Model
  *
  * @api
- * @method Page setStoreId(array $storeId)
- * @method array getStoreId()
+ * @method Page setStoreId(int $storeId)
+ * @method int getStoreId()
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @since 100.0.2
  */
@@ -103,8 +103,7 @@ public function getStores()
     }
 
     /**
-     * Check if page identifier exist for specific store
-     * return page id if page exists
+     * Check if page identifier exist for specific store return page id if page exists
      *
      * @param string $identifier
      * @param int $storeId
@@ -116,8 +115,7 @@ public function checkIdentifier($identifier, $storeId)
     }
 
     /**
-     * Prepare page's statuses.
-     * Available event cms_page_get_available_statuses to customize statuses.
+     * Prepare page's statuses, available event cms_page_get_available_statuses to customize statuses.
      *
      * @return array
      */
@@ -538,7 +536,7 @@ public function setIsActive($isActive)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.0.0
      */
     public function beforeSave()
@@ -571,6 +569,8 @@ public function beforeSave()
     }
 
     /**
+     * Returns scope config.
+     *
      * @return ScopeConfigInterface
      */
     private function getScopeConfig()

app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml

@@ -16,11 +16,14 @@
             </tr>
         </thead>
         <?php $_items = $block->getShipment()->getAllItems() ?>
-        <?php $_i = 0; foreach ($_items as $_item): if ($_item->getOrderItem()->getParentItem()): continue; endif; $_i++ ?>
-            <tbody class="<?= /* @escapeNotVerified */ $_i%2 ? 'odd' : 'even' ?>">
-                <?= $block->getItemHtml($_item) ?>
-                <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
-            </tbody>
+        <?php $_i = 0; foreach ($_items as $_item):
+            if (!empty($_item->getOrderItem())) :
+                if ($_item->getOrderItem()->getParentItem()): continue; endif; $_i++ ?>
+                <tbody class="<?= /* @escapeNotVerified */ $_i%2 ? 'odd' : 'even' ?>">
+                    <?= $block->getItemHtml($_item) ?>
+                    <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
+                </tbody>
+            <?php endif; ?>
         <?php endforeach; ?>
     </table>
 </div>

app/code/Magento/Store/Model/StoreManager.php

@@ -69,7 +69,7 @@ class StoreManager implements
     /**
      * Default store code
      *
-     * @var string
+     * @var string|int|\Magento\Store\Api\Data\StoreInterface
      */
     protected $currentStoreId = null;
 

app/code/Magento/Store/Model/StoreManagerInterface.php

@@ -117,7 +117,7 @@ public function getGroups($withDefault = false);
     /**
      * Set current default store
      *
-     * @param string $store
+     * @param string|int|\Magento\Store\Api\Data\StoreInterface $store
      * @return void
      */
     public function setCurrentStore($store);

app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less

@@ -89,7 +89,7 @@
             }
 
             &-options {
-                margin-top: @indent__s;
+                margin: @indent__s 0;
 
                 &:focus {
                     box-shadow: none;