Merge branch '2.3-develop-php74' of https://github.com/magento-commerce/magento2ce into MC-40559

Author: jcuerdo

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

@@ -671,14 +671,6 @@
                         <item name="store" xsi:type="string">Magento\Store\Model\StoreScopeProvider</item>
                     </item>
                 </item>
-                <item name="Magento\Catalog\Api\Data\CategoryTreeInterface" xsi:type="array">
-                    <item name="entityTableName" xsi:type="string">catalog_category_entity</item>
-                    <item name="eavEntityType" xsi:type="string">catalog_category</item>
-                    <item name="identifierField" xsi:type="string">entity_id</item>
-                    <item name="entityContext" xsi:type="array">
-                        <item name="store" xsi:type="string">Magento\Store\Model\StoreScopeProvider</item>
-                    </item>
-                </item>
                 <item name="Magento\Catalog\Api\Data\CategoryLinkInterface" xsi:type="array">
                     <item name="entityTableName" xsi:type="string">catalog_category_product</item>
                     <item name="identifierField" xsi:type="string">entity_id</item>
@@ -846,11 +838,6 @@
                         <item name="store" xsi:type="string">Magento\Store\Model\DefaultStoreScopeProvider</item>
                     </item>
                 </item>
-                <item name="Magento\Catalog\Api\Data\CategoryTreeInterface" xsi:type="array">
-                    <item name="entityContext" xsi:type="array">
-                        <item name="store" xsi:type="string">Magento\Store\Model\DefaultStoreScopeProvider</item>
-                    </item>
-                </item>
             </argument>
         </arguments>
     </virtualType>
@@ -877,10 +864,6 @@
         <arguments>
             <argument name="extensionActions" xsi:type="array">
                 <item name="eav" xsi:type="array">
-                    <item name="Magento\Catalog\Api\Data\CategoryTreeInterface" xsi:type="array">
-                        <item name="create" xsi:type="string">Magento\Catalog\Model\ResourceModel\CreateHandler</item>
-                        <item name="update" xsi:type="string">Magento\Catalog\Model\ResourceModel\UpdateHandler</item>
-                    </item>
                     <item name="Magento\Catalog\Api\Data\CategoryInterface" xsi:type="array">
                         <item name="create" xsi:type="string">Magento\Catalog\Model\ResourceModel\CreateHandler</item>
                         <item name="update" xsi:type="string">Magento\Catalog\Model\ResourceModel\UpdateHandler</item>
@@ -902,7 +885,6 @@
         <arguments>
             <argument name="hydrators" xsi:type="array">
                 <item name="Magento\Catalog\Api\Data\CategoryInterface" xsi:type="string">Magento\Framework\EntityManager\AbstractModelHydrator</item>
-                <item name="Magento\Catalog\Api\Data\CategoryTreeInterface" xsi:type="string">Magento\Framework\EntityManager\AbstractModelHydrator</item>
                 <item name="Magento\Catalog\Api\Data\ProductInterface" xsi:type="string">Magento\Catalog\Model\Product\Hydrator</item>
             </argument>
         </arguments>

app/code/Magento/Customer/Ui/Component/Listing/Column/Confirmation.php

@@ -45,7 +45,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function prepareDataSource(array $dataSource)
     {
@@ -66,7 +66,7 @@ public function prepareDataSource(array $dataSource)
     private function getFieldLabel(array $item)
     {
         $isConfirmationRequired = $this->accountConfirmation->isConfirmationRequired(
-            $item['website_id'][0],
+            $item['website_id'][0] ?? null,
             $item[$item['id_field_name']],
             $item['email']
         );

app/code/Magento/ImportExport/Ui/DataProvider/ExportFileDataProvider.php

@@ -103,8 +103,9 @@ public function getData()
             $result['items'][]['file_name'] = $this->getPathToExportFile($this->fileIO->getPathInfo($file));
         }
 
-        $pageSize = (int) $this->request->getParam('paging')['pageSize'];
-        $pageCurrent = (int) $this->request->getParam('paging')['current'];
+        $paging = $this->request->getParam('paging');
+        $pageSize = (int) ($paging['pageSize'] ?? 0);
+        $pageCurrent = (int) ($paging['current'] ?? 0);
         $pageOffset = ($pageCurrent - 1) * $pageSize;
         $result['totalRecords'] = count($result['items']);
         $result['items'] = array_slice($result['items'], $pageOffset, $pageSize);

app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php

@@ -94,11 +94,13 @@ protected function reformatSwatchLabels($swatchStoreValue = null)
         }
         $newSwatch = [];
         foreach ($swatchStoreValue as $key => $value) {
-            if ($value[0] == '#') {
-                $newSwatch[$key] = 'background: '.$value;
-            } elseif ($value[0] == '/') {
-                $mediaUrl = $this->swatchHelper->getSwatchMediaUrl();
-                $newSwatch[$key] = 'background: url('.$mediaUrl.$value.'); background-size: cover;';
+            if (!empty($value) && is_string($value)) {
+                if ($value[0] === '#') {
+                    $newSwatch[$key] = 'background: '.$value;
+                } elseif ($value[0] === '/') {
+                    $mediaUrl = $this->swatchHelper->getSwatchMediaUrl();
+                    $newSwatch[$key] = 'background: url('.$mediaUrl.$value.'); background-size: cover;';
+                }
             }
         }
         return $newSwatch;