Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into ACP2E-3038

alzota · alzota · commit fd28d536f9d0 · 2024-06-18T16:12:06.000+03:00
diff --git a/app/code/Magento/AwsS3/Test/Mftf/Helper/DummyMetadataCache.php b/app/code/Magento/AwsS3/Test/Mftf/Helper/DummyMetadataCache.php
@@ -83,4 +83,11 @@ public function updateMetadata(string $path, array $objectMetadata, bool $persis
     public function storeFileNotExists(string $path): void
     {
     }
+
+    /**
+     * @inheirtDoc
+     */
+    public function storeDirNotExists(string $path): void
+    {
+    }
 }
diff --git a/app/code/Magento/AwsS3/Test/Mftf/Helper/S3FileAssertions.php b/app/code/Magento/AwsS3/Test/Mftf/Helper/S3FileAssertions.php
@@ -26,6 +26,11 @@ class S3FileAssertions extends Helper
      */
     private $driver;
 
+    /**
+     * @var AwsS3V3Adapter
+     */
+    private $adapter;
+
     /**
      * Call the parent constructor then create the AwsS3 driver from environment variables
      *
@@ -65,6 +70,7 @@ public function __construct(ModuleContainer $moduleContainer, ?array $config = n
         $s3Driver = new AwsS3($adapter, new MockTestLogger(), $objectUrl, $metadataProvider);
 
         $this->driver = $s3Driver;
+        $this->adapter = $adapter;
     }
 
     /**
@@ -196,10 +202,11 @@ public function assertGlobbedFileExists($path, $pattern, $message = ''): void
      * @return void
      *
      * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws \League\Flysystem\FilesystemException
      */
     public function assertDirectoryExists($path, $message = ''): void
     {
-        $this->assertTrue($this->driver->isDirectory($path), "Failed asserting $path exists. " . $message);
+        $this->assertTrue($this->adapter->directoryExists($path), "Failed asserting $path exists. " . $message);
     }
 
     /**
diff --git a/app/code/Magento/AwsS3/Test/Unit/Driver/AwsS3Test.php b/app/code/Magento/AwsS3/Test/Unit/Driver/AwsS3Test.php
@@ -439,8 +439,8 @@ public function testSearchDirectory(): void
         $this->metadataProviderMock->expects(self::any())->method('getMetadata')
             ->willReturnMap([
                 ['path', ['type' => AwsS3::TYPE_DIR]],
-                ['path/1', ['type' => AwsS3::TYPE_FILE]],
-                ['path/2', ['type' => AwsS3::TYPE_FILE]],
+                ['path/1', ['type' => AwsS3::TYPE_DIR]],
+                ['path/2', ['type' => AwsS3::TYPE_DIR]],
             ]);
         $this->adapterMock->expects(self::atLeastOnce())->method('listContents')
             ->willReturn(new \ArrayIterator($subPaths));
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminClearCustomersFiltersActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminClearCustomersFiltersActionGroup.xml
@@ -16,5 +16,6 @@
         <amOnPage url="{{AdminCustomerPage.url}}" stepKey="amOnCustomersPage"/>
         <waitForPageLoad stepKey="WaitForPageToLoad"/>
         <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
+        <waitForPageLoad stepKey="waitForCustomersFilterToBeDeleted"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminAddNewDefaultBillingShippingCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminAddNewDefaultBillingShippingCustomerAddressTest.xml
@@ -30,6 +30,7 @@
         <after>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="resetCustomerFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- -
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridTest.xml
@@ -28,6 +28,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearCustomersFilter"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest.xml
@@ -27,6 +27,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearCustomersFilter"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteDefaultBillingCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteDefaultBillingCustomerAddressTest.xml
@@ -27,6 +27,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearCustomersFilter"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminEditCustomerWithAssociatedNewsletterQueueNewTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminEditCustomerWithAssociatedNewsletterQueueNewTest.xml
@@ -37,6 +37,8 @@
             <actionGroup ref="AdminMarketingOpenNewsletterTemplateFromGridActionGroup" stepKey="openTemplate"/>
             <actionGroup ref="AdminMarketingDeleteNewsletterTemplateActionGroup" stepKey="deleteTemplate"/>
 
+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearCustomersFilter"/>
+
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminEditCustomerWithAssociatedNewsletterQueueTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminEditCustomerWithAssociatedNewsletterQueueTest.xml
@@ -42,6 +42,8 @@
             <actionGroup ref="AdminMarketingOpenNewsletterTemplateFromGridActionGroup" stepKey="openTemplate"/>
             <actionGroup ref="AdminMarketingDeleteNewsletterTemplateActionGroup" stepKey="deleteTemplate"/>
 
+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearCustomersFilter"/>
+
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminEditDefaultBillingShippingCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminEditDefaultBillingShippingCustomerAddressTest.xml
@@ -27,6 +27,7 @@
         </before>
         <after>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearCustomersFilter"/>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminResetCustomerPasswordTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminResetCustomerPasswordTest.xml
@@ -27,6 +27,7 @@
         </before>
         <after>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearCustomersFilter"/>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminSearchCustomerAddressByKeywordTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminSearchCustomerAddressByKeywordTest.xml
@@ -27,6 +27,7 @@
         </before>
         <after>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearCustomersFilter"/>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultBillingAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultBillingAddressTest.xml
@@ -27,6 +27,7 @@
         </before>
         <after>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearCustomersFilter"/>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultShippingAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultShippingAddressTest.xml
@@ -27,6 +27,7 @@
         </before>
         <after>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearCustomersFilter"/>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCustomerAddressRequiredFieldsTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCustomerAddressRequiredFieldsTest.xml
@@ -28,6 +28,7 @@
         </before>
         <after>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearCustomersFilter"/>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCustomerSubscribeToNewsletterAndVerifyInAdminTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCustomerSubscribeToNewsletterAndVerifyInAdminTest.xml
@@ -25,6 +25,7 @@
         </actionGroup>
     </before>
     <after>
+        <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearFilters"/>
         <deleteData createDataKey="createCustomer" stepKey="deleteCreatedCustomer"/>
         <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
     </after>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml
@@ -55,6 +55,7 @@
             <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
                 <argument name="customerEmail" value="Simple_US_Customer_Assistance_Allowed.email"/>
             </actionGroup>
+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="resetCustomerFilters"/>
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
                 <argument name="websiteName" value="{{customWebsite.name}}"/>
             </actionGroup>
diff --git a/app/code/Magento/RemoteStorage/Driver/Adapter/Cache/CacheInterface.php b/app/code/Magento/RemoteStorage/Driver/Adapter/Cache/CacheInterface.php
@@ -93,4 +93,12 @@ public function updateMetadata(string $path, array $objectMetadata, bool $persis
      * @param string $path
      */
     public function storeFileNotExists(string $path): void;
