Merge remote-tracking branch 'origin/MAGETWO-52836' into MAGETWO-52836

Author: akaplya

app/code/Magento/Customer/Model/Attribute.php

@@ -203,5 +203,4 @@ public function __wakeup()
         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
         $this->indexerRegistry = $objectManager->get(\Magento\Framework\Indexer\IndexerRegistry::class);
     }
-
 }

app/code/Magento/Customer/Model/Metadata/CachedMetadata.php

@@ -107,6 +107,7 @@ private function getCache()
         if (!$this->cache) {
             $this->cache = ObjectManager::getInstance()->get(AttributeCache::class);
         }
-       return $this->cache;
+        
+        return $this->cache;
     }
 }

app/code/Magento/Customer/Model/Metadata/CustomerCachedMetadata.php

@@ -13,6 +13,9 @@
  */
 class CustomerCachedMetadata extends CachedMetadata implements CustomerMetadataInterface
 {
+    /**
+     * @var string
+     */
     protected $entityType = 'customer';
 
     /**

app/code/Magento/Eav/Model/Entity/Attribute.php

@@ -522,10 +522,12 @@ public function __wakeup()
      */
     private function getReservedAttributeList()
     {
-        if($this->reservedAttributeList) {
-            $this->reservedAttributeList = \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Catalog\Model\Product\ReservedAttributeList::class);
+        if ($this->reservedAttributeList) {
+            $this->reservedAttributeList = \Magento\Framework\App\ObjectManager::getInstance()->get(
+                \Magento\Catalog\Model\Product\ReservedAttributeList::class
+            );
         }
+
         return $this->reservedAttributeList;
     }
-
 }

app/code/Magento/Eav/Model/Entity/AttributeCache.php

@@ -22,6 +22,7 @@ class AttributeCache
      * @var CacheInterface
      */
     private $cache;
+
     /**
      * @var StateInterface
      */
@@ -104,7 +105,7 @@ public function getAttributes($entityType, $suffix = '')
      * @param string $suffix
      * @return bool
      */
-    public function saveAttributes($entityType, $attributes, $suffix  = '')
+    public function saveAttributes($entityType, $attributes, $suffix = '')
     {
         if (in_array($entityType, $this->unsupportedTypes)) {
             return true;

app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php

@@ -17,6 +17,7 @@
  * EAV attribute resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -225,6 +226,7 @@ private function getAttributeCache()
         }
         return $this->attributeCache;
     }
+
     /**
      * @return Config
      * @deprecated
@@ -236,6 +238,7 @@ private function getConfig()
         }
         return $this->config;
     }
+
     /**
      * Save store labels
      *
@@ -728,5 +731,4 @@ public function __wakeup()
         $this->_storeManager = \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Store\Model\StoreManagerInterface::class);
     }
-
 }

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/AbstractTypeTest.php

@@ -124,7 +124,13 @@ public function testGetAttributeById()
             'catalog_product',
             'sku'
         );
-        $this->assertSame($sku->getAttributeId(), $this->_model->getAttributeById($sku->getId(), $product)->getAttributeId());
+        $this->assertSame(
+            $sku->getAttributeId(),
+            $this->_model->getAttributeById(
+                $sku->getId(),
+                $product
+            )->getAttributeId()
+        );
     }
 
     /**