Merge branch '2.4-develop' into MC-40371

Author: nikita-shcherbatykh

app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php

@@ -34,8 +34,8 @@ public function execute()
                 /** @var $export \Magento\ImportExport\Model\Export */
                 $export = $this->_objectManager->create(\Magento\ImportExport\Model\Export::class);
                 $export->setData($data);
-                $export->filterAttributeCollection(
-                    $attrFilterBlock->prepareCollection($export->getEntityAttributeCollection())
+                $attrFilterBlock->prepareCollection(
+                    $export->filterAttributeCollection($export->getEntityAttributeCollection())
                 );
                 return $resultLayout;
             } catch (\Exception $e) {

app/code/Magento/Backend/Model/Validator/UrlKey/CompositeUrlKey.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Model\Validator\UrlKey;
+
+/**
+ * Class Composite validates if urlKey doesn't matches frontName or restricted words(endpoint names)
+ */
+class CompositeUrlKey implements UrlKeyValidatorInterface
+{
+    /**
+     * @var UrlKeyValidatorInterface[]
+     */
+    private $validators;
+
+    /**
+     * @param array $validators
+     */
+    public function __construct(
+        array $validators = []
+    ) {
+        $this->validators = $validators;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validate(string $urlKey): array
+    {
+        $errors = [];
+        foreach ($this->validators as $validator) {
+            $errors[] = $validator->validate($urlKey);
+        }
+
+        return array_merge([], ...$errors);
+    }
+}

app/code/Magento/Backend/Model/Validator/UrlKey/FrontName.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Model\Validator\UrlKey;
+
+use Magento\Backend\App\Area\FrontNameResolver;
+
+/**
+ * Class FrontName validates if urlKey doesn't matches frontName
+ */
+class FrontName implements UrlKeyValidatorInterface
+{
+    /**
+     * @var FrontNameResolver
+     */
+    private $frontNameResolver;
+
+    /**
+     * @param FrontNameResolver $frontNameResolver
+     */
+    public function __construct(
+        FrontNameResolver $frontNameResolver
+    ) {
+        $this->frontNameResolver = $frontNameResolver;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validate(string $urlKey): array
+    {
+        $errors = [];
+        $frontName = $this->frontNameResolver->getFrontName();
+        if ($urlKey == $frontName) {
+            $errors[] = __(
+                'URL key "%1" matches a reserved endpoint name (%2). Use another URL key.',
+                $urlKey,
+                $frontName
+            );
+        }
+
+        return $errors;
+    }
+}

app/code/Magento/Backend/Model/Validator/UrlKey/RestrictedWords.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Model\Validator\UrlKey;
+
+use Magento\Framework\Validator\UrlKey;
+
+/**
+ * Class RestrictedWords validates if urlKey doesn't matches restricted words(endpoint names)
+ */
+class RestrictedWords implements UrlKeyValidatorInterface
+{
+    /**
+     * @var UrlKey
+     */
+    private $urlKey;
+
+    /**
+     * @param UrlKey $urlKey
+     */
+    public function __construct(
+        UrlKey $urlKey
+    ) {
+        $this->urlKey = $urlKey;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validate(string $urlKey): array
+    {
+        $errors = [];
+        if (!$this->urlKey->isValid($urlKey)) {
+            $errors[] = __(
+                'URL key "%1" matches a reserved endpoint name (%2). Use another URL key.',
+                $urlKey,
+                implode(', ', $this->urlKey->getRestrictedValues())
+            );
+        }
+
+        return $errors;
+    }
+}

app/code/Magento/Backend/Model/Validator/UrlKey/UrlKeyValidatorInterface.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Model\Validator\UrlKey;
+
+/**
+ * Interface UrlKeyValidatorInterface is responsive for validating urlKeys
+ */
+interface UrlKeyValidatorInterface
+{
+    /**
+     * Validates urlKey
+     *
+     * @param string $urlKey
+     * @return array
+     */
+    public function validate(string $urlKey): array;
+}

app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml

@@ -69,8 +69,8 @@
         <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
         <!-- Place Order -->
         <comment userInput="Place order" stepKey="placeOrder"/>
-        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
-        <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="seeSuccessTitle"/>
+        <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrder"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeSuccessTitle"/>
         <see selector="{{CheckoutSuccessMainSection.orderNumberText}}" userInput="Your order number is: " stepKey="seeOrderNumber"/>
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
         <!-- Search for Order in the order grid -->

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

@@ -188,4 +188,12 @@
             <argument name="anchorRenderer" xsi:type="object">Magento\Backend\Block\AnchorRenderer</argument>
         </arguments>
     </type>
+    <type name="Magento\Backend\Model\Validator\UrlKey\CompositeUrlKey">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="frontNameValidator" xsi:type="object">Magento\Backend\Model\Validator\UrlKey\FrontName</item>
+                <item name="restrictedWordsValidator" xsi:type="object">Magento\Backend\Model\Validator\UrlKey\RestrictedWords</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

app/code/Magento/Backend/i18n/en_US.csv

@@ -466,3 +466,4 @@ Pagination,Pagination
 "Theme Name","Theme Name"
 "Use URL parameter to enable template path hints for Storefront","Use URL parameter to enable template path hints for Storefront"
 "Add the following parameter to the URL to show template hints ?templatehints=[parameter_value]","Add the following parameter to the URL to show template hints ?templatehints=[parameter_value]"
+"URL key "%1" matches a reserved endpoint name (%2). Use another URL key.","URL key "%1" matches a reserved endpoint name (%2). Use another URL key."

app/code/Magento/Catalog/Model/ImageUploader.php

@@ -3,12 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\File\Uploader;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\File\Name;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
@@ -211,7 +211,7 @@ public function moveFileFromTmp($imageName, $returnRelativePath = false)
         $baseTmpImagePath = $this->getFilePath($baseTmpPath, $imageName);
 
         try {
-            $this->coreFileStorageDatabase->copyFile(
+            $this->coreFileStorageDatabase->renameFile(
                 $baseTmpImagePath,
                 $baseImagePath
             );

app/code/Magento/Catalog/Model/Product/Type/AbstractType.php

@@ -504,21 +504,17 @@ public function processFileQueue()
                         /** @var $uploader \Zend_File_Transfer_Adapter_Http */
                         $uploader = $queueOptions['uploader'] ?? null;
                         $isUploaded = false;
-                        if ($uploader && $uploader->isValid()) {
+                        if ($uploader && $uploader->isValid($src)) {
+                            // phpcs:ignore Magento2.Functions.DiscouragedFunction
                             $path = pathinfo($dst, PATHINFO_DIRNAME);
                             $uploader = $this->uploaderFactory->create(['fileId' => $src]);
                             $uploader->setFilesDispersion(false);
                             $uploader->setAllowRenameFiles(true);
+                            // phpcs:ignore Magento2.Functions.DiscouragedFunction
                             $isUploaded = $uploader->save($path, pathinfo($dst, PATHINFO_FILENAME));
                         }
 
                         if (empty($src) || empty($dst) || !$isUploaded) {
-                            /**
-                             * @todo: show invalid option
-                             */
-                            if (isset($queueOptions['option'])) {
-                                $queueOptions['option']->setIsValid(false);
-                            }
                             throw new \Magento\Framework\Exception\LocalizedException(
                                 __('The file upload failed. Try to upload again.')
                             );