+
+    /**
+     * Store flag that dir path does not exist
+     *
+     * @param string $path
+     * @return void
+     */
+    public function storeDirNotExists(string $path): void;
 }
diff --git a/app/code/Magento/RemoteStorage/Driver/Adapter/Cache/Generic.php b/app/code/Magento/RemoteStorage/Driver/Adapter/Cache/Generic.php
@@ -117,6 +117,23 @@ public function storeFileNotExists(string $path): void
         );
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function storeDirNotExists(string $path): void
+    {
+        $object = [
+            'type' => 'dir',
+            'path' => $path,
+        ];
+        $this->cacheData[$path] = $object;
+        $this->cacheAdapter->save(
+            $this->serializer->serialize([$path => $this->cacheData[$path]]),
+            $this->prefix . $path,
+            [self::CACHE_TAG]
+        );
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/app/code/Magento/RemoteStorage/Driver/Adapter/CachedAdapter.php b/app/code/Magento/RemoteStorage/Driver/Adapter/CachedAdapter.php
@@ -50,7 +50,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function write(string $path, string $contents, Config $config): void
     {
@@ -63,7 +63,7 @@ public function write(string $path, string $contents, Config $config): void
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function writeStream(string $path, $contents, Config $config): void
     {
@@ -76,7 +76,7 @@ public function writeStream(string $path, $contents, Config $config): void
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function move(string $source, string $destination, Config $config): void
     {
@@ -85,7 +85,7 @@ public function move(string $source, string $destination, Config $config): void
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function copy(string $source, string $destination, Config $config): void
     {
@@ -94,7 +94,7 @@ public function copy(string $source, string $destination, Config $config): void
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function delete(string $path): void
     {
@@ -103,7 +103,7 @@ public function delete(string $path): void
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function deleteDirectory(string $path): void
     {
@@ -112,7 +112,7 @@ public function deleteDirectory(string $path): void
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function createDirectory(string $path, Config $config): void
     {
@@ -123,7 +123,7 @@ public function createDirectory(string $path, Config $config): void
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setVisibility(string $path, string $visibility): void
     {
@@ -132,7 +132,7 @@ public function setVisibility(string $path, string $visibility): void
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function fileExists(string $path): bool
     {
@@ -165,31 +165,64 @@ public function fileExists(string $path): bool
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     */
+    public function directoryExists(string $path): bool
+    {
+        $cacheHas = $this->cache->exists($path);
+
+        if ($cacheHas !== null) {
+            return $cacheHas;
+        }
+
+        $exists = $this->adapter->directoryExists($path);
+
+        if (!$exists) {
+            try {
+                // check if target is a directory
+                $exists = iterator_count($this->adapter->listContents($path, false)) > 0;
+            } catch (\Throwable $e) {
+                // catch closed iterator
+                $exists = false;
+            }
+        }
+
+        if ($exists) {
+            $cacheEntry = ['type' => 'dir', 'path' => $path];
+            $this->cache->updateMetadata($path, $cacheEntry, true);
+        } else {
+            $this->cache->storeDirNotExists($path);
+        }
+
+        return $exists;
+    }
+
+    /**
+     * @inheritdoc
      */
     public function read(string $path): string
     {
         return $this->adapter->read($path);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function readStream(string $path)
     {
         return $this->adapter->readStream($path);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function listContents(string $path, bool $deep): iterable
     {
         return $this->adapter->listContents($path, $deep);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function fileSize(string $path): FileAttributes
     {
@@ -198,7 +231,7 @@ public function fileSize(string $path): FileAttributes
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function mimeType(string $path): FileAttributes
     {
@@ -207,7 +240,7 @@ public function mimeType(string $path): FileAttributes
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function lastModified(string $path): FileAttributes
     {
@@ -216,7 +249,7 @@ public function lastModified(string $path): FileAttributes
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function visibility(string $path): FileAttributes
     {
diff --git a/app/code/Magento/RemoteStorage/composer.json b/app/code/Magento/RemoteStorage/composer.json
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveConfigurableProductsInComparedOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveConfigurableProductsInComparedOnOrderPageTest.xml
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveSimpleProductsInComparedOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveSimpleProductsInComparedOnOrderPageTest.xml
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/AdminConfigureCustomerWishListItemTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/AdminConfigureCustomerWishListItemTest.xml
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/AdminDeleteCustomerWishlistItemTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/AdminDeleteCustomerWishlistItemTest.xml
diff --git a/composer.json b/composer.json
diff --git a/composer.lock b/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -83,4 +83,11 @@ public function updateMetadata(string $path, array $objectMetadata, bool $persis`
`83`	`83`	`public function storeFileNotExists(string $path): void`
`84`	`84`	`{`
`85`	`85`	`}`
	`86`	`+`
	`87`	`+ /**`
	`88`	`+ * @inheirtDoc`
	`89`	`+ */`
	`90`	`+ public function storeDirNotExists(string $path): void`
	`91`	`+ {`
	`92`	`+ }`
`86`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,11 @@ class S3FileAssertions extends Helper`
`26`	`26`	`*/`
`27`	`27`	`private $driver;`
`28`	`28`
	`29`	`+ /**`
	`30`	`+ * @var AwsS3V3Adapter`
	`31`	`+ */`
	`32`	`+ private $adapter;`
	`33`	`+`
`29`	`34`	`/**`
`30`	`35`	`* Call the parent constructor then create the AwsS3 driver from environment variables`
`31`	`36`	`*`
`@@ -65,6 +70,7 @@ public function __construct(ModuleContainer $moduleContainer, ?array $config = n`
`65`	`70`	`$s3Driver = new AwsS3($adapter, new MockTestLogger(), $objectUrl, $metadataProvider);`
`66`	`71`
`67`	`72`	`$this->driver = $s3Driver;`
	`73`	`+ $this->adapter = $adapter;`
`68`	`74`	`}`
`69`	`75`
`70`	`76`	`/**`
`@@ -196,10 +202,11 @@ public function assertGlobbedFileExists($path, $pattern, $message = ''): void`
`196`	`202`	`* @return void`
`197`	`203`	`*`
`198`	`204`	`* @throws \Magento\Framework\Exception\FileSystemException`
	`205`	`+ * @throws \League\Flysystem\FilesystemException`
`199`	`206`	`*/`
`200`	`207`	`public function assertDirectoryExists($path, $message = ''): void`
`201`	`208`	`{`
`202`		`- $this->assertTrue($this->driver->isDirectory($path), "Failed asserting $path exists. " . $message);`
	`209`	`+ $this->assertTrue($this->adapter->directoryExists($path), "Failed asserting $path exists. " . $message);`
`203`	`210`	`}`
`204`	`211`
`205`	`212`	`/**`