MC-29566: [2.4.x] Deprecate SID query parameter-related methods

Author: dvoskoboinikov

app/code/Magento/Cms/Test/Unit/Model/Template/FilterTest.php

@@ -119,10 +119,11 @@ public function testMediaDirectiveRelativePath()
      * Test using media directive with a URL path including schema.
      *
      * @covers \Magento\Cms\Model\Template\Filter::mediaDirective
-     * @expectedException \InvalidArgumentException
      */
     public function testMediaDirectiveURL()
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         $baseMediaDir = 'pub/media';
         $construction = [
             '{{media url="http://wysiwyg/images/image.jpg"}}',

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

@@ -230,6 +230,14 @@ public function testValidate()
             'name' => 'logo.gif',
         ];
 
+        $this->ioFileSystemMock->expects($this->any())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn([
+                'filename' => 'logo',
+                'extension' => 'gif'
+            ]);
+
         $this->attributeMetadataMock->expects($this->once())
             ->method('getStoreLabel')
             ->willReturn('File Input Field Label');
@@ -272,6 +280,14 @@ public function testValidateMaxFileSize()
             ->method('getValue')
             ->willReturn($maxFileSize);
 
+        $this->ioFileSystemMock->expects($this->any())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn([
+                'filename' => 'logo',
+                'extension' => 'gif'
+            ]);
+
         $this->attributeMetadataMock->expects($this->once())
             ->method('getStoreLabel')
             ->willReturn('File Input Field Label');
@@ -316,6 +332,14 @@ public function testValidateMaxImageWidth()
             ->method('getValue')
             ->willReturn($maxImageWidth);
 
+        $this->ioFileSystemMock->expects($this->any())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn([
+                'filename' => 'logo',
+                'extension' => 'gif'
+            ]);
+
         $this->attributeMetadataMock->expects($this->once())
             ->method('getStoreLabel')
             ->willReturn('File Input Field Label');
@@ -360,6 +384,14 @@ public function testValidateMaxImageHeight()
             ->method('getValue')
             ->willReturn($maxImageHeight);
 
+        $this->ioFileSystemMock->expects($this->any())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn([
+                'filename' => 'logo',
+                'extension' => 'gif'
+            ]);
+
         $this->attributeMetadataMock->expects($this->once())
             ->method('getStoreLabel')
             ->willReturn('File Input Field Label');

app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php

@@ -475,11 +475,14 @@ public function testProtocolDirectiveWithValidSchema()
     }
 
     /**
-     * @expectedException \Magento\Framework\Exception\MailException
      * @throws NoSuchEntityException
      */
     public function testProtocolDirectiveWithInvalidSchema()
     {
+        $this->expectException(
+            \Magento\Framework\Exception\MailException::class
+        );
+
         $model = $this->getModel();
         $storeMock = $this->createMock(\Magento\Store\Model\Store::class);
         $storeMock->expects($this->once())->method('isCurrentlySecure')->willReturn(true);

app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php

@@ -178,17 +178,17 @@ public function testToHtmlWithId()
         );
         $this->queueMock->expects($this->once())
             ->method('load')->willReturnSelf();
-        $this->queue->expects($this->once())->method('getTemplateId')->willReturn($templateId);
-        $this->queue->expects($this->once())->method('getNewsletterType')->willReturn($newsletterType);
-        $this->queue->expects($this->once())->method('getNewsletterText')->willReturn($newsletterText);
-        $this->queue->expects($this->once())->method('getNewsletterStyles')->willReturn($newsletterStyle);
+        $this->queueMock->expects($this->once())->method('getTemplateId')->willReturn($templateId);
+        $this->queueMock->expects($this->once())->method('getNewsletterType')->willReturn($newsletterType);
+        $this->queueMock->expects($this->once())->method('getNewsletterText')->willReturn($newsletterText);
+        $this->queueMock->expects($this->once())->method('getNewsletterStyles')->willReturn($newsletterStyle);
         $this->templateMock->expects($this->any())
             ->method('isPlain')
             ->willReturn(true);
-        $this->template->expects($this->once())->method('setId')->willReturn($templateId);
-        $this->template->expects($this->once())->method('setTemplateType')->willReturn($newsletterType);
-        $this->template->expects($this->once())->method('setTemplateText')->willReturn($newsletterText);
-        $this->template->expects($this->once())->method('setTemplateStyles')->willReturn($newsletterStyle);
+        $this->templateMock->expects($this->once())->method('setId')->willReturn($templateId);
+        $this->templateMock->expects($this->once())->method('setTemplateType')->willReturn($newsletterType);
+        $this->templateMock->expects($this->once())->method('setTemplateText')->willReturn($newsletterText);
+        $this->templateMock->expects($this->once())->method('setTemplateStyles')->willReturn($newsletterStyle);
         /** @var Store $store */
         $this->storeManagerMock->expects($this->once())
             ->method('getDefaultStoreView')

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

@@ -92,12 +92,16 @@ private function getMockObject(string $class, array $methods = []): \PHPUnit\Fra
 
     /**
      * Test for beforeSave method with invalid file extension.
-     *
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Something is wrong with the file upload settings.
      */
     public function testBeforeSaveWithInvalidExtensionFile()
     {
+        $this->expectException(
+            \Magento\Framework\Exception\LocalizedException::class
+        );
+        $this->expectExceptionMessage(
+            'Something is wrong with the file upload settings.'
+        );
+
         $invalidFileName = 'fileName.invalidExtension';
         $this->imageBackend->setData(
             [

lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php

@@ -122,7 +122,6 @@ public function filesProvider()
 
     /**
      * Test if open() method resets cached fileType
-     *
      */
     public function testOpenDifferentTypes()
     {
@@ -156,10 +155,12 @@ public function testOpenDifferentTypes()
     }
 
     /**
-     * @expectedException \InvalidArgumentException
+     * Test open() with invalid URL.
      */
     public function testOpenInvalidURL()
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         $this->adapter->open('bar://foo.bar');
     }
 }

lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php

@@ -101,10 +101,12 @@ public function testSaveWithException()
     }
 
     /**
-     * @expectedException \InvalidArgumentException
+     * Test open() with invalid URL.
      */
     public function testOpenInvalidUrl()
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         $this->imageMagic->open('bar://foo.bar');
     }
 }