33916: Eliminated calls deprecated methods of the phpunit/phpunit

Author: anzin

app/code/Magento/Analytics/Test/Unit/Model/Connector/Http/Client/CurlTest.php

@@ -50,15 +50,15 @@ class CurlTest extends TestCase
     private $converterMock;
 
     /**
-     * @return void
+     * @inheritdoc
      */
     protected function setUp(): void
     {
         $this->curlAdapterMock = $this->createMock(\Magento\Framework\HTTP\Adapter\Curl::class);
 
         $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
         $curlFactoryMock = $this->getMockBuilder(CurlFactory::class)
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $curlFactoryMock
@@ -76,7 +76,7 @@ protected function setUp(): void
                 'curlFactory' => $curlFactoryMock,
                 'responseFactory' => $this->responseFactoryMock,
                 'converter' => $this->converterMock,
-                'logger' => $this->loggerMock,
+                'logger' => $this->loggerMock
             ]
         );
     }
@@ -94,7 +94,7 @@ public function getTestData()
                     'version' => '1.1',
                     'body'=> ['name' => 'value'],
                     'url' => 'http://www.mystore.com',
-                    'method' => ZendClient::POST,
+                    'method' => ZendClient::POST
                 ]
             ]
         ];
@@ -122,14 +122,8 @@ public function testRequestSuccess(array $data)
         $this->curlAdapterMock->expects($this->once())
             ->method('read')
             ->willReturn($responseString);
-        $this->curlAdapterMock
-            ->method('getErrno')
-            ->willReturn(0);
-
-        $this->responseFactoryMock
-            ->method('create')
-            ->with($responseString)
-            ->willReturn($response);
+        $this->curlAdapterMock->method('getErrno')->willReturn(0);
+        $this->responseFactoryMock->method('create')->with($responseString)->willReturn($response);
 
         $this->assertEquals(
             $response,
@@ -196,7 +190,7 @@ public function testRequestError(array $data)
     private function createJsonConverter()
     {
         $converterMock = $this->getMockBuilder(JsonConverter::class)
-            ->setMethodsExcept(['getContentTypeHeader'])
+            ->onlyMethods(['getContentTypeHeader','toBody'])
             ->disableOriginalConstructor()
             ->getMock();
         $converterMock->method('toBody')->willReturnCallback(function ($value) {

app/code/Magento/Backup/Test/Unit/Model/Fs/CollectionTest.php

@@ -17,7 +17,10 @@
 
 class CollectionTest extends TestCase
 {
-    public function testConstructor()
+    /**
+     * @return void
+     */
+    public function testConstructor(): void
     {
         $helper = new ObjectManager($this);
         $filesystem = $this->getMockBuilder(Filesystem::class)
@@ -39,8 +42,9 @@ public function testConstructor()
         )->disableOriginalConstructor()
             ->getMock();
         $directoryWrite->expects($this->any())->method('create')->with('backups');
-        $directoryWrite->expects($this->any())->method('getAbsolutePath')->willReturn('');
-        $directoryWrite->expects($this->at(3))->method('getAbsolutePath')->with('backups');
+        $directoryWrite->method('getAbsolutePath')
+            ->withConsecutive([], [], ['backups'])
+            ->willReturnOnConsecutiveCalls('', '');
         $directoryWrite->expects($this->any())->method('isDirectory')->willReturn(true);
         $directoryWrite->expects($this->any())->method('getDriver')->willReturn($driver);
         $targetDirectory = $this->getMockBuilder(TargetDirectory::class)

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php

@@ -82,9 +82,9 @@ class SaveTest extends TestCase
     private $save;
 
     /**
-     * Set up
+     * Set up.
      *
-     * @return void
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     protected function setUp(): void
@@ -144,17 +144,17 @@ protected function setUp(): void
     }
 
     /**
-     * Run test execute method
+     * Run test execute method.
      *
      * @param int|bool $categoryId
      * @param int $storeId
      * @param int|null $parentId
-     * @return void
      *
+     * @return void
      * @dataProvider dataProviderExecute
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function testExecute($categoryId, $storeId, $parentId)
+    public function testExecute($categoryId, $storeId, $parentId): void
     {
         $this->markTestSkipped('Due to MAGETWO-48956');
 
@@ -407,9 +407,7 @@ public function testExecute($categoryId, $storeId, $parentId)
         $this->messageManagerMock->expects($this->once())
             ->method('addSuccessMessage')
             ->with(__('You saved the category.'));
-        $categoryMock->expects($this->at(1))
-            ->method('getId')
-            ->willReturn(111);
+        $categoryMock->method('getId')->willReturn(111);
         $this->layoutFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($layoutMock);
@@ -449,30 +447,30 @@ public function testExecute($categoryId, $storeId, $parentId)
     }
 
     /**
-     * Data provider for execute
+     * Data provider for execute.
      *
      * @return array
      */
-    public function dataProviderExecute()
+    public function dataProviderExecute(): array
     {
         return [
             [
                 'categoryId' => false,
                 'storeId' => 7,
-                'parentId' => 123,
+                'parentId' => 123
             ],
             [
                 'categoryId' => false,
                 'storeId' => 7,
-                'parentId' => null,
+                'parentId' => null
             ]
         ];
     }
 
     /**
      * @return array
      */
-    public function imagePreprocessingDataProvider()
+    public function imagePreprocessingDataProvider(): array
     {
         $dataWithImage = [
             'image' => 'path.jpg',
@@ -502,7 +500,7 @@ public function imagePreprocessingDataProvider()
      * @param array $data
      * @param array $expected
      */
-    public function testImagePreprocessing($data, $expected)
+    public function testImagePreprocessing($data, $expected): void
     {
         $eavConfig = $this->createPartialMock(\Magento\Eav\Model\Config::class, ['getEntityType']);