Merge pull request #10119 from magento-gl/spartans_pr_19092025

[Spartans] BugFix Delivery

Author: glo71317

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php

@@ -273,7 +273,7 @@ public function execute()
                 $data['default_value'] = null;
             } elseif (isset($data['default'])) {
                 $defaultOptions = [];
-                foreach ($data['default'] as $defaultValue) {
+                foreach ((array)$data['default'] as $defaultValue) {
                     if ((int)$defaultValue > 0) {
                         $defaultOptions[] = $defaultValue;
                     }

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/SaveTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Catalog\Model\Product\Option\Type;
@@ -119,7 +119,7 @@ public static function prepareOptionValueForRequestDataProvider()
     /**
      * Check date in prepareForCart method with javascript calendar and Asia/Singapore timezone
      *
-     * @dataProvider testPrepareForCartDataProvider
+     * @dataProvider datePrepareForCartDataProvider
      * @param array $dateData
      * @param array $productOptionData
      * @param array $requestData
@@ -154,7 +154,7 @@ public function testPrepareForCart(
      *
      * @return array
      */
-    public static function testPrepareForCartDataProvider()
+    public static function datePrepareForCartDataProvider()
     {
         return [
             [

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/DateTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -225,7 +225,7 @@ private function prepareAttributeSet(array $additional): void
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/attribute_page_layout_default.php
-     * @dataProvider testModifyMetaNewProductPageLayoutDefaultProvider
+     * @dataProvider attrModifyMetaNewProductPageLayoutDefaultProvider
      * @return void
      */
     public function testModifyMetaNewProductPageLayoutDefault($attributesMeta): void
@@ -245,7 +245,7 @@ public function testModifyMetaNewProductPageLayoutDefault($attributesMeta): void
     /**
      * @return array
      */
-    public static function testModifyMetaNewProductPageLayoutDefaultProvider(): array
+    public static function attrModifyMetaNewProductPageLayoutDefaultProvider(): array
     {
         return [
             'attributes_meta' => [

dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/EavTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -171,7 +171,7 @@ public function testExecuteWithArrayInParam(array $searchParams): void
      * @magentoAppArea frontend
      * @magentoDataFixture Magento/CatalogSearch/_files/product_for_search.php
      * @magentoDataFixture Magento/CatalogSearch/_files/full_reindex.php
-     * @dataProvider testDataForAttributesCombination
+     * @dataProvider searchDataForAttributesCombination
      *
      * @param array $searchParams
      * @param bool $isProductShown
@@ -381,7 +381,7 @@ private function getAttributeOptionValueByOptionLabel(string $attributeCode, str
      *
      * @return array
      */
-    public static function testDataForAttributesCombination(): array
+    public static function searchDataForAttributesCombination(): array
     {
         return [
             'search_product_by_name_and_price' => [

dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Cms\Model;
 
@@ -58,7 +58,7 @@ protected function setUp(): void
      * @throws \Exception
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @magentoDbIsolation enabled
-     * @dataProvider testGetByIdentifierDataProvider
+     * @dataProvider blockGetByIdentifierDataProvider
      */
     public function testGetByIdentifier(array $blockData)
     {
@@ -79,7 +79,7 @@ public function testGetByIdentifier(array $blockData)
      * @throws \Exception
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @magentoDbIsolation enabled
-     * @dataProvider testGetByIdentifierDataProvider
+     * @dataProvider blockGetByIdentifierDataProvider
      */
     public function testUpdateTime(array $blockData)
     {
@@ -112,7 +112,7 @@ public function testUpdateTime(array $blockData)
      * Data provider for "testGetByIdentifier" and "testUpdateTime" method
      * @return array
      */
-    public static function testGetByIdentifierDataProvider(): array
+    public static function blockGetByIdentifierDataProvider(): array
     {
         return [
             [

dev/tests/integration/testsuite/Magento/Cms/Model/BlockTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Cms\Model;
 
@@ -34,7 +34,7 @@ protected function setUp(): void
      * @param array $pageData
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @magentoDbIsolation enabled
-     * @dataProvider testGetByIdentifierDataProvider
+     * @dataProvider pageGetByIdentifierDataProvider
      */
     public function testGetByIdentifier(array $pageData)
     {
@@ -122,7 +122,7 @@ public static function generateIdentifierFromTitleDataProvider() : array
      * Data provider for "testGetByIdentifier" method
      * @return array
      */
-    public static function testGetByIdentifierDataProvider() : array
+    public static function pageGetByIdentifierDataProvider() : array
     {
         return [
             ['pageData' => [

dev/tests/integration/testsuite/Magento/Cms/Model/PageTest.php

@@ -1,8 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- *
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Cms\Model\Wysiwyg\Images;
 
@@ -239,7 +238,7 @@ public function testUploadFileWithExcludedDirPath(): void
      * @param string|null $storageType
      *
      * @return void
-     * @dataProvider testUploadFileWithWrongExtensionDataProvider
+     * @dataProvider filenameUploadFileWithWrongExtensionDataProvider
      */
     public function testUploadFileWithWrongExtension(string $fileName, string $fileType, ?string $storageType): void
     {
@@ -268,7 +267,7 @@ public function testUploadFileWithWrongExtension(string $fileName, string $fileT
     /**
      * @return array
      */
-    public static function testUploadFileWithWrongExtensionDataProvider(): array
+    public static function filenameUploadFileWithWrongExtensionDataProvider(): array
     {
         return [
             [

dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php

@@ -10,6 +10,7 @@
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
+use Magento\Framework\Component\ComponentRegistrar;
 
 class DobColumnTest extends TestCase
 {
@@ -36,7 +37,9 @@ protected function setUp(): void
      */
     public function testDobColumnDoesNotHaveDateFormatInXml(): void
     {
-        $xmlPath = BP . '/app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml';
+        $componentRegistrar = Bootstrap::getObjectManager()->get(ComponentRegistrar::class);
+        $moduleDir = $componentRegistrar->getPath(ComponentRegistrar::MODULE, 'Magento_Customer');
+        $xmlPath = $moduleDir . '/view/adminhtml/ui_component/customer_listing.xml';
         $this->assertFileExists($xmlPath, 'Customer listing XML file should exist');
 
         $xmlContent = file_get_contents($xmlPath);

dev/tests/integration/testsuite/Magento/Customer/Ui/Component/Listing/Column/DobColumnTest.php

@@ -756,7 +756,7 @@ public function testValidateUploadFile()
     }
 
     /**
-     * @dataProvider testValidateUploadFileExceptionDataProvider
+     * @dataProvider imageValidateUploadFileExceptionDataProvider
      * @param string $fileName
      * @param string $expectedErrorMsg
      * @param bool $useFixture
@@ -779,7 +779,7 @@ public function testValidateUploadFileException($fileName, $expectedErrorMsg, $u
     /**
      * @return array
      */
-    public static function testValidateUploadFileExceptionDataProvider()
+    public static function imageValidateUploadFileExceptionDataProvider()
     {
         return [
             'image_notfound' => [