Merge branch '2.4-develop' into B2B-2452

Author: dhaecker

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

@@ -416,7 +416,7 @@ protected function saveAndReplaceAdvancedPrices()
                         'website_id' => $this->getWebSiteId($rowData[self::COL_TIER_PRICE_WEBSITE])
                     ];
                     if (\Magento\ImportExport\Model\Import::BEHAVIOR_APPEND == $behavior) {
-                         $bunchTierPrices[$rowSku][] = $tierPrice;
+                        $bunchTierPrices[$rowSku][] = $tierPrice;
                     }
                     if (\Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE == $behavior) {
                         $tierPrices[$rowSku][] = $tierPrice;
@@ -436,9 +436,7 @@ protected function saveAndReplaceAdvancedPrices()
             if ($listSku) {
                 $this->setUpdatedAt($listSku);
             }
-        }
-
-        if (\Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE == $behavior) {
+        } elseif (\Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE == $behavior) {
             if ($listSku) {
                 $this->processCountNewPrices($tierPrices);
                 if ($this->deleteProductTierPrices(array_unique($listSku), self::TABLE_TIER_PRICE)) {
@@ -447,6 +445,7 @@ protected function saveAndReplaceAdvancedPrices()
                 }
             }
         }
+        $this->finalizeCount();
 
         return $this;
     }
@@ -651,11 +650,18 @@ protected function processCountNewPrices(array $tierPrices)
         foreach ($tierPrices as $productPrices) {
             $this->countItemsCreated += count($productPrices);
         }
-        $this->countItemsCreated -= $this->countItemsUpdated;
 
         return $this;
     }
 
+    /**
+     *  Finalize count of new and existing records
+     */
+    protected function finalizeCount()
+    {
+        $this->countItemsCreated -= $this->countItemsUpdated;
+    }
+
     /**
      * Get product entity link field
      *

app/code/Magento/Analytics/Test/Mftf/ActionGroup/AssertAdminAdvancedReportingPageUrlActionGroup.xml

@@ -15,6 +15,6 @@
 
         <switchToNextTab stepKey="switchToNewTab"/>
         <waitForPageLoad stepKey="waitForAdvancedReportingPageLoad"/>
-        <seeInCurrentUrl url="reports/advanced-reporting" stepKey="seeAssertAdvancedReportingPageUrl"/>
+        <seeInCurrentUrl url="report"  stepKey="seeAssertAdvancedReportingPageUrl"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/AwsS3/Driver/AwsS3.php

@@ -861,15 +861,21 @@ public function fileWrite($resource, $data)
      */
     public function fileClose($resource): bool
     {
+        if (!is_resource($resource)) {
+            return false;
+        }
         //phpcs:disable
-        $resourcePath = stream_get_meta_data($resource)['uri'];
+        $meta = stream_get_meta_data($resource);
         //phpcs:enable
 
         foreach ($this->streams as $path => $stream) {
             // phpcs:ignore
-            if (stream_get_meta_data($stream)['uri'] === $resourcePath) {
+            if (stream_get_meta_data($stream)['uri'] === $meta['uri']) {
+                if (isset($meta['seekable']) && $meta['seekable']) {
+                    // rewind the file pointer to make sure the full content of the file is saved
+                    $this->fileSeek($resource, 0);
+                }
                 $this->adapter->writeStream($path, $resource, new Config(self::CONFIG));
-
                 // Remove path from streams after
                 unset($this->streams[$path]);
 

app/code/Magento/AwsS3/Test/Unit/Driver/AwsS3Test.php

@@ -513,4 +513,28 @@ public function testRenameSameDestination(): void
 
         self::assertTrue($this->driver->rename('test/path', 'test/path'));
     }
+
+    public function testFileShouldBeRewindBeforeSave(): void
+    {
+        $resource = $this->driver->fileOpen('test/path', 'w');
+        $this->driver->fileWrite($resource, 'abc');
+        $this->adapterMock->method('fileExists')->willReturn(false);
+        $this->adapterMock->expects($this->once())
+            ->method('writeStream')
+            ->with(
+                'test/path',
+                $this->callback(
+                    // assert that the file pointer is at the beginning of the file before saving it in aws
+                    fn ($stream) => $stream === $resource && is_resource($stream) && ftell($stream) === 0
+                )
+            );
+        $this->driver->fileClose($resource);
+    }
+
+    public function testFileCloseShouldReturnFalseIfTheArgumentIsNotAResource(): void
+    {
+        $this->assertEquals(false, $this->driver->fileClose(''));
+        $this->assertEquals(false, $this->driver->fileClose(null));
+        $this->assertEquals(false, $this->driver->fileClose(false));
+    }
 }

app/code/Magento/Backend/Test/Unit/Model/Menu/Config/XsdTest.php

@@ -42,7 +42,10 @@ protected function setUp(): void
     public function testSchemaCorrectlyIdentifiesInvalidXml($xmlString, $expectedError)
     {
         $actualError = $this->_xsdValidator->validate($this->_xsdSchema, $xmlString);
-        $this->assertEquals($expectedError, $actualError);
+        $this->assertEquals(false, empty($actualError));
+        foreach ($expectedError as $error) {
+            $this->assertContains($error, $actualError);
+        }
     }
 
     public function testSchemaCorrectlyIdentifiesValidXml()