Merge pull request #9791 from magento-gl/spartans_08052025_AC-14597

[Spartans] Bugfix Delivery

Author: glo71317

app/code/Magento/ProductAlert/Model/Mailing/AlertProcessor.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All rights reserved.
  */
 declare(strict_types=1);
 
@@ -128,7 +128,7 @@ public function process(string $alertType, array $customerIds, int $websiteId):
         if (!empty($errors)) {
             /** @var Website $website */
             $website = $this->storeManager->getWebsite($websiteId);
-            $defaultStoreId = $website->getDefaultStore()->getId();
+            $defaultStoreId = (int)$website->getDefaultStore()->getId();
             $this->errorEmailSender->execute($errors, $defaultStoreId);
         }
     }

app/code/Magento/ProductAlert/etc/crontab.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All rights reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/crontab.xsd">
     <group id="default">
-        <job name="product_alert" instance="Magento\ProductAlert\Model\Observer" method="process">
+        <job name="catalog_product_alert" instance="Magento\ProductAlert\Model\Observer" method="process">
             <config_path>crontab/default/jobs/catalog_product_alert/schedule/cron_expr</config_path>
         </job>
     </group>

app/code/Magento/Theme/Ui/Component/Design/Config/DataProvider.php

@@ -126,8 +126,10 @@ public function getData()
     private function getCoreConfigData(): array
     {
         $connection = $this->resourceConnection->getConnection();
+        $tableName = $this->resourceConnection->getTableName('core_config_data');
+
         return $connection->fetchAll(
-            $connection->select()->from($connection->getTableName('core_config_data'))
+            $connection->select()->from($tableName)
                 ->where('path = ?', 'design/theme/theme_id')
         );
     }

app/code/Magento/User/view/adminhtml/web/js/roles-tree.js

@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All rights reserved.
  */
 
 /**
@@ -12,8 +12,6 @@ define([
     'jquery/jstree/jquery.jstree',
     'mage/translate'
 ], function ($) {
-    'use strict';
-
     // jscs:disable requireCamelCaseOrUpperCaseIdentifiers
     $.widget('mage.rolesTree', {
         options: {
@@ -97,9 +95,13 @@ define([
         _destroy: function () {
             this.element.jstree('destroy');
 
-            this.buttons.forEach(function (element) {
-                element.parentNode.removeChild(element);
-            });
+            if (this.buttons) {
+                this.buttons.forEach(function (element) {
+                    if (element && element.parentNode) {
+                        element.parentNode.removeChild(element);
+                    }
+                });
+            }
         },
 
         /**

dev/tests/integration/testsuite/Magento/Cron/Observer/ProcessCronQueueObserverTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All rights reserved.
  */
 namespace Magento\Cron\Observer;
 
@@ -36,7 +36,7 @@ public function testDispatchScheduled()
             \Magento\Cron\Model\ResourceModel\Schedule\Collection::class
         );
         $collection->addFieldToFilter('status', \Magento\Cron\Model\Schedule::STATUS_PENDING);
-        $collection->addFieldToFilter('job_code', 'product_alert');
+        $collection->addFieldToFilter('job_code', 'catalog_product_alert');
         $this->assertGreaterThan(0, $collection->count(), 'Cron has failed to schedule tasks for itself for future.');
     }