MC-41153: Fix broken builds on 2.3.7-develop

Author: dvoskoboinikov

app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php

@@ -541,10 +541,14 @@ public function testUploadFile()
     }
 
     /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
+     *
      */
     public function testUploadFileWithExcessivePath()
     {
+        $this->expectException(
+            \Magento\Framework\Exception\LocalizedException::class
+        );
+
         $path = 'target/path';
         $targetPath = self::STORAGE_ROOT_DIR .str_repeat('a', 255) . $path;
         $type = 'image';

app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php

@@ -76,27 +76,27 @@ class ImageTest extends AbstractFormTestCase
     private $fileProcessorFactoryMock;
 
     /**
-     * @var File|PHPUnit_Framework_MockObject_MockObject
+     * @var File|\PHPUnit\Framework\MockObject\MockObject
      */
     private $ioFileSystemMock;
 
     /**
-     * @var DirectoryList|PHPUnit_Framework_MockObject_MockObject
+     * @var DirectoryList|\PHPUnit\Framework\MockObject\MockObject
      */
     private $directoryListMock;
 
     /**
-     * @var WriteFactory|PHPUnit_Framework_MockObject_MockObject
+     * @var WriteFactory|\PHPUnit\Framework\MockObject\MockObject
      */
     private $writeFactoryMock;
 
     /**
-     * @var Write|PHPUnit_Framework_MockObject_MockObject
+     * @var Write|\PHPUnit\Framework\MockObject\MockObject
      */
     private $mediaEntityTmpDirectoryMock;
 
     /**
-     * @var Driver|PHPUnit_Framework_MockObject_MockObject
+     * @var Driver|\PHPUnit\Framework\MockObject\MockObject
      */
     private $driverMock;
 
@@ -251,6 +251,14 @@ public function testValidate()
             ->with(FileProcessor::TMP_DIR . '/' . $value['name'])
             ->willReturn(true);
 
+        $this->ioFileSystemMock->expects($this->any())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn([
+                'extension' => 'gif',
+                'filename' => 'logo'
+            ]);
+
         $model = $this->initialize([
             'value' => $value,
             'isAjax' => false,
@@ -304,6 +312,14 @@ public function testValidateMaxFileSize()
             ->with(FileProcessor::TMP_DIR . '/' . $value['name'])
             ->willReturn(true);
 
+        $this->ioFileSystemMock->expects($this->any())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn([
+                'extension' => 'gif',
+                'filename' => 'logo'
+            ]);
+
         $model = $this->initialize([
             'value' => $value,
             'isAjax' => false,
@@ -356,6 +372,14 @@ public function testValidateMaxImageWidth()
             ->with(FileProcessor::TMP_DIR . '/' . $value['name'])
             ->willReturn(true);
 
+        $this->ioFileSystemMock->expects($this->any())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn([
+                'extension' => 'gif',
+                'filename' => 'logo'
+            ]);
+
         $model = $this->initialize([
             'value' => $value,
             'isAjax' => false,
@@ -408,6 +432,14 @@ public function testValidateMaxImageHeight()
             ->with(FileProcessor::TMP_DIR . '/' . $value['name'])
             ->willReturn(true);
 
+        $this->ioFileSystemMock->expects($this->any())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn([
+                'extension' => 'gif',
+                'filename' => 'logo'
+            ]);
+
         $model = $this->initialize([
             'value' => $value,
             'isAjax' => false,

dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php

@@ -199,7 +199,7 @@ public function testProcessCustomerInvalidValue()
      * @inheritdoc
      * @throws FileSystemException
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         parent::tearDownAfterClass();
         $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(