MAGETWO-32894: Refactor Catalog and related module to use mutable data object interface

Yu Tang · Yu Tang · commit e68a6862642b · 2015-02-24T15:14:41.000-06:00
- Fix static test failures
diff --git a/app/code/Magento/Catalog/Api/Data/EavAttributeInterface.php b/app/code/Magento/Catalog/Api/Data/EavAttributeInterface.php
@@ -151,7 +151,7 @@ public function getApplyTo();
     /**
      * Set apply to value for the element
      *
-     * @param string[]|string
+     * @param string[]|string $applyTo
      * @return $this
      */
     public function setApplyTo($applyTo);
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute.php b/app/code/Magento/Catalog/Model/Category/Attribute.php
@@ -215,7 +215,8 @@ public function getIsComparable()
      * @param string $isComparable
      * @return $this
      */
-    public function setIsComparable($isComparable) {
+    public function setIsComparable($isComparable)
+    {
         return $this->setData(self::IS_COMPARABLE, $isComparable);
     }
 
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
@@ -88,6 +88,8 @@ class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGal
      * @param \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory $entryFactory
      * @param \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Media $mediaGallery
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
diff --git a/app/code/Magento/Catalog/Model/Product/Option.php b/app/code/Magento/Catalog/Model/Product/Option.php
@@ -26,6 +26,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  */
 class Option extends AbstractExtensibleModel implements \Magento\Catalog\Api\Data\ProductCustomOptionInterface
 {
diff --git a/app/code/Magento/Catalog/Model/Resource/Eav/Attribute.php b/app/code/Magento/Catalog/Model/Resource/Eav/Attribute.php
@@ -26,6 +26,8 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
 class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
     \Magento\Catalog\Api\Data\ProductAttributeInterface
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
@@ -18,6 +18,7 @@
  * Catalog Inventory Stock Item Model
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  */
 class Item extends AbstractExtensibleModel implements StockItemInterface
 {
diff --git a/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php b/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
@@ -79,7 +79,8 @@ public function getChildren($productSku)
             $attributes['store_id'] = $child->getStoreId();
             /** @var \Magento\Catalog\Api\Data\ProductInterface $productDataObject */
             $productDataObject = $this->productFactory->create();
-            $this->dataObjectHelper->populateWithArray($productDataObject,
+            $this->dataObjectHelper->populateWithArray(
+                $productDataObject,
                 $attributes,
                 '\Magento\Catalog\Api\Data\ProductInterface'
             );
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
@@ -13,6 +13,7 @@
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
  */
 abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtensibleModel implements
     AttributeInterface,
diff --git a/dev/tests/api-functional/phpunit.xml.dist b/dev/tests/api-functional/phpunit.xml.dist
@@ -40,7 +40,7 @@
         <!-- WebSerivice Type. Possible values: soap, rest -->
         <const name="TESTS_WEB_API_ADAPTER" value="rest"/>
         <!-- Webserver URL -->
-        <const name="TESTS_BASE_URL" value="http://magento.url"/>
+        <const name="TESTS_BASE_URL" value="http://magento2.dev/magento2ce"/>
         <!-- Webserver API user -->
         <const name="TESTS_WEBSERVICE_USER" value="admin"/>
         <!-- Webserver API key -->
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Indexer/Stock/Action/RowTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Indexer/Stock/Action/RowTest.php
@@ -36,11 +36,6 @@ public function testProductUpdate()
             'Magento\Catalog\Block\Product\ListProduct'
         );
 
-        /** @var \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory $stockItemFactory */
-        $stockItemFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory'
-        );
-
         /** @var \Magento\Framework\Api\DataObjectHelper $dataObjectHelper */
         $dataObjectHelper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
             '\Magento\Framework\Api\DataObjectHelper'
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Indexer/Stock/Action/RowsTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Indexer/Stock/Action/RowsTest.php
@@ -36,11 +36,6 @@ public function testProductUpdate()
             'Magento\Catalog\Block\Product\ListProduct'
         );
 
-        /** @var \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory $stockItemFactory */
-        $stockItemFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory'
-        );
-
         /** @var \Magento\Framework\Api\DataObjectHelper $dataObjectHelper */
         $dataObjectHelper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
             '\Magento\Framework\Api\DataObjectHelper'
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/LinkManagementTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/LinkManagementTest.php
@@ -6,6 +6,7 @@
  */
 
 // @codingStandardsIgnoreFile
