Merge pull request #27704 from lbajsarowicz/phpunit8/module-Marketplace

Oleksii Korshenko · web-flow · commit fc83279ce58a · 2020-04-15T12:08:04.000-05:00
#27500 PHPUnit 8 for module Marketplace
diff --git a/app/code/Magento/Marketplace/Test/Unit/Block/PartnersTest.php b/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)
     {
diff --git a/app/code/Magento/Marketplace/Test/Unit/Controller/Index/IndexTest.php b/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, []);
     }
 }
diff --git a/app/code/Magento/Marketplace/Test/Unit/Controller/Partners/IndexTest.php b/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);
     }
 }
diff --git a/app/code/Magento/Marketplace/Test/Unit/Helper/CacheTest.php b/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,
diff --git a/app/code/Magento/Marketplace/Test/Unit/Model/PartnersTest.php b/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, []);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,23 @@`
`1`		`-<?php`
	`1`	`+<?php declare(strict_types=1);`
`2`	`2`	`/**`
`3`	`3`	`* Copyright © Magento, Inc. All rights reserved.`
`4`	`4`	`* See COPYING.txt for license details.`
`5`	`5`	`*/`
`6`	`6`
`7`	`7`	`namespace Magento\Marketplace\Test\Unit\Block;`
`8`	`8`
`9`		`-class PartnersTest extends \PHPUnit\Framework\TestCase`
	`9`	`+use Magento\Marketplace\Block\Partners;`
	`10`	`+use PHPUnit\Framework\MockObject\MockObject;`
	`11`	`+use PHPUnit\Framework\TestCase;`
	`12`	`+`
	`13`	`+class PartnersTest extends TestCase`
`10`	`14`	`{`
`11`	`15`	`/**`
`12`		`- * @var \PHPUnit_Framework_MockObject_MockObject\|\Magento\Marketplace\Block\Partners`
	`16`	`+ * @var MockObject\|Partners`
`13`	`17`	`*/`
`14`	`18`	`private $partnersBlockMock;`
`15`	`19`
`16`		`- protected function setUp()`
	`20`	`+ protected function setUp(): void`
`17`	`21`	`{`
`18`	`22`	`$this->partnersBlockMock = $this->getPartnersBlockMock(`
`19`	`23`	`[`
`@@ -42,17 +46,17 @@ public function testGetPartners()`
`42`	`46`	`/**`
`43`	`47`	`* Gets partners block mock`
`44`	`48`	`*`
`45`		`- * @return \PHPUnit_Framework_MockObject_MockObject\|\Magento\Marketplace\Block\Partners`
	`49`	`+ * @return MockObject\|Partners`
`46`	`50`	`*/`
`47`	`51`	`public function getPartnersBlockMock($methods = null)`
`48`	`52`	`{`
`49`		`- return $this->createPartialMock(\Magento\Marketplace\Block\Partners::class, $methods);`
	`53`	`+ return $this->createPartialMock(Partners::class, $methods);`
`50`	`54`	`}`
`51`	`55`
`52`	`56`	`/**`
`53`	`57`	`* Gets partners model mock`
`54`	`58`	`*`
`55`		`- * @return \PHPUnit_Framework_MockObject_MockObject\|\Magento\Marketplace\Model\Partners`
	`59`	`+ * @return MockObject\|\Magento\Marketplace\Model\Partners`
`56`	`60`	`*/`
`57`	`61`	`public function getPartnersModelMock($methods)`
`58`	`62`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,27 @@`
`1`		`-<?php`
	`1`	`+<?php declare(strict_types=1);`
`2`	`2`	`/**`
`3`	`3`	`* Copyright © Magento, Inc. All rights reserved.`
`4`	`4`	`* See COPYING.txt for license details.`
`5`	`5`	`*/`
`6`	`6`
`7`	`7`	`namespace Magento\Marketplace\Test\Unit\Controller\Index;`
`8`	`8`
`9`		`-class IndexTest extends \PHPUnit\Framework\TestCase`
	`9`	`+use Magento\Framework\View\Page\Config;`
	`10`	`+use Magento\Framework\View\Page\Title;`
	`11`	`+use Magento\Framework\View\Result\Page;`
	`12`	`+use Magento\Framework\View\Result\PageFactory;`
	`13`	`+use Magento\Marketplace\Controller\Adminhtml\Index\Index;`
	`14`	`+use PHPUnit\Framework\MockObject\MockObject;`
	`15`	`+use PHPUnit\Framework\TestCase;`
	`16`	`+`
	`17`	`+class IndexTest extends TestCase`
`10`	`18`	`{`
`11`	`19`	`/**`
`12`		`- * @var \PHPUnit_Framework_MockObject_MockObject\| \Magento\Marketplace\Controller\Adminhtml\Index\Index`
	`20`	`+ * @var MockObject\|Index`
`13`	`21`	`*/`
`14`	`22`	`private $indexControllerMock;`
`15`	`23`
`16`		`- protected function setUp()`
	`24`	`+ protected function setUp(): void`
`17`	`25`	`{`
`18`	`26`	`$this->indexControllerMock = $this->getControllerIndexMock(['getResultPageFactory']);`
`19`	`27`	`}`
`@@ -56,42 +64,42 @@ public function testExecute()`
`56`	`64`	`/**`
`57`	`65`	`* Gets index controller mock`
`58`	`66`	`*`
`59`		`- * @return \PHPUnit_Framework_MockObject_MockObject\|\Magento\Marketplace\Controller\Adminhtml\Index\Index`
	`67`	`+ * @return MockObject\|Index`
`60`	`68`	`*/`
`61`	`69`	`public function getControllerIndexMock($methods = null)`
`62`	`70`	`{`
`63`		`- return $this->createPartialMock(\Magento\Marketplace\Controller\Adminhtml\Index\Index::class, $methods);`
	`71`	`+ return $this->createPartialMock(Index::class, $methods);`
`64`	`72`	`}`
`65`	`73`
`66`	`74`	`/**`
`67`		`- * @return \PHPUnit_Framework_MockObject_MockObject\|\Magento\Framework\View\Result\PageFactory`
	`75`	`+ * @return MockObject\|PageFactory`
`68`	`76`	`*/`
`69`	`77`	`public function getResultPageFactoryMock($methods = null)`
`70`	`78`	`{`
`71`		`- return $this->createPartialMock(\Magento\Framework\View\Result\PageFactory::class, $methods, []);`
	`79`	`+ return $this->createPartialMock(PageFactory::class, $methods, []);`
`72`	`80`	`}`
`73`	`81`
`74`	`82`	`/**`
`75`		`- * @return \PHPUnit_Framework_MockObject_MockObject\|\Magento\Framework\View\Page\Config`
	`83`	`+ * @return MockObject\|Config`
`76`	`84`	`*/`
`77`	`85`	`public function getConfigMock($methods = null)`
`78`	`86`	`{`
`79`		`- return $this->createPartialMock(\Magento\Framework\View\Page\Config::class, $methods, []);`
	`87`	`+ return $this->createPartialMock(Config::class, $methods, []);`
`80`	`88`	`}`
`81`	`89`
`82`	`90`	`/**`
`83`		`- * @return \PHPUnit_Framework_MockObject_MockObject\|\Magento\Framework\View\Page\Title`
	`91`	`+ * @return MockObject\|Title`
`84`	`92`	`*/`
`85`	`93`	`public function getTitleMock($methods = null)`
`86`	`94`	`{`
`87`		`- return $this->createPartialMock(\Magento\Framework\View\Page\Title::class, $methods, []);`
	`95`	`+ return $this->createPartialMock(Title::class, $methods, []);`
`88`	`96`	`}`
`89`	`97`
`90`	`98`	`/**`
`91`		`- * @return \PHPUnit_Framework_MockObject_MockObject\|\Magento\Framework\View\Page\Title`
	`99`	`+ * @return MockObject\|Title`
`92`	`100`	`*/`
`93`	`101`	`public function getPageMock($methods = null)`
`94`	`102`	`{`
`95`		`- return $this->createPartialMock(\Magento\Framework\View\Result\Page::class, $methods, []);`
	`103`	`+ return $this->createPartialMock(Page::class, $methods, []);`
`96`	`104`	`}`
`97`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,28 @@`
`1`		`-<?php`
	`1`	`+<?php declare(strict_types=1);`
`2`	`2`	`/**`
`3`	`3`	`* Copyright © Magento, Inc. All rights reserved.`
`4`	`4`	`* See COPYING.txt for license details.`
`5`	`5`	`*/`
`6`	`6`
`7`	`7`	`namespace Magento\Marketplace\Test\Unit\Controller\Partners;`
`8`	`8`
`9`		`-class IndexTest extends \PHPUnit\Framework\TestCase`
	`9`	`+use Magento\Framework\App\Request\Http;`
	`10`	`+use Magento\Framework\HTTP\PhpEnvironment\Response;`
	`11`	`+use Magento\Framework\View\Element\BlockInterface;`
	`12`	`+use Magento\Framework\View\LayoutFactory;`
	`13`	`+use Magento\Framework\View\LayoutInterface;`
	`14`	`+use Magento\Marketplace\Controller\Adminhtml\Partners\Index;`
	`15`	`+use PHPUnit\Framework\MockObject\MockObject;`
	`16`	`+use PHPUnit\Framework\TestCase;`
	`17`	`+`
	`18`	`+class IndexTest extends TestCase`
`10`	`19`	`{`
`11`	`20`	`/**`
`12`		`- * @var \PHPUnit_Framework_MockObject_MockObject\|\Magento\Marketplace\Controller\Adminhtml\Partners\Index`
	`21`	`+ * @var MockObject\|Index`
`13`	`22`	`*/`
`14`	`23`	`private $partnersControllerMock;`
`15`	`24`
`16`		`- protected function setUp()`
	`25`	`+ protected function setUp(): void`
`17`	`26`	`{`
`18`	`27`	`$this->partnersControllerMock = $this->getControllerIndexMock(`
`19`	`28`	`[`
`@@ -71,50 +80,50 @@ public function testExecute()`
`71`	`80`	`/**`
`72`	`81`	`* Gets partners controller mock`
`73`	`82`	`*`
`74`		`- * @return \PHPUnit_Framework_MockObject_MockObject\|\Magento\Marketplace\Controller\Adminhtml\Partners\Index`
	`83`	`+ * @return MockObject\|Index`
`75`	`84`	`*/`
`76`	`85`	`public function getControllerIndexMock($methods = null)`
`77`	`86`	`{`
`78`		`- return $this->createPartialMock(\Magento\Marketplace\Controller\Adminhtml\Partners\Index::class, $methods);`
	`87`	`+ return $this->createPartialMock(Index::class, $methods);`
`79`	`88`	`}`
`80`	`89`
`81`	`90`	`/**`
`82`		`- * @return \PHPUnit_Framework_MockObject_MockObject\|\Magento\Framework\View\LayoutFactory`
	`91`	`+ * @return MockObject\|LayoutFactory`
`83`	`92`	`*/`
`84`	`93`	`public function getLayoutFactoryMock($methods = null)`
`85`	`94`	`{`
`86`		`- return $this->createPartialMock(\Magento\Framework\View\LayoutFactory::class, $methods, []);`
	`95`	`+ return $this->createPartialMock(LayoutFactory::class, $methods, []);`
`87`	`96`	`}`
`88`	`97`
`89`	`98`	`/**`
`90`		`- * @return \PHPUnit_Framework_MockObject_MockObject\|\Magento\Framework\View\LayoutInterface`
	`99`	`+ * @return MockObject\|LayoutInterface`
`91`	`100`	`*/`
`92`	`101`	`public function getLayoutMock()`
`93`	`102`	`{`
`94`		`- return $this->getMockForAbstractClass(\Magento\Framework\View\LayoutInterface::class);`
	`103`	`+ return $this->getMockForAbstractClass(LayoutInterface::class);`
`95`	`104`	`}`
`96`	`105`
`97`	`106`	`/**`
`98`		`- * @return \PHPUnit_Framework_MockObject_MockObject\|\Magento\Framework\HTTP\PhpEnvironment\Response`
	`107`	`+ * @return MockObject\|Response`
`99`	`108`	`*/`
`100`	`109`	`public function getResponseMock($methods = null)`
`101`	`110`	`{`
`102`		`- return $this->createPartialMock(\Magento\Framework\HTTP\PhpEnvironment\Response::class, $methods, []);`
	`111`	`+ return $this->createPartialMock(Response::class, $methods, []);`
`103`	`112`	`}`
`104`	`113`
`105`	`114`	`/**`
`106`		`- * @return \PHPUnit_Framework_MockObject_MockObject\|\Magento\Framework\App\Request\Http`
	`115`	`+ * @return MockObject\|Http`
`107`	`116`	`*/`
`108`	`117`	`public function getRequestMock($methods = null)`
`109`	`118`	`{`
`110`		`- return $this->createPartialMock(\Magento\Framework\App\Request\Http::class, $methods, []);`
	`119`	`+ return $this->createPartialMock(Http::class, $methods, []);`
`111`	`120`	`}`
`112`	`121`
`113`	`122`	`/**`
`114`		`- * @return \PHPUnit_Framework_MockObject_MockObject\|\Magento\Framework\View\Element\BlockInterface`
	`123`	`+ * @return MockObject\|BlockInterface`
`115`	`124`	`*/`
`116`	`125`	`public function getBlockInterfaceMock()`
`117`	`126`	`{`
`118`		`- return $this->getMockForAbstractClass(\Magento\Framework\View\Element\BlockInterface::class);`
	`127`	`+ return $this->getMockForAbstractClass(BlockInterface::class);`
`119`	`128`	`}`
`120`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,21 @@`
`1`		`-<?php`
	`1`	`+<?php declare(strict_types=1);`
`2`	`2`	`/**`
`3`	`3`	`* Copyright © Magento, Inc. All rights reserved.`
`4`	`4`	`* See COPYING.txt for license details.`
`5`	`5`	`*/`
`6`	`6`
`7`	`7`	`namespace Magento\Marketplace\Test\Unit\Model;`
`8`	`8`
`9`		`-class PartnersTest extends \PHPUnit\Framework\TestCase`
	`9`	`+use Magento\Framework\HTTP\Client\Curl;`
	`10`	`+use Magento\Marketplace\Helper\Cache;`
	`11`	`+use Magento\Marketplace\Model\Partners;`
	`12`	`+use PHPUnit\Framework\MockObject\MockObject;`
	`13`	`+use PHPUnit\Framework\TestCase;`
	`14`	`+`
	`15`	`+class PartnersTest extends TestCase`
`10`	`16`	`{`
`11`	`17`	`/**`
`12`		`- * @var \PHPUnit_Framework_MockObject_MockObject\|\Magento\Marketplace\Model\Partners`
	`18`	`+ * @var MockObject\|Partners`
`13`	`19`	`*/`
`14`	`20`	`private $partnersModelMock;`
`15`	`21`
`@@ -33,7 +39,7 @@ class PartnersTest extends \PHPUnit\Framework\TestCase`
`33`	`39`	`}`
`34`	`40`	`}';`
`35`	`41`
`36`		`- protected function setUp()`
	`42`	`+ protected function setUp(): void`
`37`	`43`	`{`
`38`	`44`	`$this->partnersModelMock = $this->getPartnersModelMock(`
`39`	`45`	`[`
`@@ -97,7 +103,7 @@ public function testGetPartnersException()`
`97`	`103`	`->method('post');`
`98`	`104`	`$curlMock->expects($this->once())`
`99`	`105`	`->method('getBody')`
`100`		`- ->will($this->throwException(new \Exception));`
	`106`	`+ ->will($this->throwException(new \Exception()));`
`101`	`107`	`$this->partnersModelMock->expects($this->exactly(3))`
`102`	`108`	`->method('getCurlClient')`
`103`	`109`	`->will($this->returnValue($curlMock));`
`@@ -119,7 +125,7 @@ public function testGetPartnersException()`
`119`	`125`	`/**`
`120`	`126`	`* Gets partners block mock`
`121`	`127`	`*`
`122`		`- * @return \PHPUnit_Framework_MockObject_MockObject\|\Magento\Marketplace\Block\Partners`
	`128`	`+ * @return MockObject\|\Magento\Marketplace\Block\Partners`
`123`	`129`	`*/`
`124`	`130`	`public function getPartnersBlockMock($methods = null)`
`125`	`131`	`{`
`@@ -129,30 +135,30 @@ public function getPartnersBlockMock($methods = null)`
`129`	`135`	`/**`
`130`	`136`	`* Gets partners model mock`
`131`	`137`	`*`
`132`		`- * @return \PHPUnit_Framework_MockObject_MockObject\|\Magento\Marketplace\Model\Partners`
	`138`	`+ * @return MockObject\|Partners`
`133`	`139`	`*/`
`134`	`140`	`public function getPartnersModelMock($methods)`
`135`	`141`	`{`
`136`		`- return $this->createPartialMock(\Magento\Marketplace\Model\Partners::class, $methods, []);`
	`142`	`+ return $this->createPartialMock(Partners::class, $methods, []);`
`137`	`143`	`}`
`138`	`144`
`139`	`145`	`/**`
`140`	`146`	`* Gets partners model mock`
`141`	`147`	`*`
`142`		`- * @return \PHPUnit_Framework_MockObject_MockObject\|\Magento\Framework\HTTP\Client\Curl`
	`148`	`+ * @return MockObject\|Curl`
`143`	`149`	`*/`
`144`	`150`	`public function getCurlMock($methods)`
`145`	`151`	`{`
`146`		`- return $this->createPartialMock(\Magento\Framework\HTTP\Client\Curl::class, $methods, []);`
	`152`	`+ return $this->createPartialMock(Curl::class, $methods, []);`
`147`	`153`	`}`
`148`	`154`
`149`	`155`	`/**`
`150`	`156`	`* Gets cache mock`
`151`	`157`	`*`
`152`		`- * @return \PHPUnit_Framework_MockObject_MockObject\|\Magento\Framework\HTTP\Client\Curl`
	`158`	`+ * @return MockObject\|Curl`
`153`	`159`	`*/`
`154`	`160`	`public function getCacheMock($methods)`
`155`	`161`	`{`
`156`		`- return $this->createPartialMock(\Magento\Marketplace\Helper\Cache::class, $methods, []);`
	`162`	`+ return $this->createPartialMock(Cache::class, $methods, []);`
`157`	`163`	`}`
`158`	`164`	`}`