Fix bug 26449: Fix code standard

Author: tna274

app/code/Magento/ConfigurableProduct/Plugin/Model/ResourceModel/Product.php

@@ -13,6 +13,8 @@
 use Magento\ConfigurableProduct\Api\Data\OptionInterface;
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Api\FilterBuilder;
 
 /**
  * Plugin product resource model
@@ -35,12 +37,12 @@ class Product
     private $productAttributeRepository;
 
     /**
-     * @var \Magento\Framework\Api\SearchCriteriaBuilder
+     * @var SearchCriteriaBuilder
      */
     private $searchCriteriaBuilder;
 
     /**
-     * @var \Magento\Framework\Api\FilterBuilder
+     * @var FilterBuilder
      */
     private $filterBuilder;
 
@@ -50,24 +52,24 @@ class Product
      * @param Configurable $configurable
      * @param ActionInterface $productIndexer
      * @param ProductAttributeRepositoryInterface $productAttributeRepository
-     * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
-     * @param \Magento\Framework\Api\FilterBuilder $filterBuilder
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param FilterBuilder $filterBuilder
      */
     public function __construct(
         Configurable $configurable,
         ActionInterface $productIndexer,
         ProductAttributeRepositoryInterface $productAttributeRepository = null,
-        \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder = null,
-        \Magento\Framework\Api\FilterBuilder $filterBuilder = null
+        SearchCriteriaBuilder $searchCriteriaBuilder = null,
+        FilterBuilder $filterBuilder = null
     ) {
         $this->configurable = $configurable;
         $this->productIndexer = $productIndexer;
         $this->productAttributeRepository = $productAttributeRepository ?: ObjectManager::getInstance()
             ->get(ProductAttributeRepositoryInterface::class);
         $this->searchCriteriaBuilder = $searchCriteriaBuilder ?: ObjectManager::getInstance()
-            ->get(\Magento\Framework\Api\SearchCriteriaBuilder::class);
+            ->get(SearchCriteriaBuilder::class);
         $this->filterBuilder = $filterBuilder ?: ObjectManager::getInstance()
-            ->get(\Magento\Framework\Api\FilterBuilder::class);
+            ->get(FilterBuilder::class);
     }
 
     /**

app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Model/ResourceModel/ProductTest.php

@@ -11,7 +11,12 @@
 use Magento\Framework\Indexer\ActionInterface;
 use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Api\SearchCriteria;
 use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\ExtensionAttributesInterface;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute as ConfigurableAttribute;
+use Magento\Catalog\Model\ProductAttributeSearchResults;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute as EavAttribute;
 
 class ProductTest extends \PHPUnit\Framework\TestCase
 {
@@ -37,31 +42,30 @@ class ProductTest extends \PHPUnit\Framework\TestCase
     /**
      * @var ProductAttributeRepositoryInterface|\PHPUnit\Framework\MockObject\MockObject
      */
-    private $prdAttributeRepository;
+    private $prdAttributeRepositoryMock;
     /**
      * @var SearchCriteriaBuilder|\PHPUnit\Framework\MockObject\MockObject
      */
-    private $searchCriteriaBuilder;
+    private $searchCriteriaBuilderMock;
     /**
      * @var FilterBuilder|\PHPUnit\Framework\MockObject\MockObject
      */
-    private $filterBuilder;
+    private $filterBuilderMock;
 
     public function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->configurableMock = $this->createMock(Configurable::class);
         $this->actionMock = $this->createMock(ActionInterface::class);
-//        $this->prdAttributeRepository = $this->createMock(ProductAttributeRepositoryInterface::class);
-        $this->prdAttributeRepository = $this->getMockBuilder(ProductAttributeRepositoryInterface::class)
+        $this->prdAttributeRepositoryMock = $this->getMockBuilder(ProductAttributeRepositoryInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['getList'])
             ->getMockForAbstractClass();
-        $this->searchCriteriaBuilder = $this->createPartialMock(
+        $this->searchCriteriaBuilderMock = $this->createPartialMock(
             SearchCriteriaBuilder::class,
             ['addFilters', 'create']
         );
-        $this->filterBuilder = $this->createPartialMock(
+        $this->filterBuilderMock = $this->createPartialMock(
             FilterBuilder::class,
             ['setField', 'setConditionType', 'setValue', 'create']
         );
@@ -71,9 +75,9 @@ public function setUp()
             [
                 'configurable' => $this->configurableMock,
                 'productIndexer' => $this->actionMock,
-                'productAttributeRepository' => $this->prdAttributeRepository,
-                'searchCriteriaBuilder' => $this->searchCriteriaBuilder,
-                'filterBuilder' => $this->filterBuilder
+                'productAttributeRepository' => $this->prdAttributeRepositoryMock,
+                'searchCriteriaBuilder' => $this->searchCriteriaBuilderMock,
+                'filterBuilder' => $this->filterBuilderMock
             ]
         );
     }
@@ -98,33 +102,33 @@ public function testBeforeSaveConfigurable()
         );
 
         $extensionAttributes = $this->createPartialMock(
-            \Magento\Framework\Api\ExtensionAttributesInterface::class,
+            ExtensionAttributesInterface::class,
             ['getConfigurableProductOptions']
         );
         $option = $this->createPartialMock(
-            \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute::class,
+            ConfigurableAttribute::class,
             ['getAttributeId']
         );
         $extensionAttributes->expects($this->exactly(2))->method('getConfigurableProductOptions')
             ->willReturn([$option]);
         $object->expects($this->once())->method('getExtensionAttributes')
             ->willReturn($extensionAttributes);
 
-        $this->filterBuilder->expects($this->atLeastOnce())->method('setField')->willReturnSelf();
-        $this->filterBuilder->expects($this->atLeastOnce())->method('setValue')->willReturnSelf();
-        $this->filterBuilder->expects($this->atLeastOnce())->method('setConditionType')->willReturnSelf();
-        $this->filterBuilder->expects($this->atLeastOnce())->method('create')->willReturnSelf();
-        $searchCriteria = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
-        $this->searchCriteriaBuilder->expects($this->once())->method('create')->willReturn($searchCriteria);
+        $this->filterBuilderMock->expects($this->atLeastOnce())->method('setField')->willReturnSelf();
+        $this->filterBuilderMock->expects($this->atLeastOnce())->method('setValue')->willReturnSelf();
+        $this->filterBuilderMock->expects($this->atLeastOnce())->method('setConditionType')->willReturnSelf();
+        $this->filterBuilderMock->expects($this->atLeastOnce())->method('create')->willReturnSelf();
+        $searchCriteria = $this->createMock(SearchCriteria::class);
+        $this->searchCriteriaBuilderMock->expects($this->once())->method('create')->willReturn($searchCriteria);
 
         $searchResultMockClass = $this->createPartialMock(
-            \Magento\Catalog\Model\ProductAttributeSearchResults::class,
+            ProductAttributeSearchResults::class,
             ['getItems']
         );
-        $this->prdAttributeRepository->expects($this->once())
+        $this->prdAttributeRepositoryMock->expects($this->once())
             ->method('getList')->with($searchCriteria)->willReturn($searchResultMockClass);
         $optionAttribute = $this->createPartialMock(
-            \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class,
+            EavAttribute::class,
             ['getAttributeCode']
         );
         $searchResultMockClass->expects($this->once())->method('getItems')->willReturn([$optionAttribute]);