MAGETWO-55908: Prepare PR

Author: Yaroslav Onischenko

app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php

@@ -339,19 +339,22 @@ public function setPriceData($object, $priceData)
     }
 
     /**
+     * Perform price modification
+     *
      * @param \Magento\Catalog\Model\Product $object
      * @param array $data
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     protected function modifyPriceData($object, $data)
     {
-        foreach ($data as $k => $v) {
-            if (isset($v['price']) && $v['price'] > 0) {
-                $data[$k]['website_price'] = $v['price'];
+        /** @var array $priceItem */
+        foreach ($data as $key => $priceItem) {
+            if (isset($priceItem['price']) && $priceItem['price'] > 0) {
+                $data[$key]['website_price'] = $priceItem['price'];
             }
-            if ($v['all_groups']) {
-                $data[$k]['cust_group'] = $this->_groupManagement->getAllCustomersGroup()->getId();
+            if ($priceItem['all_groups']) {
+                $data[$key]['cust_group'] = $this->_groupManagement->getAllCustomersGroup()->getId();
             }
         }
         return $data;

app/code/Magento/Catalog/Model/Product/TierPrice.php

@@ -1,14 +1,11 @@
 <?php
 /**
- *
  * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 
 namespace Magento\Catalog\Model\Product;
 
-use Magento\Framework\App\ObjectManager;
-
 /**
  * @codeCoverageIgnore
  */
@@ -83,12 +80,6 @@ public function setCustomerGroupId($customerGroupId)
      */
     public function getExtensionAttributes()
     {
-        if (empty($this->_getExtensionAttributes())) {
-            $this->setExtensionAttributes(
-                ObjectManager::getInstance()->get(\Magento\Framework\Api\ExtensionAttributesFactory::class)
-                    ->create(\Magento\Catalog\Api\Data\ProductTierPriceInterface::class)
-            );
-        }
         return $this->_getExtensionAttributes();
     }