+//@SuppressWarnings(PHPMD.TooManyFields)
 
 namespace Magento\Bundle\Model;
 
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductLink/ManagementTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductLink/ManagementTest.php
@@ -111,13 +111,6 @@ public function testGetLinkedItemsByType()
             'position' => 'pos1',
         ];
         $itemCollection = [$item];
-        $expectedItem = [
-            'product_sku' => $productSku,
-            'link_type' => $linkType,
-            'linked_product_sku' => $item['sku'],
-            'linked_product_type' => $item['type'],
-            'position' => $item['position'],
-        ];
         $this->collectionProviderMock->expects($this->once())
             ->method('getCollection')
             ->with($this->productMock, $linkType)
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Entity/Attribute/AbstractAttributeTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Entity/Attribute/AbstractAttributeTest.php
@@ -96,7 +96,7 @@ public function testGetOptionWhenOptionsAreEmptyWithSource()
 
     public function testConvertToObjects()
     {
-        $AttributeOptionMock = $this->getMock('\Magento\Eav\Api\Data\AttributeOptionInterface');
+        $attributeOptionMock = $this->getMock('\Magento\Eav\Api\Data\AttributeOptionInterface');
         $dataFactoryMock = $this->getMock(
             'Magento\Eav\Api\Data\AttributeOptionInterfaceFactory',
             ['create'],
@@ -120,11 +120,11 @@ public function testConvertToObjects()
             ]
         );
         $dataObjectHelperMock->expects($this->once())->method('populateWithArray')
-            ->with($AttributeOptionMock, ['some value'], '\Magento\Eav\Api\Data\AttributeOptionInterface')
+            ->with($attributeOptionMock, ['some value'], '\Magento\Eav\Api\Data\AttributeOptionInterface')
             ->willReturnSelf();
-        $dataFactoryMock->expects($this->once())->method('create')->willReturn($AttributeOptionMock);
+        $dataFactoryMock->expects($this->once())->method('create')->willReturn($attributeOptionMock);
 
-        $this->assertEquals([$AttributeOptionMock], $model->getOptions());
+        $this->assertEquals([$attributeOptionMock], $model->getOptions());
     }
 
     public function testGetValidationRulesWhenRuleIsArray()
diff --git a/lib/internal/Magento/Framework/Api/DataObjectHelper.php b/lib/internal/Magento/Framework/Api/DataObjectHelper.php
@@ -57,6 +57,7 @@ public function populateWithArray($dataObject, array $data, $interfaceName = nul
      * @param array $data
      * @param string $interfaceName
      * @return $this
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     protected function _setDataValues($dataObject, array $data, $interfaceName)
     {

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public function getApplyTo();`
`151`	`151`	`/**`
`152`	`152`	`* Set apply to value for the element`
`153`	`153`	`*`
`154`		`- * @param string[]\|string`
	`154`	`+ * @param string[]\|string $applyTo`
`155`	`155`	`* @return $this`
`156`	`156`	`*/`
`157`	`157`	`public function setApplyTo($applyTo);`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,8 @@ public function getIsComparable()`
`215`	`215`	`* @param string $isComparable`
`216`	`216`	`* @return $this`
`217`	`217`	`*/`
`218`		`- public function setIsComparable($isComparable) {`
	`218`	`+ public function setIsComparable($isComparable)`
	`219`	`+ {`
`219`	`220`	`return $this->setData(self::IS_COMPARABLE, $isComparable);`
`220`	`221`	`}`
`221`	`222`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`*`
`27`	`27`	`* @author Magento Core Team <core@magentocommerce.com>`
`28`	`28`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
	`29`	`+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)`
`29`	`30`	`*/`
`30`	`31`	`class Option extends AbstractExtensibleModel implements \Magento\Catalog\Api\Data\ProductCustomOptionInterface`
`31`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@`
`26`	`26`	`*`
`27`	`27`	`* @author Magento Core Team <core@magentocommerce.com>`
`28`	`28`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
	`29`	`+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)`
	`30`	`+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)`
`29`	`31`	`*/`
`30`	`32`	`class Attribute extends \Magento\Eav\Model\Entity\Attribute implements`
`31`	`33`	`\Magento\Catalog\Api\Data\ProductAttributeInterface`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`* Catalog Inventory Stock Item Model`
`19`	`19`	`*`
`20`	`20`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
	`21`	`+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)`
`21`	`22`	`*/`
`22`	`23`	`class Item extends AbstractExtensibleModel implements StockItemInterface`
`23`	`24`	`{`