Merge a4b34fe into MAGETWO-66180

Author: BaDos

app/code/Magento/Backend/Block/Menu.php

@@ -13,6 +13,7 @@
  *
  * @method \Magento\Backend\Block\Menu setAdditionalCacheKeyInfo(array $cacheKeyInfo)
  * @method array getAdditionalCacheKeyInfo()
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Menu extends \Magento\Backend\Block\Template
 {
@@ -381,7 +382,7 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
             $itemName = substr($menuId, strrpos($menuId, '::') + 2);
             $itemClass = str_replace('_', '-', strtolower($itemName));
 
-            if (count($colBrakes) && $colBrakes[$itemPosition]['colbrake']) {
+            if (count($colBrakes) && $colBrakes[$itemPosition]['colbrake'] && $itemPosition != 1) {
                 $output .= '</ul></li><li class="column"><ul role="menu">';
             }
 

app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml

@@ -11,7 +11,8 @@
 <?php
 $idSuffix = $block->getIdSuffix() ? $block->getIdSuffix() : '';
 /** @var \Magento\Bundle\Pricing\Render\FinalPriceBox $block */
-$productId = $block->getSaleableItem()->getId();
+
+
 /** @var \Magento\Bundle\Pricing\Price\FinalPrice $finalPriceModel */
 $finalPriceModel = $block->getPrice();
 $minimalPrice = $finalPriceModel->getMinimalPrice();

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -863,6 +863,7 @@ public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
      * Filter Product by Categories
      *
      * @param array $categoriesFilter
+     * @return $this
      */
     public function addCategoriesFilter(array $categoriesFilter)
     {
@@ -876,6 +877,7 @@ public function addCategoriesFilter(array $categoriesFilter)
             ];
             $this->getSelect()->where($this->getConnection()->prepareSqlCondition('e.entity_id' , $selectCondition));
         }
+        return $this;
     }
 
     /**

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

@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Eav\Model\Entity\Attribute\Backend;
+
+use Magento\Framework\Serialize\Serializer\Json;
+
+/**
+ * Backend model for attribute that stores structures in json format
+ */
+class JsonEncoded extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
+{
+    /**
+     * @var Json
+     */
+    private $jsonSerializer;
+
+    /**
+     * ArrayBackend constructor.
+     *
+     * @param Json $jsonSerializer
+     */
+    public function __construct(Json $jsonSerializer)
+    {
+        $this->jsonSerializer = $jsonSerializer;
+    }
+
+    /**
+     * Encode before saving
+     *
+     * @param \Magento\Framework\DataObject $object
+     * @return $this
+     */
+    public function beforeSave($object)
+    {
+        // parent::beforeSave() is not called intentionally
+        $attrCode = $this->getAttribute()->getAttributeCode();
+        if ($object->hasData($attrCode)) {
+            $object->setData($attrCode, $this->jsonSerializer->serialize($object->getData($attrCode)));
+        }
+        return $this;
+    }
+
+    /**
+     * Decode after loading
+     *
+     * @param \Magento\Framework\DataObject $object
+     * @return $this
+     */
+    public function afterLoad($object)
+    {
+        parent::afterLoad($object);
+        $attrCode = $this->getAttribute()->getAttributeCode();
+        $object->setData($attrCode, $this->jsonSerializer->unserialize($object->getData($attrCode)));
+        return $this;
+    }
+}

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

@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Eav\Test\Unit\Model\Entity\Attribute\Backend;
+
+use Magento\Eav\Model\Entity\Attribute\Backend\JsonEncoded;
+
+class JsonEncodedTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Eav\Model\Entity\Attribute\Backend\JsonEncoded
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Eav\Model\Entity\Attribute|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attributeMock;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Json|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $serializerMock;
+
+    /**
+     * Set up before test
+     */
+    protected function setUp()
+    {
+        $this->serializerMock = $this->getMockBuilder(\Magento\Framework\Serialize\Serializer\Json::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['serialize', 'unserialize'])
+            ->getMock();
+
+        $this->serializerMock->expects($this->any())
+            ->method('serialize')
+            ->will(
+                $this->returnCallback(
+                    function ($value) {
+                        return json_encode($value);
+                    }
+                )
+            );
+
+        $this->serializerMock->expects($this->any())
+            ->method('unserialize')
+            ->will(
+                $this->returnCallback(
+                    function ($value) {
+                        return json_decode($value, true);
+                    }
+                )
+            );
+
+        $this->attributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAttributeCode'])
+            ->getMock();
+
+        $this->attributeMock->expects($this->any())
+            ->method('getAttributeCode')
+            ->will($this->returnValue('json_encoded'));
+
+        $this->model = new JsonEncoded($this->serializerMock);
+        $this->model->setAttribute($this->attributeMock);
+    }
+
+    /**
+     * Test before save handler
+     */
+    public function testBeforeSave()
+    {
+        $product = new \Magento\Framework\DataObject(
+            [
+                'json_encoded' => [1, 2, 3]
+            ]
+        );
+        $this->model->beforeSave($product);
+        $this->assertEquals(json_encode([1, 2, 3]), $product->getData('json_encoded'));
+    }
+
+    /**
+     * Test after load handler
+     */
+    public function testAfterLoad()
+    {
+        $product = new \Magento\Framework\DataObject(
+            [
+                'json_encoded' => json_encode([1, 2, 3])
+            ]
+        );
+        $this->model->afterLoad($product);
+        $this->assertEquals([1, 2, 3], $product->getData('json_encoded'));
+    }
+}

app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/JsonEncodedTest.php

@@ -21,7 +21,7 @@ public function mapResources(array $resources)
         foreach ($resources as $resource) {
             $item = [];
             $item['attr']['data-id'] = $resource['id'];
-            $item['data'] = $resource['title'];
+            $item['data'] = __($resource['title']);
             $item['children'] = [];
             if (isset($resource['children'])) {
                 $item['state'] = 'open';

app/code/Magento/Integration/Helper/Data.php

@@ -441,6 +441,8 @@ public function getValueName()
         }
         if (!empty($valueArr)) {
             $value = implode(', ', $valueArr);
+        } elseif (is_array($value)) {
+            $value = implode(', ', $value);
         }
         return $value;
     }