Merge remote-tracking branch 'upstream/2.4-develop' into 28573_wrong_thumbnail

Author: sasha19957099

.editorconfig

@@ -16,3 +16,7 @@ indent_size = 2
 
 [{composer, auth}.json]
 indent_size = 4
+
+[db_schema_whitelist.json]
+indent_size = 4
+trim_trailing_whitespace = false

.github/stale.yml

@@ -39,8 +39,9 @@ staleLabel: "stale issue"
 # Comment to post when marking as stale. Set to `false` to disable
 markComment: >
   This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed after 14 days if no further activity occurs. Thank you
-  for your contributions.
+  recent activity. It will be closed after 14 days if no further activity occurs.
+  Is this issue still relevant? If so, what is blocking it? Is there anything you can do to help move it forward?
+  Thank you for your contributions!
 # Comment to post when removing the stale label.
 # unmarkComment: >
 #   Your comment here.

app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php

@@ -486,7 +486,8 @@ private function fetchTierPrices(array $productIds): array
             )
             ->where(
                 'ap.' . $productEntityLinkField . ' IN (?)',
-                $productIds
+                $productIds,
+                \Zend_Db::INT_TYPE
             );
 
         if ($priceFromFilter !== null) {

app/code/Magento/AwsS3/Test/Mftf/Helper/MockTestLogger.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AwsS3\Test\Mftf\Helper;
+
+use Psr\Log\LoggerInterface;
+
+/**
+ * Mocked logger for using the AwsS3 driver in testing
+ *
+ * Ignores most log messages but throws errors on error/critical/emergency logs so tests will fail
+ */
+class MockTestLogger implements LoggerInterface {
+
+    public function emergency($message, array $context = array())
+    {
+        throw new \Exception($message);
+    }
+
+    public function alert($message, array $context = array())
+    {
+        // noop
+    }
+
+    public function critical($message, array $context = array())
+    {
+        throw new \Exception($message);
+    }
+
+    public function error($message, array $context = array())
+    {
+        throw new \Exception($message);
+    }
+
+    public function warning($message, array $context = array())
+    {
+        // noop
+    }
+
+    public function notice($message, array $context = array())
+    {
+        // noop
+    }
+
+    public function info($message, array $context = array())
+    {
+        // noop
+    }
+
+    public function debug($message, array $context = array())
+    {
+        // noop
+    }
+
+    public function log($level, $message, array $context = array())
+    {
+        // noop
+    }
+}

app/code/Magento/AwsS3/Test/Mftf/Helper/S3FileAssertions.php

@@ -0,0 +1,180 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AwsS3\Test\Mftf\Helper;
+
+use Aws\S3\S3Client;
+use Codeception\Lib\ModuleContainer;
+use League\Flysystem\AwsS3v3\AwsS3Adapter;
+use Magento\AwsS3\Driver\AwsS3;
+use Magento\FunctionalTestingFramework\Helper\Helper;
+use Magento\Framework\Filesystem\DriverInterface;
+
+/**
+ * Class for MFTF helpers for doing file assertions using S3.
+ */
+class S3FileAssertions extends Helper
+{
+    /**
+     * @var DriverInterface $driver
+     */
+    private $driver;
+
+    /**
+     * Call the parent constructor then create the AwsS3 driver from environment variables
+     *
+     * @param ModuleContainer $moduleContainer
+     * @param array|null $config
+     * @return void
+     */
+    public function __construct(ModuleContainer $moduleContainer, ?array $config = null)
+    {
+        parent::__construct($moduleContainer, $config);
+
+        $region = getenv('REMOTE_STORAGE_AWSS3_REGION');
+        $prefix = getenv('REMOTE_STORAGE_AWSS3_PREFIX');
+        $bucket = getenv('REMOTE_STORAGE_AWSS3_BUCKET');
+        $accessKey = getenv('REMOTE_STORAGE_AWSS3_ACCESS_KEY');
+        $secretKey = getenv('REMOTE_STORAGE_AWSS3_SECRET_KEY');
+
+        $config = [
+            'version' => 'latest',
+            'credentials' => [
+                'key' => $accessKey,
+                'secret' => $secretKey
+            ],
+            'bucket' => $bucket,
+            'region' => $region
+        ];
+
+        if (empty($config['credentials']['key']) || empty($config['credentials']['secret'])) {
+            unset($config['credentials']);
+        }
+
+        $client = new S3Client($config);
+        $adapter = new AwsS3Adapter($client, $config['bucket'], $prefix);
+        $objectUrl = $client->getObjectUrl($adapter->getBucket(), $adapter->applyPathPrefix('.'));
+        $s3Driver = new AwsS3($adapter, new MockTestLogger(), $objectUrl);
+
+        $this->driver = $s3Driver;
+    }
+
+    /**
+     * Create a file in the S3 bucket
+     *
+     * @param string $filePath
+     * @param string $text
+     * @return void
+     *
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    public function createTextFile($filePath, $text): void
+    {
+        $this->driver->filePutContents($filePath, $text);
+    }
+
+    /**
+     * Delete a file from the S3 bucket if it exists
+     *
+     * @param string $filePath
+     * @return void
+     *
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    public function deleteFileIfExists($filePath): void
+    {
+        if ($this->driver->isExists($filePath)) {
+            $this->driver->deleteFile($filePath);
+        }
+    }
+
+    /**
+     * Assert a file exists on the remote storage system
+     *
+     * @param string $filePath
+     * @param string $message
+     * @return void
+     *
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    public function assertFileExists($filePath, $message = ''): void
+    {
+        $this->assertTrue($this->driver->isExists($filePath), $message);
+    }
+
+    /**
+     * Assert a file does not exist on the remote storage system
+     *
+     * @param string $filePath
+     * @param string $message
+     * @return void
+     *
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    public function assertFileDoesNotExist($filePath, $message = ''): void
+    {
+        $this->assertFalse($this->driver->isExists($filePath), $message);
+    }
+
+    /**
+     * Assert a file on the remote storage system has no contents
+     *
+     * @param string $filePath
+     * @param string $message
+     * @return void
+     *
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    public function assertFileEmpty($filePath, $message = ""): void
+    {
+        $this->assertEmpty($this->driver->fileGetContents($filePath), $message);
+    }
+
+    /**
+     * Assert a file on the remote storage system is not empty
+     *
+     * @param string $filePath
+     * @param string $message
+     * @return void
+     *
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    public function assertFileNotEmpty($filePath, $message = ""): void
+    {
+        $this->assertNotEmpty($this->driver->fileGetContents($filePath), $message);
+    }
+
+    /**
+     * Assert a file on the remote storage system contains a given string
+     *
+     * @param string $filePath
+     * @param string $text
+     * @param string $message
+     * @return void
+     *
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    public function assertFileContainsString($filePath, $text, $message = ""): void
+    {
+        $this->assertStringContainsString($text, $this->driver->fileGetContents($filePath), $message);
+    }
+
+    /**
+     * Assert a file on the remote storage system does not contain a given string
+     *
+     * @param string $filePath
+     * @param string $text
+     * @param string $message
+     * @return void
+     *
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    public function assertFileDoesNotContain($filePath, $text, $message = ""): void
+    {
+        $this->assertStringNotContainsString($text, $this->driver->fileGetContents($filePath), $message);
+    }
+}

app/code/Magento/AwsS3/Test/Mftf/Test/AwsS3AdminImportSimpleAndConfigurableProductsWithAssignedImagesTest.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AwsS3AdminImportSimpleAndConfigurableProductsWithAssignedImagesTest" extends="AdminImportSimpleAndConfigurableProductsWithAssignedImagesTest">
+        <annotations>
+            <features value="AwsS3"/>
+            <stories value="Import Products"/>
+            <title value="S3 - Import Configurable Product With Simple Child Products With Images"/>
+            <description value="Imports a .csv file containing a configurable product with 3 child simple products that
+            have images. Verifies that products are imported successfully and that the images are attached to the
+            products as expected."/>
+            <severity value="MAJOR"/>
+            <group value="importExport"/>
+            <group value="remote_storage_aws_s3"/>
+            <skip>
+                <issueId value="MC-39280"/>
+            </skip>
+        </annotations>
+
+        <before>
+            <!-- Enable AWS S3 Remote Storage -->
+            <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage"/>
+        </before>
+
+        <after>
+            <!-- Disable AWS S3 Remote Storage -->
+            <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage"/>
+        </after>
+    </test>
+</tests>

app/code/Magento/Backend/App/Action/Plugin/Authentication.php

@@ -225,7 +225,8 @@ protected function _redirectIfNeededAfterLogin(\Magento\Framework\App\RequestInt
 
         // Checks, whether secret key is required for admin access or request uri is explicitly set
         if ($this->_url->useSecretKey()) {
-            $requestUri = $this->_url->getUrl('*/*/*', ['_current' => true]);
+            $requestParts = explode('/', trim($request->getRequestUri(), '/'), 2);
+            $requestUri = $this->_url->getUrl(array_pop($requestParts));
         } elseif ($request) {
             $requestUri = $request->getRequestUri();
         }

app/code/Magento/Backend/App/Area/FrontNameResolver.php

@@ -123,7 +123,13 @@ public function isHostBackend()
         if ($this->scopeConfig->getValue(self::XML_PATH_USE_CUSTOM_ADMIN_URL, ScopeInterface::SCOPE_STORE)) {
             $backendUrl = $this->scopeConfig->getValue(self::XML_PATH_CUSTOM_ADMIN_URL, ScopeInterface::SCOPE_STORE);
         } else {
-            $backendUrl = $this->scopeConfig->getValue(Store::XML_PATH_UNSECURE_BASE_URL, ScopeInterface::SCOPE_STORE);
+            $backendUrl = $this->config->getValue(Store::XML_PATH_UNSECURE_BASE_URL);
+            if ($backendUrl === null) {
+                $backendUrl = $this->scopeConfig->getValue(
+                    Store::XML_PATH_UNSECURE_BASE_URL,
+                    ScopeInterface::SCOPE_STORE
+                );
+            }
         }
         $host = $this->request->getServer('HTTP_HOST', '');
         return stripos($this->getHostWithPort($backendUrl), (string) $host) !== false;

app/code/Magento/Backend/Block/Widget/Button.php

@@ -5,9 +5,9 @@
  */
 namespace Magento\Backend\Block\Widget;
 
+use Magento\Backend\Block\Template\Context;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Math\Random;
-use Magento\Backend\Block\Template\Context;
 use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 /**
@@ -125,6 +125,9 @@ protected function _prepareAttributes($title, $classes, $disabled)
             'value' => $this->getValue(),
             'disabled' => $disabled,
         ];
+        if ($this->hasData('onclick_attribute')) {
+            $attributes['onclick'] = $this->getData('onclick_attribute');
+        }
         if ($this->hasData('backend_button_widget_hook_id')) {
             $attributes['backend-button-widget-hook-id'] = $this->getData('backend_button_widget_hook_id');
         }

app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php

@@ -49,11 +49,10 @@ public function execute()
         }
 
         $requestUrl = $this->getRequest()->getUri();
-        $backendUrl = $this->getUrl('*');
-        // redirect according to rewrite rule
-        if ($requestUrl != $backendUrl) {
-            return $this->getRedirect($backendUrl);
+        if (!$requestUrl->isValid()) {
+            return $this->getRedirect($this->getUrl('*'));
         }
+
         return $this->resultPageFactory->create();
     }