Merge branch '2.4-develop' into L3_PR_21-10-10

Author: veloraven

dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementCustomAttributesTest.php

@@ -186,7 +186,9 @@ protected function verifyImageAttribute($customAttributeArray, $expectedFileName
                 $this->assertStringContainsString($expectedFileName, $customAttribute[AttributeValue::VALUE]);
                 $mediaDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::MEDIA);
                 $customerMediaPath = $mediaDirectory->getAbsolutePath(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER);
-                $imageAttributeFound = file_exists($customerMediaPath . $customAttribute[AttributeValue::VALUE]);
+                $imageAttributeFound = $mediaDirectory->getDriver()->isExists(
+                    $customerMediaPath . $customAttribute[AttributeValue::VALUE]
+                );
                 $this->assertTrue($imageAttributeFound, 'Expected file was not created');
             }
         }

dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_combination.php

@@ -51,7 +51,6 @@
 
 /** @var WriteInterface $mediaDirectory */
 $mediaDirectory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
-$mediaPath = $mediaDirectory->getAbsolutePath();
 $baseTmpMediaPath = $config->getBaseTmpMediaPath();
 $mediaDirectory->create($baseTmpMediaPath);
 
@@ -65,9 +64,10 @@
 $associatedProductIds = [];
 $firstAttributeValues =  [];
 $secondAttributeValues = [];
+
 $testImagePath = __DIR__ . '/magento_image.jpg';
-$mediaImage = $mediaPath . '/' . $baseTmpMediaPath . '/magento_image.jpg';
-copy($testImagePath, $mediaImage);
+$mediaImage = $mediaDirectory->getAbsolutePath($baseTmpMediaPath . DIRECTORY_SEPARATOR . 'magento_image.jpg');
+$result = $mediaDirectory->getDriver()->filePutContents($mediaImage, file_get_contents($testImagePath));
 
 array_shift($firstAttributeOptions);
 array_shift($secondAttributeOptions);