Merge remote-tracking branch 'tsg/MC-33909-CE-1' into MC-33909

Author: xmav

dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/WaitAndNotWaitMessagesTest.php

@@ -65,7 +65,9 @@ protected function setUp(): void
      */
     public function testWaitForMessages()
     {
-        $this->assertArraySubset(['queue' => ['consumers_wait_for_messages' => 1]], $this->config);
+        $this->assertArrayHasKey('queue', $this->config);
+        $this->assertArrayHasKey('consumers_wait_for_messages', $this->config['queue']);
+        $this->assertEquals(1, $this->config['queue']['consumers_wait_for_messages']);
 
         foreach ($this->messages as $message) {
             $this->publishMessage($message);
@@ -74,12 +76,12 @@ public function testWaitForMessages()
         $this->waitForAsynchronousResult(count($this->messages), $this->logFilePath);
 
         foreach ($this->messages as $item) {
-            $this->assertContains($item, file_get_contents($this->logFilePath));
+            $this->assertStringContainsString($item, file_get_contents($this->logFilePath));
         }
 
         $this->publishMessage('message4');
         $this->waitForAsynchronousResult(count($this->messages) + 1, $this->logFilePath);
-        $this->assertContains('message4', file_get_contents($this->logFilePath));
+        $this->assertStringContainsString('message4', file_get_contents($this->logFilePath));
     }
 
     /**
@@ -93,7 +95,10 @@ public function testNotWaitForMessages(): void
         $config['queue']['consumers_wait_for_messages'] = 0;
         $this->writeConfig($config);
 
-        $this->assertArraySubset(['queue' => ['consumers_wait_for_messages' => 0]], $this->loadConfig());
+        $loadedConfig = $this->loadConfig();
+        $this->assertArrayHasKey('queue', $loadedConfig);
+        $this->assertArrayHasKey('consumers_wait_for_messages', $loadedConfig['queue']);
+        $this->assertEquals(0, $loadedConfig['queue']['consumers_wait_for_messages']);
         foreach ($this->messages as $message) {
             $this->publishMessage($message);
         }
@@ -102,14 +107,13 @@ public function testNotWaitForMessages(): void
         $this->waitForAsynchronousResult(count($this->messages), $this->logFilePath);
 
         foreach ($this->messages as $item) {
-            $this->assertContains($item, file_get_contents($this->logFilePath));
+            $this->assertStringContainsString($item, file_get_contents($this->logFilePath));
         }
 
         // Checks that consumers do not wait 4th message and die
-        $this->assertArraySubset(
-            ['mixed.sync.and.async.queue.consumer' => []],
-            $this->publisherConsumerController->getConsumersProcessIds()
-        );
+        $consumersProcessIds = $this->publisherConsumerController->getConsumersProcessIds();
+        $this->assertArrayHasKey('mixed.sync.and.async.queue.consumer', $consumersProcessIds);
+        $this->assertEquals([], $consumersProcessIds['mixed.sync.and.async.queue.consumer']);
     }
 
     /**

dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php

@@ -34,7 +34,7 @@ class SaveTest extends AbstractCreditmemoControllerTest
     public function testSendEmailOnCreditmemoSave(): void
     {
         $order = $this->prepareRequest(['creditmemo' => ['send_email' => true]]);
-        $this->dispatch('backend/sales/order_creditmemo/save');
+        $this->dispatch($this->uri);
 
         $this->assertSessionMessages(
             $this->equalTo([(string)__('You created the credit memo.')]),
@@ -69,7 +69,7 @@ public function testOrderStatusPartialRefund()
         /** @var Order $existingOrder */
         $existingOrder = $this->_objectManager->create(Order::class)->loadByIncrementId('100000001');
         $items = $this->getOrderItems($existingOrder, 1);
-        $requestParams = [
+        $postParams = [
             'creditmemo' => [
                 'items' => $items,
                 'do_offline' => '1',
@@ -80,9 +80,9 @@ public function testOrderStatusPartialRefund()
             ],
             'order_id' => $existingOrder->getId(),
         ];
-        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-        $this->getRequest()->setParams($requestParams);
-        $this->dispatch('backend/sales/order_creditmemo/save');
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST)
+            ->setPostValue($postParams);
+        $this->dispatch($this->uri);
 
         /** @var Order $updatedOrder */
         $updatedOrder = $this->_objectManager->create(Order::class)
@@ -101,7 +101,7 @@ public function testOrderStatusTotalRefund()
     {
         /** @var Order $existingOrder */
         $existingOrder = $this->_objectManager->create(Order::class)->loadByIncrementId('100000001');
-        $requestParams = [
+        $postParams = [
             'creditmemo' => [
                 'items' => $this->getOrderItems($existingOrder),
                 'do_offline' => '1',
@@ -112,9 +112,9 @@ public function testOrderStatusTotalRefund()
             ],
             'order_id' => $existingOrder->getId(),
         ];
-        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-        $this->getRequest()->setParams($requestParams);
-        $this->dispatch('backend/sales/order_creditmemo/save');
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST)
+            ->setPostValue($postParams);
+        $this->dispatch($this->uri);
 
         /** @var Order $updatedOrder */
         $updatedOrder = $this->_objectManager->create(Order::class)

lib/internal/Magento/Framework/Archive/Tar.php

@@ -430,6 +430,23 @@ protected function _unpackCurrentTar($destination)
         return $list;
     }
 
+    /**
+     * Converts octal numbers to decimal ones for specific header types.
+     *
+     * @param array $header
+     * @return array
+     */
+    private function convertOctToDec(array $header): array
+    {
+        $typesToConvert = ['mode', 'uid', 'gid', 'size', 'mtime', 'checksum'];
+        foreach ($typesToConvert as $type) {
+            $octNum = preg_replace('/[^0-7]/', '', $header[$type]);
+            $header[$type] = octdec($octNum);
+        }
+
+        return $header;
+    }
+
     /**
      * Read and decode file header information from tarball
      *
@@ -446,13 +463,7 @@ protected function _extractFileHeader()
         }
 
         $header = unpack(self::_getFormatParseHeader(), $headerBlock);
-
-        $header['mode'] = octdec($header['mode']);
-        $header['uid'] = octdec($header['uid']);
-        $header['gid'] = octdec($header['gid']);
-        $header['size'] = octdec($header['size']);
-        $header['mtime'] = octdec($header['mtime']);
-        $header['checksum'] = octdec($header['checksum']);
+        $header = $this->convertOctToDec($header);
 
         if ($header['type'] == "5") {
             $header['size'] = 0;