Merge branch 'MC-3103-product-attribute-full-width' into cms-team-1-delivery-sprint-12

Author: davemacaulay

app/code/Magento/Catalog/Block/Product/View/Attributes.php

@@ -67,20 +67,19 @@ public function getProduct()
     }
 
     /**
-     * $excludeAttr is optional array of attribute codes to
-     * exclude them from additional data array
+     * $excludeAttr is optional array of attribute codes to exclude them from additional data array
      *
      * @param array $excludeAttr
      * @return array
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getAdditionalData(array $excludeAttr = [])
     {
         $data = [];
         $product = $this->getProduct();
         $attributes = $product->getAttributes();
         foreach ($attributes as $attribute) {
-            if ($attribute->getIsVisibleOnFront() && !in_array($attribute->getAttributeCode(), $excludeAttr)) {
+            if ($this->isVisibleOnFrontend($attribute, $excludeAttr)) {
                 $value = $attribute->getFrontend()->getValue($product);
 
                 if ($value instanceof Phrase) {
@@ -100,4 +99,18 @@ public function getAdditionalData(array $excludeAttr = [])
         }
         return $data;
     }
+
+    /**
+     * Determine if we should display the attribute on the front-end
+     *
+     * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
+     * @param array $excludeAttr
+     * @return bool
+     */
+    protected function isVisibleOnFrontend(
+        \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute,
+        array $excludeAttr
+    ) {
+        return ($attribute->getIsVisibleOnFront() && !in_array($attribute->getAttributeCode(), $excludeAttr));
+    }
 }