#27638 Fix static checks

Author: lbajsarowicz

app/code/Magento/Catalog/Test/Unit/Model/Product/Website/ReadHandlerTest.php

@@ -10,28 +10,29 @@
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Website\ReadHandler;
 use Magento\Catalog\Model\ResourceModel\Product as ResourceModel;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class ReadHandlerTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var ResourceModel\Website\Link | \PHPUnit_Framework_MockObject_MockObject */
-    private $websiteLink;
+    /** @var ResourceModel\Website\Link|MockObject */
+    private $websiteLinkMock;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject  */
-    private $extensionAttributes;
+    /** @var MockObject  */
+    private $extensionAttributesMock;
 
     /** @var  ReadHandler  */
     private $readHandler;
 
     public function setUp()
     {
-        $this->websiteLink = $this->getMockBuilder(ResourceModel\Website\Link::class)
+        $this->websiteLinkMock = $this->getMockBuilder(ResourceModel\Website\Link::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->extensionAttributes = $this->getMockBuilder(ProductExtensionInterface::class)
+        $this->extensionAttributesMock = $this->getMockBuilder(ProductExtensionInterface::class)
             ->setMethods(['setWebsiteIds', 'getWebsiteIds'])
             ->disableArgumentCloning()
             ->getMockForAbstractClass();
-        $this->readHandler = new ReadHandler($this->websiteLink);
+        $this->readHandler = new ReadHandler($this->websiteLinkMock);
     }
 
     public function testExecuteWithNonCachedExtensionAttributes()
@@ -44,20 +45,20 @@ public function testExecuteWithNonCachedExtensionAttributes()
             ->method('getId')
             ->willReturn($productId);
         $websiteIds = [1,2];
-        $this->websiteLink->expects($this->once())
+        $this->websiteLinkMock->expects($this->once())
             ->method("getWebsiteIdsByProductId")
             ->with($productId)
             ->willReturn($websiteIds);
         $product->expects($this->exactly(2))
             ->method('getExtensionAttributes')
-            ->willReturn($this->extensionAttributes);
-        $this->extensionAttributes->expects($this->once())
+            ->willReturn($this->extensionAttributesMock);
+        $this->extensionAttributesMock->expects($this->once())
             ->method("getWebsiteIds")
             ->willReturn(null);
 
         $product->expects($this->once())
             ->method('setExtensionAttributes')
-            ->with($this->extensionAttributes);
+            ->with($this->extensionAttributesMock);
 
         $this->assertEquals($this->readHandler->execute($product, []), $product);
     }
@@ -68,15 +69,15 @@ public function testExecuteWithCachedWebsiteIds()
             ->disableOriginalConstructor()
             ->getMock();
         $websiteIds = [1,2];
-        $this->extensionAttributes->expects($this->once())
+        $this->extensionAttributesMock->expects($this->once())
             ->method("getWebsiteIds")
             ->willReturn($websiteIds);
         $product->expects($this->never())
             ->method('setExtensionAttributes')
-            ->with($this->extensionAttributes);
+            ->with($this->extensionAttributesMock);
         $product->expects($this->once())
             ->method('getExtensionAttributes')
-            ->willReturn($this->extensionAttributes);
+            ->willReturn($this->extensionAttributesMock);
         $this->assertEquals($this->readHandler->execute($product, []), $product);
     }
 }

app/code/Magento/Catalog/Test/Unit/Model/Product/Website/SaveHandlerTest.php

@@ -15,19 +15,20 @@
 use Magento\Framework\Api\ExtensionAttributesInterface;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class SaveHandlerTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var  ResourceModel\Website\Link | \PHPUnit_Framework_MockObject_MockObject */
+    /** @var  ResourceModel\Website\Link|MockObject */
     private $productWebsiteLink;
 
-    /** @var  StoreManagerInterface | \PHPUnit_Framework_MockObject_MockObject */
+    /** @var  StoreManagerInterface|MockObject */
     private $storeManager;
 
     /** @var SaveHandler */
     private $saveHandler;
 
-    /** @var  ProductInterface | \PHPUnit_Framework_MockObject_MockObject */
+    /** @var  ProductInterface|MockObject */
     private $product;
 
     public function setUp()

app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php

@@ -42,12 +42,11 @@
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
 
 /**
- * Class ProductRepositoryTest
- * @package Magento\Catalog\Test\Unit\Model
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -175,7 +174,7 @@ class ProductRepositoryTest extends TestCase
     /**
      * @var ProductExtensionInterface|MockObject
      */
-    private $ProductExtensionInterface;
+    private $productExtension;
 
     /**
      * @var Json|MockObject

app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php

@@ -8,19 +8,20 @@
 
 use Magento\ConfigurableProduct\Model\LinkManagement;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class LinkManagementTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     protected $productRepository;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     protected $productFactory;
 
@@ -30,7 +31,7 @@ class LinkManagementTest extends \PHPUnit\Framework\TestCase
     protected $objectManagerHelper;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     protected $configurableType;
 
@@ -40,7 +41,7 @@ class LinkManagementTest extends \PHPUnit\Framework\TestCase
     protected $object;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Api\DataObjectHelper
+     * @var MockObject|\Magento\Framework\Api\DataObjectHelper
      */
     protected $dataObjectHelperMock;
 
@@ -159,10 +160,10 @@ public function testAddChild()
                 ]
             )
             ->getMockForAbstractClass();
-        $optionMock = $this->getMockBuilder(\Magento\ConfigurableProduct\Api\Data\Option::class)
+        $optionMock = $this->getMockBuilder(\Magento\ConfigurableProduct\Api\Data\OptionInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['getProductAttribute', 'getPosition', 'getAttributeId'])
-            ->getMock();
+            ->getMockForAbstractClass();
         $productAttributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class)
             ->disableOriginalConstructor()
             ->setMethods(['getAttributeCode'])