#27500 PHPUnit 8 for module Marketplace

app/code/Magento/Marketplace/Test/Unit/Block/PartnersTest.php

@@ -1,19 +1,23 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
 namespace Magento\Marketplace\Test\Unit\Block;
 
-class PartnersTest extends \PHPUnit\Framework\TestCase
+use Magento\Marketplace\Block\Partners;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class PartnersTest extends TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Marketplace\Block\Partners
+     * @var MockObject|Partners
      */
     private $partnersBlockMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->partnersBlockMock = $this->getPartnersBlockMock(
             [
@@ -42,17 +46,17 @@ public function testGetPartners()
     /**
      * Gets partners block mock
      *
-     * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Marketplace\Block\Partners
+     * @return MockObject|Partners
      */
     public function getPartnersBlockMock($methods = null)
     {
-        return $this->createPartialMock(\Magento\Marketplace\Block\Partners::class, $methods);
+        return $this->createPartialMock(Partners::class, $methods);
     }
 
     /**
      * Gets partners model mock
      *
-     * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Marketplace\Model\Partners
+     * @return MockObject|\Magento\Marketplace\Model\Partners
      */
     public function getPartnersModelMock($methods)
     {

app/code/Magento/Marketplace/Test/Unit/Controller/Index/IndexTest.php

@@ -1,19 +1,27 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
 namespace Magento\Marketplace\Test\Unit\Controller\Index;
 
-class IndexTest extends \PHPUnit\Framework\TestCase
+use Magento\Framework\View\Page\Config;
+use Magento\Framework\View\Page\Title;
+use Magento\Framework\View\Result\Page;
+use Magento\Framework\View\Result\PageFactory;
+use Magento\Marketplace\Controller\Adminhtml\Index\Index;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class IndexTest extends TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject| \Magento\Marketplace\Controller\Adminhtml\Index\Index
+     * @var MockObject|Index
      */
     private $indexControllerMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->indexControllerMock = $this->getControllerIndexMock(['getResultPageFactory']);
     }
@@ -56,42 +64,42 @@ public function testExecute()
     /**
      * Gets index controller mock
      *
-     * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Marketplace\Controller\Adminhtml\Index\Index
+     * @return MockObject|Index
      */
     public function getControllerIndexMock($methods = null)
     {
-        return $this->createPartialMock(\Magento\Marketplace\Controller\Adminhtml\Index\Index::class, $methods);
+        return $this->createPartialMock(Index::class, $methods);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\View\Result\PageFactory
+     * @return MockObject|PageFactory
      */
     public function getResultPageFactoryMock($methods = null)
     {
-        return $this->createPartialMock(\Magento\Framework\View\Result\PageFactory::class, $methods, []);
+        return $this->createPartialMock(PageFactory::class, $methods, []);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\View\Page\Config
+     * @return MockObject|Config
      */
     public function getConfigMock($methods = null)
     {
-        return $this->createPartialMock(\Magento\Framework\View\Page\Config::class, $methods, []);
+        return $this->createPartialMock(Config::class, $methods, []);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\View\Page\Title
+     * @return MockObject|Title
      */
     public function getTitleMock($methods = null)
     {
-        return $this->createPartialMock(\Magento\Framework\View\Page\Title::class, $methods, []);
+        return $this->createPartialMock(Title::class, $methods, []);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\View\Page\Title
+     * @return MockObject|Title
      */
     public function getPageMock($methods = null)
     {
-        return $this->createPartialMock(\Magento\Framework\View\Result\Page::class, $methods, []);
+        return $this->createPartialMock(Page::class, $methods, []);
     }
 }

app/code/Magento/Marketplace/Test/Unit/Controller/Partners/IndexTest.php

@@ -1,19 +1,28 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
 namespace Magento\Marketplace\Test\Unit\Controller\Partners;
 
-class IndexTest extends \PHPUnit\Framework\TestCase
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\HTTP\PhpEnvironment\Response;
+use Magento\Framework\View\Element\BlockInterface;
+use Magento\Framework\View\LayoutFactory;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Marketplace\Controller\Adminhtml\Partners\Index;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class IndexTest extends TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Marketplace\Controller\Adminhtml\Partners\Index
+     * @var MockObject|Index
      */
     private $partnersControllerMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->partnersControllerMock = $this->getControllerIndexMock(
             [
@@ -71,50 +80,50 @@ public function testExecute()
     /**
      * Gets partners controller mock
      *
-     * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Marketplace\Controller\Adminhtml\Partners\Index
+     * @return MockObject|Index
      */
     public function getControllerIndexMock($methods = null)
     {
-        return $this->createPartialMock(\Magento\Marketplace\Controller\Adminhtml\Partners\Index::class, $methods);
+        return $this->createPartialMock(Index::class, $methods);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\View\LayoutFactory
+     * @return MockObject|LayoutFactory
      */
     public function getLayoutFactoryMock($methods = null)
     {
-        return $this->createPartialMock(\Magento\Framework\View\LayoutFactory::class, $methods, []);
+        return $this->createPartialMock(LayoutFactory::class, $methods, []);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\View\LayoutInterface
+     * @return MockObject|LayoutInterface
      */
     public function getLayoutMock()
     {
-        return $this->getMockForAbstractClass(\Magento\Framework\View\LayoutInterface::class);
+        return $this->getMockForAbstractClass(LayoutInterface::class);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\HTTP\PhpEnvironment\Response
+     * @return MockObject|Response
      */
     public function getResponseMock($methods = null)
     {
-        return $this->createPartialMock(\Magento\Framework\HTTP\PhpEnvironment\Response::class, $methods, []);
+        return $this->createPartialMock(Response::class, $methods, []);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\Request\Http
+     * @return MockObject|Http
      */
     public function getRequestMock($methods = null)
     {
-        return $this->createPartialMock(\Magento\Framework\App\Request\Http::class, $methods, []);
+        return $this->createPartialMock(Http::class, $methods, []);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\View\Element\BlockInterface
+     * @return MockObject|BlockInterface
      */
     public function getBlockInterfaceMock()
     {
-        return $this->getMockForAbstractClass(\Magento\Framework\View\Element\BlockInterface::class);
+        return $this->getMockForAbstractClass(BlockInterface::class);
     }
 }

app/code/Magento/Marketplace/Test/Unit/Helper/CacheTest.php

@@ -1,37 +1,42 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
 namespace Magento\Marketplace\Test\Unit\Helper;
 
+use Magento\Framework\Config\CacheInterface;
 use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Marketplace\Helper\Cache;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
-class CacheTest extends \PHPUnit\Framework\TestCase
+class CacheTest extends TestCase
 {
     /**
-     * @var \Magento\Framework\Config\CacheInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CacheInterface|MockObject
      */
     private $cache;
 
     /**
-     * @var  SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var  SerializerInterface|MockObject
      */
     private $serializer;
 
     /**
-     * @var \Magento\Marketplace\Helper\Cache
+     * @var Cache
      */
     private $cacheHelper;
 
-    protected function setUp()
+    protected function setUp(): void
     {
-        $this->cache = $this->getMockForAbstractClass(\Magento\Framework\Config\CacheInterface::class);
+        $this->cache = $this->getMockForAbstractClass(CacheInterface::class);
         $this->serializer = $this->getMockForAbstractClass(SerializerInterface::class);
-        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $objectManagerHelper = new ObjectManager($this);
         $this->cacheHelper = $objectManagerHelper->getObject(
-            \Magento\Marketplace\Helper\Cache::class,
+            Cache::class,
             [
                 'cache' => $this->cache,
                 'serializer' => $this->serializer,

app/code/Magento/Marketplace/Test/Unit/Model/PartnersTest.php

@@ -1,15 +1,21 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
 namespace Magento\Marketplace\Test\Unit\Model;
 
-class PartnersTest extends \PHPUnit\Framework\TestCase
+use Magento\Framework\HTTP\Client\Curl;
+use Magento\Marketplace\Helper\Cache;
+use Magento\Marketplace\Model\Partners;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class PartnersTest extends TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Marketplace\Model\Partners
+     * @var MockObject|Partners
      */
     private $partnersModelMock;
 
@@ -33,7 +39,7 @@ class PartnersTest extends \PHPUnit\Framework\TestCase
                     }
                  }';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->partnersModelMock = $this->getPartnersModelMock(
             [
@@ -97,7 +103,7 @@ public function testGetPartnersException()
             ->method('post');
         $curlMock->expects($this->once())
             ->method('getBody')
-            ->will($this->throwException(new \Exception));
+            ->will($this->throwException(new \Exception()));
         $this->partnersModelMock->expects($this->exactly(3))
             ->method('getCurlClient')
             ->will($this->returnValue($curlMock));
@@ -119,7 +125,7 @@ public function testGetPartnersException()
     /**
      * Gets partners block mock
      *
-     * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Marketplace\Block\Partners
+     * @return MockObject|\Magento\Marketplace\Block\Partners
      */
     public function getPartnersBlockMock($methods = null)
     {
@@ -129,30 +135,30 @@ public function getPartnersBlockMock($methods = null)
     /**
      * Gets partners model mock
      *
-     * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Marketplace\Model\Partners
+     * @return MockObject|Partners
      */
     public function getPartnersModelMock($methods)
     {
-        return $this->createPartialMock(\Magento\Marketplace\Model\Partners::class, $methods, []);
+        return $this->createPartialMock(Partners::class, $methods, []);
     }
 
     /**
      * Gets partners model mock
      *
-     * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\HTTP\Client\Curl
+     * @return MockObject|Curl
      */
     public function getCurlMock($methods)
     {
-        return $this->createPartialMock(\Magento\Framework\HTTP\Client\Curl::class, $methods, []);
+        return $this->createPartialMock(Curl::class, $methods, []);
     }
 
     /**
      * Gets cache mock
      *
-     * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\HTTP\Client\Curl
+     * @return MockObject|Curl
      */
     public function getCacheMock($methods)
     {
-        return $this->createPartialMock(\Magento\Marketplace\Helper\Cache::class, $methods, []);
+        return $this->createPartialMock(Cache::class, $methods, []);
     }
 }