MC-36203: Integration failures when using GD 2.3.0

- Backport fix from 2.4

Author: xmav

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
             ],