Merge branch 'MC-41153' of https://github.com/magento-tsg/magento2ce into MC-41153

Author: dvoskoboinikov

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

@@ -7,6 +7,7 @@
 
 use Magento\Cms\Model\Wysiwyg\Images\Storage\Collection as StorageCollection;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\DataObject;
 
 /**
  * @SuppressWarnings(PHPMD.LongVariable)
@@ -166,11 +167,9 @@ protected function setUp(): void
         )->method(
             'getPathInfo'
         )->willReturnCallback(
-
-                function ($path) {
-                    return pathinfo($path);
-                }
-
+            function ($path) {
+                 return pathinfo($path);
+            }
         );
 
         $this->adapterFactoryMock = $this->createMock(\Magento\Framework\Image\AdapterFactory::class);
@@ -359,7 +358,10 @@ public function testGetDirsCollection($exclude, $include, $fileNames, $expectedR
         $collection = [];
         foreach ($fileNames as $filename) {
             /** @var \Magento\Framework\DataObject|\PHPUnit\Framework\MockObject\MockObject $objectMock */
-            $objectMock = $this->createPartialMock(\Magento\Framework\DataObject::class, ['getFilename']);
+            $objectMock = $this->getMockBuilder(DataObject::class)
+                ->addMethods(['getFilename'])
+                ->disableOriginalConstructor()
+                ->getMock();
             $objectMock->expects($this->any())
                 ->method('getFilename')
                 ->willReturn(self::STORAGE_ROOT_DIR . $filename);

app/code/Magento/Customer/Test/Unit/Model/FileProcessorTest.php

@@ -324,7 +324,7 @@ public function testSaveTemporaryFileWithError()
     public function testMoveTemporaryFileUnableToCreateDirectory()
     {
         $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
-        $this->expectExceptionMessage('Unable to create directory customer/f/i');
+        $this->expectExceptionMessage('Unable to create directory /f/i');
 
         $filePath = '/filename.ext1';
 

app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php

@@ -8,6 +8,7 @@
 
 namespace Magento\Theme\Test\Unit\Model\Design\Backend;
 
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem\Io\File as IoFile;
 use Magento\Theme\Model\Design\Backend\Image;
 use Magento\Framework\Filesystem\Directory\ReadFactory;
@@ -32,7 +33,7 @@ class ImageTest extends \PHPUnit\Framework\TestCase
     /**
      * @inheritdoc
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->ioFileSystem = $this->getMockObject(IoFile::class);
         $this->tmpDirectory = $this->getMockObject(ReadFactory::class);
@@ -46,7 +47,7 @@ public function setUp()
     /**
      * @inheritdoc
      */
-    public function tearDown()
+    public function tearDown(): void
     {
         unset($this->imageBackend);
     }
@@ -68,12 +69,12 @@ protected function getMockObject($class, $methods = [])
 
     /**
      * Test for beforeSave method with invalid file extension.
-     *
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Invalid file provided.
      */
     public function testBeforeSaveWithInvalidExtensionFile()
     {
+        $this->expectException(LocalizedException::class);
+        $this->expectExceptionMessage('Invalid file provided.');
+
         $invalidFileName = 'fileName.invalidExtension';
         $this->imageBackend->setData(
             [

app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php

@@ -9,6 +9,7 @@
  */
 namespace Magento\Theme\Test\Unit\Model\Wysiwyg;
 
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem\DriverInterface;
 
 /**
@@ -75,11 +76,9 @@ protected function setUp(): void
         $file->expects($this->any())
             ->method('getPathInfo')
             ->willReturnCallback(
-
-                    function ($path) {
-                        return pathinfo($path);
-                    }
-
+                function ($path) {
+                    return pathinfo($path);
+                }
             );
 
         $this->_helperStorage = $this->createPartialMock(
@@ -200,7 +199,7 @@ public function testUploadFile()
      */
     public function testUploadInvalidFile()
     {
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectException(LocalizedException::class);
 
         $uploader = $this->_prepareUploader();
 
@@ -302,7 +301,7 @@ public function testCreateFolder($isWritable)
      */
     public function testCreateFolderWithInvalidName()
     {
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectException(LocalizedException::class);
 
         $newDirectoryName = 'dir2!#$%^&';
         $this->_storageModel->createFolder($newDirectoryName, $this->_storageRoot);
@@ -313,7 +312,7 @@ public function testCreateFolderWithInvalidName()
      */
     public function testCreateFolderDirectoryAlreadyExist()
     {
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectException(LocalizedException::class);
 
         $newDirectoryName = 'mew';
         $fullNewPath = $this->_storageRoot . '/' . $newDirectoryName;
@@ -370,7 +369,7 @@ public function testGetDirsCollection()
      */
     public function testGetDirsCollectionWrongDirName()
     {
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectException(LocalizedException::class);
 
         $this->directoryWrite->expects(
             $this->once()
@@ -567,7 +566,7 @@ public function testDeleteDirectory()
      */
     public function testDeleteRootDirectory()
     {
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectException(LocalizedException::class);
 
         $directoryPath = $this->_storageRoot;
 
@@ -592,11 +591,12 @@ public function booleanCasesDataProvider()
 
     /**
      * cover \Magento\Theme\Model\Wysiwyg\Storage::deleteDirectory
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage We can't delete root directory fake/relative/path right now.
      */
     public function testDeleteRootDirectoryRelative()
     {
+        $this->expectException(LocalizedException::class);
+        $this->expectExceptionMessage('We can\'t delete root directory fake/relative/path right now.');
+
         $directoryPath = $this->_storageRoot;
         $fakePath = 'fake/relative/path';
         $this->directoryWrite->method('getAbsolutePath')