Merge branch '2.4-develop' of https://github.com/magento-gl/magento2ce into functiona-tests-mainline-deployment-1

Author: manjusha729

app/code/Magento/AwsS3/Test/Mftf/Helper/DummyMetadataCache.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);
 
@@ -13,72 +13,72 @@
 class DummyMetadataCache implements \Magento\RemoteStorage\Driver\Adapter\Cache\CacheInterface
 {
     /**
-     * @inheirtDoc
+     * @inheritDoc
      */
     public function exists(string $path): ?bool
     {
         return null;
     }
 
     /**
-     * @inheirtDoc
+     * @inheritDoc
      */
     public function getMetadata(string $path): ?array
     {
         return null;
     }
 
     /**
-     * @inheirtDoc
+     * @inheritDoc
      */
     public function flushCache(): void
     {
     }
 
     /**
-     * @inheirtDoc
+     * @inheritDoc
      */
     public function purgeQueue(): void
     {
     }
 
     /**
-     * @inheirtDoc
+     * @inheritDoc
      */
     public function moveFile(string $path, string $newpath): void
     {
     }
 
     /**
-     * @inheirtDoc
+     * @inheritDoc
      */
     public function copyFile(string $path, string $newpath): void
     {
     }
 
     /**
-     * @inheirtDoc
+     * @inheritDoc
      */
     public function deleteFile(string $path): void
     {
     }
 
     /**
-     * @inheirtDoc
+     * @inheritDoc
      */
     public function deleteDir(string $dirname): void
     {
     }
 
     /**
-     * @inheirtDoc
+     * @inheritDoc
      */
     public function updateMetadata(string $path, array $objectMetadata, bool $persist = false): void
     {
     }
 
     /**
-     * @inheirtDoc
+     * @inheritDoc
      */
     public function storeFileNotExists(string $path): void
     {

app/code/Magento/Backend/view/adminhtml/ui_component/design_config_listing.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 -->
 <listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
@@ -16,5 +16,10 @@
                 <label translate="true">Theme Name</label>
             </settings>
         </column>
+        <column name="short_description" sortOrder="45">
+            <settings>
+                <label translate="true">Short Description</label>
+            </settings>
+        </column>
     </columns>
 </listing>

app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -18,8 +18,6 @@
             <testCaseId value="MC-115"/>
             <group value="Bundle"/>
             <group value="cloud"/>
-            <!-- Excluded from PR builds due to AC-12124 -->
-            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

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

@@ -1,8 +1,8 @@
 <?php
 /**
  *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
@@ -269,6 +269,11 @@ public function execute()
 
             unset($data['entity_type_id']);
 
+            if (array_key_exists('reset_is-default_option', $data) && $data['reset_is-default_option']) {
+                unset($data['reset_is-default_option']);
+                $data['default_value'] = null;
+            }
+
             $model->addData($data);
 
             if (!$attributeId) {

app/code/Magento/Catalog/Model/Product/Image/RemoveDeletedImagesFromCache.php

@@ -1,16 +1,26 @@
 <?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+/************************************************************************
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ***********************************************************************
  */
+
 declare(strict_types=1);
 
 namespace Magento\Catalog\Model\Product\Image;
 
 use Magento\Catalog\Helper\Image;
 use Magento\Catalog\Model\Product\Media\Config;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Encryption\Encryptor;
 use Magento\Framework\Encryption\EncryptorInterface;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
@@ -21,6 +31,11 @@
  */
 class RemoveDeletedImagesFromCache
 {
+    /**
+     * Current hashing algorithm
+     */
+    private const HASH_ALGORITHM = 'md5';
+
     /**
      * @var ConfigInterface
      */
@@ -103,10 +118,10 @@ public function removeDeletedImagesFromCache(array $files): void
                 unset($imageMiscParams['image_type']);
             }
 
-            $cacheId = $this->encryptor->hash(
+            $cacheId = hash(
+                self::HASH_ALGORITHM,
                 implode('_', $this->convertImageMiscParamsToReadableFormat
-                    ->convertImageMiscParamsToReadableFormat($imageMiscParams)),
-                Encryptor::HASH_VERSION_MD5
+                ->convertImageMiscParamsToReadableFormat($imageMiscParams))
             );
 
             foreach ($files as $filePath) {

app/code/Magento/Catalog/Model/Product/Option/Type/Select.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Catalog\Model\Product\Option\Type;
@@ -70,6 +70,7 @@ public function __construct(
      * @param array $values All product option values, i.e. array (option_id => mixed, option_id => mixed...)
      * @return $this
      * @throws LocalizedException
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function validateUserValue($values)
     {
@@ -92,6 +93,8 @@ public function validateUserValue($values)
             if (!$this->_isSingleSelection()) {
                 if (is_string($value)) {
                     $value = explode(',', $value);
+                } elseif (!is_array($value)) {
+                    $value = [$value];
                 }
                 $valuesCollection = $option->getOptionValuesByOptionId($value, $this->getProduct()->getStoreId());
                 $valueCount = is_array($value) ? count($value) : 0;