Merge remote-tracking branch 'origin/2.4-develop' into bugfix/issue-3…

…0009

.github/stale.yml

@@ -1,7 +1,7 @@
 # Configuration for probot-stale - https://github.com/probot/stale
 
 # Number of days of inactivity before an Issue or Pull Request becomes stale
- daysUntilStale: 76
+daysUntilStale: 76
 
 # Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
 # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
@@ -18,7 +18,7 @@ exemptLabels:
   - "Progress: dev in progress"
   - "Progress: PR in progress"
   - "Progress: done"
-  - "B2B: GraphQL"   
+  - "B2B: GraphQL"
   - "Progress: PR Created"
   - "PAP"
   - "Project: Login as Customer"

app/code/Magento/AdminNotification/Block/ToolbarEntry.php

@@ -10,7 +10,6 @@
  * Toolbar entry that shows latest notifications
  *
  * @api
- * @author      Magento Core Team <[email protected]>
  * @since 100.0.2
  */
 class ToolbarEntry extends \Magento\Backend\Block\Template

app/code/Magento/AdminNotification/Model/Feed.php

@@ -12,7 +12,6 @@
 /**
  * AdminNotification Feed model
  *
- * @author      Magento Core Team <[email protected]>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2

app/code/Magento/AdminNotification/Model/InboxInterface.php

@@ -8,7 +8,6 @@
 /**
  * AdminNotification Inbox interface
  *
- * @author Magento Core Team <[email protected]>
  * @api
  * @since 100.0.2
  */

app/code/Magento/AdminNotification/Model/NotificationService.php

@@ -8,7 +8,6 @@
 /**
  * Notification service model
  *
- * @author      Magento Core Team <[email protected]>
  * @api
  * @since 100.0.2
  */

app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php

@@ -6,8 +6,6 @@
 
 /**
  * AdminNotification Inbox model
- *
- * @author      Magento Core Team <[email protected]>
  */
 namespace Magento\AdminNotification\Model\ResourceModel\Grid;
 

app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php

@@ -9,8 +9,6 @@
  * AdminNotification Inbox model
  *
  * @api
- * @author      Magento Core Team <[email protected]>
- * @api
  * @since 100.0.2
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection

app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Unread.php

@@ -6,8 +6,6 @@
 
 /**
  * Collection of unread notifications
- *
- * @author      Magento Core Team <[email protected]>
  */
 namespace Magento\AdminNotification\Model\ResourceModel\Inbox\Collection;
 

app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php

@@ -9,8 +9,7 @@
 
 /**
  * AdminNotification observer
- *
- * @author      Magento Core Team <[email protected]>
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class PredispatchAdminActionControllerObserver implements ObserverInterface
 {

app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Edit.php

@@ -9,7 +9,6 @@
  * Search queries relations grid container
  *
  * @api
- * @author     Magento Core Team <[email protected]>
  * @since 100.0.2
  */
 class Edit extends \Magento\Backend\Block\Widget\Grid\Container

app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Grid.php

@@ -9,7 +9,6 @@
  * Search query relations edit grid
  *
  * @api
- * @author     Magento Core Team <[email protected]>
  * @since 100.0.2
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid

app/code/Magento/AdvancedSearch/Model/ResourceModel/Recommendations.php

@@ -8,7 +8,6 @@
 /**
  * Catalog search recommendations resource model
  *
- * @author      Magento Core Team <[email protected]>
  * @api
  * @since 100.0.2
  */

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php

@@ -42,6 +42,8 @@ public function __construct(
     }
 
     /**
+     * Construct block
+     *
      * @return void
      */
     protected function _construct()
@@ -51,6 +53,14 @@ protected function _construct()
 
         parent::_construct();
 
+        $this->buttonList->update('save', 'label', __('Save Attribute'));
+        $this->buttonList->update('save', 'class', 'save primary');
+        $this->buttonList->update(
+            'save',
+            'data_attribute',
+            ['mage-init' => ['button' => ['event' => 'save', 'target' => '#edit_form']]]
+        );
+
         if ($this->getRequest()->getParam('popup')) {
             $this->buttonList->remove('back');
             if ($this->getRequest()->getParam('product_tab') != 'variations') {
@@ -64,6 +74,8 @@ protected function _construct()
                     100
                 );
             }
+            $this->buttonList->update('reset', 'level', 10);
+            $this->buttonList->update('save', 'class', 'save action-secondary');
         } else {
             $this->addButton(
                 'save_and_edit_button',
@@ -79,14 +91,6 @@ protected function _construct()
             );
         }
 
