MC-33682: Stabilize Integration tests

Author: irenelagno

app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php

@@ -54,6 +54,7 @@ public function __construct(
 
     /**
      * Save creditmemo
+     *
      * We can save only new creditmemo. Existing creditmemos are not editable
      *
      * @return \Magento\Backend\Model\View\Result\Redirect|\Magento\Backend\Model\View\Result\Forward

dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php

@@ -108,17 +108,18 @@ protected function _isFormatSupported($image, $adapter)
      * Mark test as skipped if not
      *
      * @param string $adapterType
-     * @return \Magento\Framework\Image\Adapter\AdapterInterface
+     * @return \Magento\Framework\Image\Adapter\AdapterInterface|null
      */
     protected function _getAdapter($adapterType)
     {
+        $adapter = null;
         try {
             $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
             $adapter = $objectManager->get(\Magento\Framework\Image\AdapterFactory::class)->create($adapterType);
-            return $adapter;
         } catch (\Exception $e) {
             $this->markTestSkipped($e->getMessage());
         }
+        return $adapter;
     }
 
     /**
@@ -667,7 +668,7 @@ public function createPngFromStringDataProvider()
             [
                 ['x' => 5, 'y' => 8],
                 'expectedColor1' => ['red' => 0, 'green' => 0, 'blue' => 0],
-                ['x' => 0, 'y' => 14],
+                ['x' => 0, 'y' => 11],
                 'expectedColor2' => ['red' => 255, 'green' => 255, 'blue' => 255],
                 \Magento\Framework\Image\Adapter\AdapterInterface::ADAPTER_GD2,
             ],
@@ -679,9 +680,9 @@ public function createPngFromStringDataProvider()
                 \Magento\Framework\Image\Adapter\AdapterInterface::ADAPTER_IM
             ],
             [
-                ['x' => 1, 'y' => 14],
+                ['x' => 1, 'y' => 11],
                 'expectedColor1' => ['red' => 255, 'green' => 255, 'blue' => 255],
-                ['x' => 5, 'y' => 12],
+                ['x' => 5, 'y' => 11],
                 'expectedColor2' => ['red' => 0, 'green' => 0, 'blue' => 0],
                 \Magento\Framework\Image\Adapter\AdapterInterface::ADAPTER_GD2
             ],

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

@@ -54,6 +54,7 @@ class WaitAndNotWaitMessagesTest extends QueueTestCaseAbstract
     protected function setUp(): void
     {
         parent::setUp();
+        // phpstan:ignore "Class Magento\TestModuleAsyncAmqp\Model\AsyncTestData not found."
         $this->msgObject = $this->objectManager->create(AsyncTestData::class);
         $this->reader = $this->objectManager->get(FileReader::class);
         $this->filesystem = $this->objectManager->get(Filesystem::class);
@@ -65,7 +66,9 @@ protected function setUp(): void
      */
     public function testWaitForMessages()
     {
-        $this->assertContainsEquals(['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);
@@ -93,7 +96,10 @@ public function testNotWaitForMessages(): void
         $config['queue']['consumers_wait_for_messages'] = 0;
         $this->writeConfig($config);
 
-        $this->assertContainsEquals(['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);
         }
@@ -106,10 +112,9 @@ public function testNotWaitForMessages(): void
         }
 
         // Checks that consumers do not wait 4th message and die
-        $this->assertContainsEquals(
-            ['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']);
     }
 
     /**

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

@@ -16,7 +16,7 @@
 class Tar extends \Magento\Framework\Archive\AbstractArchive implements \Magento\Framework\Archive\ArchiveInterface
 {
     /**
-     * Tar block size
+     * The value of the tar block size
      *
      * @const int
      */