Merge branch '2.4.7-beta3-develop' into Hammer-2.4.7-Beta3-Delivery-22feb

Author: sidolov

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -6,6 +6,7 @@
 
 namespace Magento\CatalogImportExport\Model\Import;
 
+use Magento\AwsS3\Driver\AwsS3;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Config as CatalogConfig;
 use Magento\Catalog\Model\Indexer\Product\Category as ProductCategoryIndexer;
@@ -2309,6 +2310,14 @@ protected function _getUploader()
 
             $tmpPath = $this->getImportDir();
 
+            if (is_a($this->_mediaDirectory->getDriver(), AwsS3::class)) {
+                if (!$this->_mediaDirectory->create($tmpPath)) {
+                    throw new LocalizedException(
+                        __('Directory \'%1\' could not be created.', $tmpPath)
+                    );
+                }
+            }
+
             if (!$fileUploader->setTmpDir($tmpPath)) {
                 throw new LocalizedException(
                     __('File directory \'%1\' is not readable.', $tmpPath)

app/code/Magento/CatalogImportExport/composer.json

@@ -17,7 +17,8 @@
         "magento/module-media-storage": "*",
         "magento/module-store": "*",
         "magento/module-tax": "*",
-        "magento/module-authorization": "*"
+        "magento/module-authorization": "*",
+        "magento/module-aws-s3": "*"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/ConfigurableProduct/etc/adminhtml/di.xml

@@ -81,4 +81,7 @@
     <type name="Magento\Sales\Model\Order\Invoice">
         <plugin name="update_configurable_product_total_qty" type="Magento\ConfigurableProduct\Plugin\Model\Order\Invoice\UpdateConfigurableProductTotalQty"/>
     </type>
+    <type name="Magento\CatalogWidget\Block\Product\ProductsList">
+        <plugin name="configurable_product_widget_product_list" type="Magento\ConfigurableProduct\Plugin\CatalogWidget\Block\Product\ProductsListPlugin" sortOrder="2"/>
+    </type>
 </config>

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

@@ -21,9 +21,6 @@
     <preference for="Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price\OptionsSelectBuilderInterface" type="Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price\OptionsSelectBuilder" />
     <preference for="Magento\ConfigurableProduct\Pricing\Price\ConfigurableOptionsFilterInterface" type="Magento\ConfigurableProduct\Pricing\Price\ConfigurableOptionsCompositeFilter" />
 
-    <type name="Magento\CatalogWidget\Block\Product\ProductsList">
-        <plugin name="configurable_product_widget_product_list" type="Magento\ConfigurableProduct\Plugin\CatalogWidget\Block\Product\ProductsListPlugin" sortOrder="2"/>
-    </type>
     <type name="Magento\CatalogInventory\Model\Quote\Item\QuantityValidator\Initializer\Option">
         <plugin name="configurable_product" type="Magento\ConfigurableProduct\Model\Quote\Item\QuantityValidator\Initializer\Option\Plugin\ConfigurableProduct" sortOrder="50" />
     </type>

app/code/Magento/ConfigurableProduct/etc/frontend/di.xml

@@ -23,4 +23,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\CatalogWidget\Block\Product\ProductsList">
+        <plugin name="configurable_product_widget_product_list" type="Magento\ConfigurableProduct\Plugin\CatalogWidget\Block\Product\ProductsListPlugin" sortOrder="2"/>
+    </type>
 </config>

app/code/Magento/DownloadableImportExport/Helper/Uploader.php

@@ -6,6 +6,7 @@
 namespace Magento\DownloadableImportExport\Helper;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem\Driver\File;
 
 /**
@@ -76,7 +77,7 @@ public function __construct(
      * @param string $type
      * @param array $parameters
      * @return \Magento\CatalogImportExport\Model\Import\Uploader
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function getUploader($type, $parameters)
     {
@@ -94,8 +95,14 @@ public function getUploader($type, $parameters)
             $tmpPath = $dirAddon . '/' . $this->mediaDirectory->getRelativePath('import');
         }
 
+        if (!$this->mediaDirectory->create($tmpPath)) {
+            throw new LocalizedException(
+                __('Directory \'%1\' could not be created.', $tmpPath)
+            );
+        }
+
         if (!$this->fileUploader->setTmpDir($tmpPath)) {
-            throw new \Magento\Framework\Exception\LocalizedException(
+            throw new LocalizedException(
                 __('File directory \'%1\' is not readable.', $tmpPath)
             );
         }
@@ -104,7 +111,7 @@ public function getUploader($type, $parameters)
 
         $this->mediaDirectory->create($destinationPath);
         if (!$this->fileUploader->setDestDir($destinationPath)) {
-            throw new \Magento\Framework\Exception\LocalizedException(
+            throw new LocalizedException(
                 __('File directory \'%1\' is not writable.', $destinationPath)
             );
         }

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductCanonicalUrlTest.php

@@ -7,20 +7,38 @@
 
 namespace Magento\GraphQl\Catalog;
 
+use Magento\Catalog\Model\Indexer\Category\Product;
+use Magento\Catalog\Model\Indexer\Product\Category;
+use Magento\CatalogSearch\Model\Indexer\Fulltext as IndexerSearch;
+use Magento\Indexer\Model\Indexer;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
  * Test for getting canonical_url for products
  */
 class ProductCanonicalUrlTest extends GraphQlAbstract
 {
+    /** @var ObjectManager */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+    }
+
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoConfigFixture default_store catalog/seo/product_canonical_tag 1
      *
      */
     public function testProductWithCanonicalLinksMetaTagSettingsEnabled()
     {
+        $this->reindex();
         $productSku = 'simple';
         $query
             = <<<QUERY
@@ -71,4 +89,15 @@ public function testProductWithCanonicalLinksMetaTagSettingsDisabled()
         );
         $this->assertEquals('simple', $response['products']['items'][0]['sku']);
     }
+
+    private function reindex()
+    {
+        $indexer = $this->objectManager->create(Indexer::class);
+        $indexer->load(Product::INDEXER_ID);
+        $indexer->reindexAll();
+        $indexer->load(Category::INDEXER_ID);
+        $indexer->reindexAll();
+        $indexer->load(IndexerSearch::INDEXER_ID);
+        $indexer->reindexAll();
+    }
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableOptionsSelectionTest.php

@@ -42,8 +42,14 @@ class ConfigurableOptionsSelectionTest extends GraphQlAbstract
      */
     private $idEncoder;
 
+    /**
+     * @var AttributeInterface
+     */
     private $firstConfigurableAttribute;
 
+    /**
+     * @var AttributeInterface
+     */
     private $secondConfigurableAttribute;
 
     /**
@@ -338,6 +344,7 @@ private function reindexAll(): void
     {
         $indexLists = [
             'catalog_category_product',
+            'catalog_product_category',
             'catalog_product_attribute',
             'cataloginventory_stock',
             'catalogsearch_fulltext',