-        $this->buttonList->update('save', 'label', __('Save Attribute'));
-        $this->buttonList->update('save', 'class', 'save primary');
-        $this->buttonList->update(
-            'save',
-            'data_attribute',
-            ['mage-init' => ['button' => ['event' => 'save', 'target' => '#edit_form']]]
-        );
-
         $entityAttribute = $this->_coreRegistry->registry('entity_attribute');
         if (!$entityAttribute || !$entityAttribute->getIsUserDefined()) {
             $this->buttonList->remove('delete');
@@ -96,14 +100,14 @@ protected function _construct()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'toolbar')
     {
         if ($this->getRequest()->getParam('popup')) {
             $region = 'header';
         }
-        parent::addButton($buttonId, $data, $level, $sortOrder, $region);
+        return parent::addButton($buttonId, $data, $level, $sortOrder, $region);
     }
 
     /**

app/code/Magento/Catalog/Block/Product/ListProduct.php

@@ -367,7 +367,7 @@ public function getIdentities()
                 $identities[] = $item->getIdentities();
             }
         }
-        $identities = array_merge(...$identities);
+        $identities = array_merge([], ...$identities);
 
         return $identities;
     }

app/code/Magento/Catalog/Block/Product/ProductList/Related.php

@@ -143,11 +143,11 @@ public function getItems()
      */
     public function getIdentities()
     {
-        $identities = [[]];
+        $identities = [];
         foreach ($this->getItems() as $item) {
             $identities[] = $item->getIdentities();
         }
-        return array_merge(...$identities);
+        return array_merge([], ...$identities);
     }
 
     /**

app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php

@@ -267,10 +267,10 @@ public function getItemLimit($type = '')
      */
     public function getIdentities()
     {
-        $identities = array_map(function (DataObject $item) {
-            return $item->getIdentities();
-        }, $this->getItems()) ?: [[]];
-
-        return array_merge(...$identities);
+        $identities = [];
+        foreach ($this->getItems() as $item) {
+            $identities[] = $item->getIdentities();
+        }
+        return array_merge([], ...$identities);
     }
 }

app/code/Magento/Catalog/Model/Attribute/Backend/DefaultBackend.php

@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Attribute\Backend;
+
+use Magento\Catalog\Model\AbstractModel;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Eav\Model\Entity\Attribute\Backend\DefaultBackend as ParentBackend;
+use Magento\Eav\Model\Entity\Attribute\Exception;
+use Magento\Framework\DataObject;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Validation\ValidationException;
+use Magento\Framework\Validator\HTML\WYSIWYGValidatorInterface;
+
+/**
+ * Default backend model for catalog attributes.
+ */
+class DefaultBackend extends ParentBackend
+{
+    /**
+     * @var WYSIWYGValidatorInterface
+     */
+    private $wysiwygValidator;
+
+    /**
+     * @param WYSIWYGValidatorInterface $wysiwygValidator
+     */
+    public function __construct(WYSIWYGValidatorInterface $wysiwygValidator)
+    {
+        $this->wysiwygValidator = $wysiwygValidator;
+    }
+
+    /**
+     * Validate user HTML value.
+     *
+     * @param DataObject $object
+     * @return void
+     * @throws LocalizedException
+     */
+    private function validateHtml(DataObject $object): void
+    {
+        $attribute = $this->getAttribute();
+        $code = $attribute->getAttributeCode();
+        if ($attribute instanceof Attribute && $attribute->getIsHtmlAllowedOnFront()) {
+            $value = $object->getData($code);
+            if ($value
+                && is_string($value)
+                && (!($object instanceof AbstractModel) || $object->getData($code) !== $object->getOrigData($code))
+            ) {
+                try {
+                    $this->wysiwygValidator->validate($object->getData($code));
+                } catch (ValidationException $exception) {
+                    $attributeException = new Exception(
+                        __(
+                            'Using restricted HTML elements for "%1". %2',
+                            $attribute->getName(),
+                            $exception->getMessage()
+                        ),
+                        $exception
+                    );
+                    $attributeException->setAttributeCode($code)->setPart('backend');
+                    throw $attributeException;
+                }
+            }
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function beforeSave($object)
+    {
+        parent::beforeSave($object);
+        $this->validateHtml($object);
+
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validate($object)
+    {
+        $isValid = parent::validate($object);
+        if ($isValid) {
+            $this->validateHtml($object);
+        }
+
+        return $isValid;
+    }
+}