MAGETWO-70138: Fixed coding standard violations in the Framework\Model namespace #9361

Author: ishakhsuvarov

lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php

@@ -4,19 +4,18 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Model\ResourceModel\Db\Collection;
-use Magento\Framework\App\ResourceConnection\SourceProviderInterface;
+
+use \Magento\Framework\App\ResourceConnection\SourceProviderInterface;
+use \Magento\Framework\Data\Collection\AbstractDb;
 
 /**
  * Abstract Resource Collection
  *
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  */
-abstract class AbstractCollection extends \Magento\Framework\Data\Collection\AbstractDb
-    implements SourceProviderInterface
+abstract class AbstractCollection extends AbstractDb implements SourceProviderInterface
 {
     /**
      * Model name
@@ -233,12 +232,11 @@ protected function _initSelectFields()
                     $column = $field;
                 }
 
-                if ($alias !== null && in_array(
-                    $alias,
-                    $columnsToSelect
-                ) ||
+                if ($alias !== null &&
+                    in_array($alias, $columnsToSelect) ||
                     // If field already joined from another table
-                    $alias === null && isset($alias, $columnsToSelect)
+                    $alias === null &&
+                    isset($alias, $columnsToSelect)
                 ) {
                     continue;
                 }
@@ -460,7 +458,9 @@ public function getResourceModelName()
     public function getResource()
     {
         if (empty($this->_resource)) {
-            $this->_resource = \Magento\Framework\App\ObjectManager::getInstance()->create($this->getResourceModelName());
+            $this->_resource = \Magento\Framework\App\ObjectManager::getInstance()->create(
+                $this->getResourceModelName()
+            );
         }
         return $this->_resource;
     }

lib/internal/Magento/Framework/Model/Test/Unit/AbstractExtensibleModelTest.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Model\Test\Unit;
 
 use Magento\Framework\Api\AttributeValue;

lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/AbstractDbTest.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Model\Test\Unit\ResourceModel\Db;
 
 use Magento\Framework\DB\Adapter\AdapterInterface;
@@ -139,7 +137,8 @@ public function testGetIdFieldname()
     {
         $data = 'MainTableName';
         $idFieldNameProperty = new \ReflectionProperty(
-            AbstractDb::class, '_idFieldName'
+            AbstractDb::class,
+            '_idFieldName'
         );
         $idFieldNameProperty->setAccessible(true);
         $idFieldNameProperty->setValue($this->_model, $data);
@@ -171,8 +170,7 @@ public function testGetMainTable($tableName, $expectedResult)
         $this->_resourcesMock->expects($this->once())
             ->method('getTableName')
             ->with($expectedResult)
-            ->will($this->returnValue($expectedResult)
-            );
+            ->will($this->returnValue($expectedResult));
         $this->assertEquals($expectedResult, $this->_model->getMainTable());
     }
 
@@ -312,8 +310,7 @@ public function testDelete()
         );
         $this->_resourcesMock->expects($this->any())
             ->method('getConnection')
-            ->will($this->returnValue($connectionInterfaceMock)
-        );
+            ->will($this->returnValue($connectionInterfaceMock));
 
         $abstractModelMock->expects($this->once())->method('getData')->willReturn(['data' => 'value']);
         $connectionMock = $this->getMock(AdapterInterface::class);
@@ -416,8 +413,7 @@ public function testGetDataChanged($getOriginData, $expected)
         $this->_resourcesMock->expects($this->once())
             ->method('getTableName')
             ->with('table')
-            ->will($this->returnValue('tableName')
-            );
+            ->will($this->returnValue('tableName'));
         $abstractModelMock->expects($this->at(0))->method('getOrigData')->will($this->returnValue(true));
         $abstractModelMock->expects($this->at(1))->method('getOrigData')->will($this->returnValue($getOriginData));
         $connectionInterfaceMock->expects($this->any())->method('describeTable')->with('tableName')->will(
@@ -434,6 +430,9 @@ public function hasDataChangedDataProvider()
         ];
     }
 
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
     public function testPrepareDataForUpdate()
     {
         $connectionMock = $this->getMock(AdapterInterface::class, [], [], '', false);
@@ -473,8 +472,7 @@ public function testPrepareDataForUpdate()
         $data = 'tableName';
         $this->_resourcesMock->expects($this->any())
             ->method('getConnection')
-            ->will($this->returnValue($connectionMock)
-        );
+            ->will($this->returnValue($connectionMock));
         $this->_resourcesMock->expects($this->any())->method('getTableName')->with($data)->will(
             $this->returnValue('tableName')
         );
@@ -503,7 +501,9 @@ public function testPrepareDataForUpdate()
         $abstractModelMock->afterLoad();
         $this->assertEquals($abstractModelMock->getData(), $abstractModelMock->getStoredData());
         $newData = ['value' => 'Test Value New'];
-        $this->_model->expects($this->atLeastOnce())->method('_prepareDataForTable')->will($this->returnValue($newData));
+        $this->_model->expects($this->atLeastOnce())
+            ->method('_prepareDataForTable')
+            ->will($this->returnValue($newData));
         $abstractModelMock->addData($newData);
         $this->assertNotEquals($abstractModelMock->getData(), $abstractModelMock->getStoredData());
         $abstractModelMock->isObjectNew(false);

lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/AbstractCollectionTest.php

@@ -4,12 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Model\Test\Unit\ResourceModel\Db\Collection;
 
 use Magento\Framework\DB\Select;
-use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 use Magento\Framework\DataObject as MagentoObject;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\ObjectManagerInterface;
@@ -215,7 +212,11 @@ public function testGetSelect($idFieldNameRet, $getPartRet, $expected)
             ->method('getPart')
             ->will($this->returnValue($getPartRet));
 
-        $this->selectMock->expects($this->once())->method('setPart')->with(\Magento\Framework\DB\Select::COLUMNS, $expected);
+        $this->selectMock
+            ->expects($this->once())
+            ->method('setPart')
+            ->with(\Magento\Framework\DB\Select::COLUMNS, $expected);
+
         $this->assertTrue($this->uut->getSelect() instanceof Select);
     }
 
@@ -410,34 +411,3 @@ public function testSave()
         $this->assertTrue($this->uut->save() instanceof Uut);
     }
 }
-
-/**
- * Pattern type: Public Morozov
- */
-class Uut extends AbstractCollection
-{
-    public function wereFieldsToSelectChanged()
-    {
-        return $this->_fieldsToSelectChanged;
-    }
-
-    public function getFieldsToSelect()
-    {
-        return $this->_fieldsToSelect;
-    }
-
-    public function setFieldsToSelect(array $fields)
-    {
-        $this->_fieldsToSelect = $fields;
-    }
-
-    public function setResource($resource)
-    {
-        $this->_resource = $resource;
-    }
-
-    public function getJoinedTables()
-    {
-        return $this->_joinedTables;
-    }
-}

lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/Uut.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Model\Test\Unit\ResourceModel\Db\Collection;
+
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+
+/**
+ * Pattern type: Public Morozov
+ */
+class Uut extends AbstractCollection
+{
+    public function wereFieldsToSelectChanged()
+    {
+        return $this->_fieldsToSelectChanged;
+    }
+
+    public function getFieldsToSelect()
+    {
+        return $this->_fieldsToSelect;
+    }
+
+    public function setFieldsToSelect(array $fields)
+    {
+        $this->_fieldsToSelect = $fields;
+    }
+
+    public function setResource($resource)
+    {
+        $this->_resource = $resource;
+    }
+
+    public function getJoinedTables()
+    {
+        return $this->_joinedTables;
+    }
+}