MAGETWO-32134: Build stabilization

Stanislav Idolov · Stanislav Idolov · commit 14505dcdc098 · 2015-01-09T11:31:52.000+02:00
diff --git a/dev/tests/api-functional/_files/Magento/TestModule4/Service/V1/Entity/ExtensibleRequest.php b/dev/tests/api-functional/_files/Magento/TestModule4/Service/V1/Entity/ExtensibleRequest.php
@@ -4,8 +4,7 @@
  */
 namespace Magento\TestModule4\Service\V1\Entity;
 
-class ExtensibleRequest extends \Magento\Framework\Model\AbstractExtensibleModel
-    implements ExtensibleRequestInterface
+class ExtensibleRequest extends \Magento\Framework\Model\AbstractExtensibleModel implements ExtensibleRequestInterface
 {
     public function getName()
     {
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleMSC/Model/Data/CustomAttributeDataObject.php b/dev/tests/api-functional/_files/Magento/TestModuleMSC/Model/Data/CustomAttributeDataObject.php
@@ -6,8 +6,8 @@
 
 use Magento\TestModuleMSC\Api\Data\CustomAttributeDataObjectInterface;
 
-class CustomAttributeDataObject extends \Magento\Framework\Api\AbstractExtensibleObject
-    implements CustomAttributeDataObjectInterface
+class CustomAttributeDataObject extends \Magento\Framework\Api\AbstractExtensibleObject implements
+    CustomAttributeDataObjectInterface
 {
     /**
      * @return string
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleMSC/Model/Data/CustomAttributeNestedDataObject.php b/dev/tests/api-functional/_files/Magento/TestModuleMSC/Model/Data/CustomAttributeNestedDataObject.php
@@ -6,8 +6,8 @@
 
 use Magento\TestModuleMSC\Api\Data\CustomAttributeNestedDataObjectInterface;
 
-class CustomAttributeNestedDataObject extends \Magento\Framework\Model\AbstractExtensibleModel
-    implements CustomAttributeNestedDataObjectInterface
+class CustomAttributeNestedDataObject extends \Magento\Framework\Model\AbstractExtensibleModel implements
+    CustomAttributeNestedDataObjectInterface
 {
     /**
      * @return string
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleMSC/Model/Data/Item.php b/dev/tests/api-functional/_files/Magento/TestModuleMSC/Model/Data/Item.php
@@ -6,8 +6,7 @@
 
 use Magento\TestModuleMSC\Api\Data\ItemInterface;
 
-class Item extends \Magento\Framework\Model\AbstractExtensibleModel
-    implements ItemInterface
+class Item extends \Magento\Framework\Model\AbstractExtensibleModel implements ItemInterface
 {
     /**
      * @return int
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryManagementTest.php
@@ -36,7 +36,7 @@ public function testTree($rootCategoryId, $depth, $expectedLevel, $expectedId)
         ];
         $result = $this->_webApiCall($serviceInfo, $requestData);
 
-        for($i = 0; $i < $expectedLevel; $i++) {
+        for ($i = 0; $i < $expectedLevel; $i++) {
             $result = $result['children_data'][0];
         }
         $this->assertEquals($expectedId, $result['id']);
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeManagementTest.php
@@ -147,7 +147,8 @@ public function testUnassignAttribute()
                 'operation' => self::SERVICE_NAME . 'Unassign',
             ],
         ];
-        $this->assertTrue($this->_webApiCall(
+        $this->assertTrue(
+            $this->_webApiCall(
                 $serviceInfo,
                 [
                     'attributeSetId' => $payload['attributeSetId'],
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php
@@ -262,7 +262,8 @@ public function testUpdate()
         if (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) {
             $optionDataPost['option_id'] = $optionId;
             $updatedOption = $this->_webApiCall(
-                $serviceInfo, [ 'id' => $optionId, 'option' => $optionDataPost]
+                $serviceInfo,
+                ['id' => $optionId, 'option' => $optionDataPost]
             );
         } else {
             $updatedOption = $this->_webApiCall(
@@ -307,13 +308,14 @@ public function testUpdateOptionAddingNewValue($optionType)
 
         $values = [];
         foreach ($option->getValues() as $key => $value) {
-            $values[] = [
-                'price' => $value->getPrice(),
-                'price_type' => $value->getPriceType(),
-                'sku' => $value->getSku(),
-                'title' => $value->getTitle(),
-                'sort_order' => $value->getSortOrder(),
-        ];
+            $values[] =
+                [
+                    'price' => $value->getPrice(),
+                    'price_type' => $value->getPriceType(),
+                    'sku' => $value->getSku(),
+                    'title' => $value->getTitle(),
+                    'sort_order' => $value->getSortOrder(),
+                ];
         }
         $values[] = $valueData;
         $data = [
@@ -339,12 +341,11 @@ public function testUpdateOptionAddingNewValue($optionType)
         if (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) {
             $data['option_id'] = $fixtureOption->getId();
             $valueObject = $this->_webApiCall(
-                $serviceInfo, [ 'option_id' => $fixtureOption->getId(), 'option' => $data]
+                $serviceInfo,
+                [ 'option_id' => $fixtureOption->getId(), 'option' => $data]
             );
         } else {
-            $valueObject = $this->_webApiCall(
-                $serviceInfo, ['option' => $data]
-            );
+            $valueObject = $this->_webApiCall($serviceInfo, ['option' => $data]);
         }
 
         $values = end($valueObject['values']);
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductMediaAttributeManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductMediaAttributeManagementTest.php
@@ -34,7 +34,7 @@ public function testGetList()
         $mediaAttributes = $this->_webApiCall($serviceInfo, $requestData);
 
         $this->assertNotEmpty($mediaAttributes);
-        $attribute = $this->getAttributeByCode($mediaAttributes,  'funny_image');
+        $attribute = $this->getAttributeByCode($mediaAttributes, 'funny_image');
         $this->assertNotNull($attribute);
         $this->assertEquals('Funny image', $attribute['default_frontend_label']);
         $this->assertEquals(1, $attribute['is_user_defined']);
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductTierPriceManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductTierPriceManagementTest.php
@@ -35,9 +35,9 @@ public function testGetList($customerGroupId, $count, $value, $qty)
         ];
 
         $groupPriceList = $this->_webApiCall(
-                $serviceInfo,
-                ['productSku' => $productSku, 'customerGroupId' => $customerGroupId]
-            );
+            $serviceInfo,
+            ['productSku' => $productSku, 'customerGroupId' => $customerGroupId]
+        );
 
         $this->assertCount($count, $groupPriceList);
         if ($count) {
diff --git a/dev/tests/api-functional/testsuite/Magento/CatalogInventory/Api/StockItemTest.php b/dev/tests/api-functional/testsuite/Magento/CatalogInventory/Api/StockItemTest.php
@@ -146,7 +146,7 @@ public function saveStockItemBySkuWithWrongInputDataProvider()
                     'use_config_max_sale_qty' => 1,
                     'is_in_stock' => 1,
                     'low_stock_date' => '',
-                    'notify_stock_qty' => NULL,
+                    'notify_stock_qty' => null,
                     'use_config_notify_stock_qty' => 1,
                     'manage_stock' => 0,
                     'use_config_manage_stock' => 1,
@@ -173,8 +173,8 @@ public function saveStockItemBySkuWithWrongInputDataProvider()
                     'max_sale_qty' => '0.0000',
                     'use_config_max_sale_qty' => '1',
                     'is_in_stock' => '1',
-                    'low_stock_date' => NULL,
-                    'notify_stock_qty' => NULL,
+                    'low_stock_date' => null,
+                    'notify_stock_qty' => null,
                     'use_config_notify_stock_qty' => '1',
                     'manage_stock' => '0',
                     'use_config_manage_stock' => '1',
diff --git a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/OptionRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/OptionRepositoryTest.php
@@ -285,5 +285,4 @@ protected function getList($productSku)
         ];
         return $this->_webApiCall($serviceInfo, ['productSku' => $productSku]);
     }
-
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php
@@ -73,10 +73,12 @@ public function testOrderCommentAdd()
             $this->assertEquals($commentData[OrderStatusHistoryInterface::COMMENT], $statusHistoryComment->getComment());
             $this->assertEquals($commentData[OrderStatusHistoryInterface::PARENT_ID], $statusHistoryComment->getParentId());
             $this->assertEquals(
-                $commentData[OrderStatusHistoryInterface::IS_CUSTOMER_NOTIFIED], $statusHistoryComment->getIsCustomerNotified()
+                $commentData[OrderStatusHistoryInterface::IS_CUSTOMER_NOTIFIED],
+                $statusHistoryComment->getIsCustomerNotified()
             );
             $this->assertEquals(
-                $commentData[OrderStatusHistoryInterface::IS_VISIBLE_ON_FRONT], $statusHistoryComment->getIsVisibleOnFront()
+                $commentData[OrderStatusHistoryInterface::IS_VISIBLE_ON_FRONT],
+                $statusHistoryComment->getIsVisibleOnFront()
             );
         }
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/Tax/Api/TaxClassRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Tax/Api/TaxClassRepositoryTest.php
@@ -290,10 +290,14 @@ public function testSearchTaxClassMultipleFilterGroups()
         $requestData = ['searchCriteria' => $searchData];
         $searchResults = $this->_webApiCall($serviceInfo, $requestData);
         $this->assertEquals(2, $searchResults['total_count']);
-        $this->assertEquals($productTaxClass[Data\TaxClassInterface::KEY_NAME],
-            $searchResults['items'][0][Data\TaxClassInterface::KEY_NAME]);
-        $this->assertEquals($customerTaxClass[Data\TaxClassInterface::KEY_NAME],
-            $searchResults['items'][1][Data\TaxClassInterface::KEY_NAME]);
+        $this->assertEquals(
+            $productTaxClass[Data\TaxClassInterface::KEY_NAME],
+            $searchResults['items'][0][Data\TaxClassInterface::KEY_NAME]
+        );
+        $this->assertEquals(
+            $customerTaxClass[Data\TaxClassInterface::KEY_NAME],
+            $searchResults['items'][1][Data\TaxClassInterface::KEY_NAME]
+        );
 
         /** class_name == 'Retail Customer' && ( class_type == 'CUSTOMER' || class_type == 'PRODUCT') */
         $this->searchCriteriaBuilder->addFilter([$filter2]);
@@ -303,7 +307,9 @@ public function testSearchTaxClassMultipleFilterGroups()
         $requestData = ['searchCriteria' => $searchData];
         $searchResults = $this->_webApiCall($serviceInfo, $requestData);
         $this->assertEquals(1, $searchResults['total_count']);
-        $this->assertEquals($customerTaxClass[Data\TaxClassInterface::KEY_NAME],
-            $searchResults['items'][0][Data\TaxClassInterface::KEY_NAME]);
+        $this->assertEquals(
+            $customerTaxClass[Data\TaxClassInterface::KEY_NAME],
+            $searchResults['items'][0][Data\TaxClassInterface::KEY_NAME]
+        );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,7 @@`
`4`	`4`	`*/`
`5`	`5`	`namespace Magento\TestModule4\Service\V1\Entity;`
`6`	`6`
`7`		`-class ExtensibleRequest extends \Magento\Framework\Model\AbstractExtensibleModel`
`8`		`- implements ExtensibleRequestInterface`
	`7`	`+class ExtensibleRequest extends \Magento\Framework\Model\AbstractExtensibleModel implements ExtensibleRequestInterface`
`9`	`8`	`{`
`10`	`9`	`public function getName()`
`11`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@`
`6`	`6`
`7`	`7`	`use Magento\TestModuleMSC\Api\Data\CustomAttributeDataObjectInterface;`
`8`	`8`
`9`		`-class CustomAttributeDataObject extends \Magento\Framework\Api\AbstractExtensibleObject`
`10`		`- implements CustomAttributeDataObjectInterface`
	`9`	`+class CustomAttributeDataObject extends \Magento\Framework\Api\AbstractExtensibleObject implements`
	`10`	`+ CustomAttributeDataObjectInterface`
`11`	`11`	`{`
`12`	`12`	`/**`
`13`	`13`	`* @return string`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@`
`6`	`6`
`7`	`7`	`use Magento\TestModuleMSC\Api\Data\CustomAttributeNestedDataObjectInterface;`
`8`	`8`
`9`		`-class CustomAttributeNestedDataObject extends \Magento\Framework\Model\AbstractExtensibleModel`
`10`		`- implements CustomAttributeNestedDataObjectInterface`
	`9`	`+class CustomAttributeNestedDataObject extends \Magento\Framework\Model\AbstractExtensibleModel implements`
	`10`	`+ CustomAttributeNestedDataObjectInterface`
`11`	`11`	`{`
`12`	`12`	`/**`
`13`	`13`	`* @return string`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,7 @@`
`6`	`6`
`7`	`7`	`use Magento\TestModuleMSC\Api\Data\ItemInterface;`
`8`	`8`
`9`		`-class Item extends \Magento\Framework\Model\AbstractExtensibleModel`
`10`		`- implements ItemInterface`
	`9`	`+class Item extends \Magento\Framework\Model\AbstractExtensibleModel implements ItemInterface`
`11`	`10`	`{`
`12`	`11`	`/**`
`13`	`12`	`* @return int`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function testTree($rootCategoryId, $depth, $expectedLevel, $expectedId)`
`36`	`36`	`];`
`37`	`37`	`$result = $this->_webApiCall($serviceInfo, $requestData);`
`38`	`38`
`39`		`- for($i = 0; $i < $expectedLevel; $i++) {`
	`39`	`+ for ($i = 0; $i < $expectedLevel; $i++) {`
`40`	`40`	`$result = $result['children_data'][0];`
`41`	`41`	`}`
`42`	`42`	`$this->assertEquals($expectedId, $result['id']);`