From 6ec24b52bdf5dfd71c7e4fb1c11e0800569e9a0c Mon Sep 17 00:00:00 2001
From: Yaroslav Onischenko <yonischenko@magento.com>
Date: Fri, 18 Mar 2016 12:30:21 +0200
Subject: [PATCH 01/22] MAGETWO-50507: Exception error appears if Merchant
 resets "Product Attributes mass update" Admin form

---
 .../Product/Action/Attribute/Edit.php         |  21 +-
 .../Product/Action/Attribute/EditTest.php     | 191 ++++++++++++++++++
 2 files changed, 210 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/EditTest.php

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php
index 29f30ad573f03..0a623f6a4ca7f 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php
@@ -53,8 +53,12 @@ public function __construct(
      */
     public function execute()
     {
-        $collection = $this->filter->getCollection($this->collectionFactory->create());
-        $this->attributeHelper->setProductIds($collection->getAllIds());
+        $this->verifyNamespace();
+
+        if ($this->getRequest()->getParam('filters')) {
+            $collection = $this->filter->getCollection($this->collectionFactory->create());
+            $this->attributeHelper->setProductIds($collection->getAllIds());
+        }
 
         if (!$this->_validateProducts()) {
             return $this->resultRedirectFactory->create()->setPath('catalog/product/', ['_current' => true]);
@@ -63,4 +67,17 @@ public function execute()
         $resultPage->getConfig()->getTitle()->prepend(__('Update Attributes'));
         return $resultPage;
     }
+
+    /**
+     * Check if namespace is specified
+     * @return void
+     */
+    private function verifyNamespace()
+    {
+        if (!$this->getRequest()->getParam('namespace')) {
+            $params = $this->getRequest()->getParams();
+            $params['namespace'] = 'product_listing';
+            $this->getRequest()->setParams($params);
+        }
+    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/EditTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/EditTest.php
new file mode 100644
index 0000000000000..4c268a8857674
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/EditTest.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ *
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\Action\Attribute;
+
+class EditTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save */
+    private $object;
+
+    /** @var \Magento\Catalog\Helper\Product\Edit\Action\Attribute|\PHPUnit_Framework_MockObject_MockObject */
+    private $attributeHelper;
+
+    /** @var \Magento\Backend\Model\View\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject */
+    private $resultRedirectFactory;
+
+    /** @var \Magento\Ui\Component\MassAction\Filter|\PHPUnit_Framework_MockObject_MockObject */
+    private $filter;
+
+    /** @var \Magento\Backend\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject */
+    private $context;
+
+    /** @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject */
+    private $collectionFactory;
+
+    /** @var \Magento\Framework\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject */
+    private $resultPage;
+
+    /** @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject */
+    private $request;
+
+    protected function setUp()
+    {
+        $this->attributeHelper = $this->getMockBuilder('Magento\Catalog\Helper\Product\Edit\Action\Attribute')
+            ->setMethods(['getProductIds', 'setProductIds'])
+            ->disableOriginalConstructor()->getMock();
+
+        $this->resultRedirectFactory = $this->getMockBuilder('Magento\Backend\Model\View\Result\RedirectFactory')
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->filter = $this->getMockBuilder('Magento\Ui\Component\MassAction\Filter')
+            ->setMethods(['getCollection'])->disableOriginalConstructor()->getMock();
+
+        $this->collectionFactory = $this->getMockBuilder(
+            'Magento\Catalog\Model\ResourceModel\Product\CollectionFactory'
+        )->setMethods(['create'])->disableOriginalConstructor()->getMock();
+
+        $this->resultPage = $this->getMockBuilder('Magento\Framework\View\Result\Page')
+            ->setMethods(['getConfig'])->disableOriginalConstructor()->getMock();
+
+        $resultPageFactory = $this->getMockBuilder('Magento\Framework\View\Result\PageFactory')
+            ->setMethods(['create'])->disableOriginalConstructor()->getMock();
+        $resultPageFactory->expects($this->any())->method('create')->willReturn($this->resultPage);
+
+        $this->prepareContext();
+
+        $this->object = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))->getObject(
+            'Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Edit',
+            [
+                'context' => $this->context,
+                'attributeHelper' => $this->attributeHelper,
+                'filter' => $this->filter,
+                'resultPageFactory' => $resultPageFactory,
+                'collectionFactory' => $this->collectionFactory
+            ]
+        );
+    }
+
+    private function prepareContext()
+    {
+        $this->request = $this->getMockBuilder('Magento\Framework\App\Request\Http')
+            ->setMethods(['getParam', 'getParams', 'setParams'])
+            ->disableOriginalConstructor()->getMock();
+
+        $objectManager = $this->getMock('Magento\Framework\ObjectManagerInterface');
+        $product = $this->getMockBuilder('Magento\Catalog\Model\Product')
+            ->setMethods(['isProductsHasSku'])
+            ->disableOriginalConstructor()->getMock();
+        $product->expects($this->any())->method('isProductsHasSku')
+            ->with([1, 2, 3])
+            ->willReturn(true);
+        $objectManager->expects($this->any())->method('create')
+            ->with('Magento\Catalog\Model\Product')
+            ->willReturn($product);
+        $messageManager = $this->getMockBuilder('\Magento\Framework\Message\ManagerInterface')
+            ->setMethods([])
+            ->disableOriginalConstructor()->getMock();
+        $messageManager->expects($this->any())->method('addError')->willReturn(true);
+        $this->context = $this->getMockBuilder('Magento\Backend\App\Action\Context')
+            ->setMethods(['getRequest', 'getObjectManager', 'getMessageManager', 'getResultRedirectFactory'])
+            ->disableOriginalConstructor()->getMock();
+        $this->context->expects($this->any())->method('getRequest')->willReturn($this->request);
+        $this->context->expects($this->any())->method('getObjectManager')->willReturn($objectManager);
+        $this->context->expects($this->any())->method('getMessageManager')->willReturn($messageManager);
+        $this->context->expects($this->any())->method('getResultRedirectFactory')
+            ->willReturn($this->resultRedirectFactory);
+    }
+
+    public function testExecutePageRequested()
+    {
+        $this->request->expects($this->any())->method('getParam')->willReturnMap(
+            [
+                ['namespace', null, 'product_listing'],
+                ['filters', null, ['placeholder' => true]]
+            ]
+        );
+        $this->request->expects($this->any())->method('getParams')->willReturn(
+            [
+                'namespace' => 'product_listing',
+                'exclude' => true,
+                'filters' => ['placeholder' => true]
+            ]
+        );
+
+        $this->attributeHelper->expects($this->any())->method('getProductIds')->willReturn([1, 2, 3]);
+        $this->attributeHelper->expects($this->any())->method('setProductIds')->with([1, 2, 3]);
+
+        $collection = $this->getMockBuilder('Magento\Catalog\Model\ResourceModel\Product\Collection')
+            ->setMethods(['getAllIds'])
+            ->disableOriginalConstructor()->getMock();
+        $collection->expects($this->any())->method('getAllIds')->willReturn([1, 2, 3]);
+        $this->filter->expects($this->any())->method('getCollection')->with($collection)->willReturn($collection);
+        $this->collectionFactory->expects($this->any())->method('create')->willReturn($collection);
+
+        $title = $this->getMockBuilder('Magento\Framework\View\Page\Title')
+            ->setMethods(['prepend'])
+            ->disableOriginalConstructor()->getMock();
+        $config = $this->getMockBuilder('Magento\Framework\View\Page\Config')
+            ->setMethods(['getTitle'])
+            ->disableOriginalConstructor()->getMock();
+        $config->expects($this->any())->method('getTitle')->willReturn($title);
+        $this->resultPage->expects($this->any())->method('getConfig')->willReturn($config);
+
+        $this->assertSame($this->resultPage, $this->object->execute());
+    }
+
+    public function testExecutePageReload()
+    {
+        $this->request->expects($this->any())->method('getParam')->willReturnMap(
+            [
+                ['namespace', null, null],
+                ['filters', null, null]
+            ]
+        );
+        $this->request->expects($this->any())->method('getParams')->willReturn([]);
+
+        $this->attributeHelper->expects($this->any())->method('getProductIds')->willReturn([1, 2, 3]);
+        $this->attributeHelper->expects($this->any())->method('setProductIds')->with([1, 2, 3]);
+
+        $title = $this->getMockBuilder('Magento\Framework\View\Page\Title')
+            ->setMethods(['prepend'])
+            ->disableOriginalConstructor()->getMock();
+        $config = $this->getMockBuilder('Magento\Framework\View\Page\Config')
+            ->setMethods(['getTitle'])
+            ->disableOriginalConstructor()->getMock();
+        $config->expects($this->any())->method('getTitle')->willReturn($title);
+        $this->resultPage->expects($this->any())->method('getConfig')->willReturn($config);
+
+        $this->assertSame($this->resultPage, $this->object->execute());
+    }
+
+    public function testExecutePageDirectAccess()
+    {
+        $this->request->expects($this->any())->method('getParam')->willReturnMap(
+            [
+                ['namespace', null, null],
+                ['filters', null, null]
+            ]
+        );
+        $this->request->expects($this->any())->method('getParams')->willReturn([]);
+        $this->attributeHelper->expects($this->any())->method('getProductIds')->willReturn(null);
+
+        $resultRedirect = $this->getMockBuilder('Magento\Backend\Model\View\Result\Redirect')
+            ->setMethods(['setPath'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $resultRedirect->expects($this->any())->method('setPath')
+            ->with('catalog/product/', ['_current' => true])
+            ->willReturnSelf();
+        $this->resultRedirectFactory->expects($this->any())
+            ->method('create')
+            ->willReturn($resultRedirect);
+
+        $this->assertSame($resultRedirect, $this->object->execute());
+    }
+}

From 795ff97e369215d2634537ce764a909c0e40dcc8 Mon Sep 17 00:00:00 2001
From: Yaroslav Onischenko <yonischenko@magento.com>
Date: Mon, 21 Mar 2016 11:57:41 +0200
Subject: [PATCH 02/22] MAGETWO-50507: Exception error appears if Merchant
 resets "Product Attributes mass update" Admin form

- CR changes
---
 .../Product/Action/Attribute/Edit.php         | 15 -------------
 .../Product/Action/Attribute/EditTest.php     | 21 +++----------------
 2 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php
index 0a623f6a4ca7f..f24d8ea1e84ae 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php
@@ -53,8 +53,6 @@ public function __construct(
      */
     public function execute()
     {
-        $this->verifyNamespace();
-
         if ($this->getRequest()->getParam('filters')) {
             $collection = $this->filter->getCollection($this->collectionFactory->create());
             $this->attributeHelper->setProductIds($collection->getAllIds());
@@ -67,17 +65,4 @@ public function execute()
         $resultPage->getConfig()->getTitle()->prepend(__('Update Attributes'));
         return $resultPage;
     }
-
-    /**
-     * Check if namespace is specified
-     * @return void
-     */
-    private function verifyNamespace()
-    {
-        if (!$this->getRequest()->getParam('namespace')) {
-            $params = $this->getRequest()->getParams();
-            $params['namespace'] = 'product_listing';
-            $this->getRequest()->setParams($params);
-        }
-    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/EditTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/EditTest.php
index 4c268a8857674..d329ec1aabafc 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/EditTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/EditTest.php
@@ -103,12 +103,7 @@ private function prepareContext()
 
     public function testExecutePageRequested()
     {
-        $this->request->expects($this->any())->method('getParam')->willReturnMap(
-            [
-                ['namespace', null, 'product_listing'],
-                ['filters', null, ['placeholder' => true]]
-            ]
-        );
+        $this->request->expects($this->any())->method('getParam')->with('filters')->willReturn(['placeholder' => true]);
         $this->request->expects($this->any())->method('getParams')->willReturn(
             [
                 'namespace' => 'product_listing',
@@ -141,12 +136,7 @@ public function testExecutePageRequested()
 
     public function testExecutePageReload()
     {
-        $this->request->expects($this->any())->method('getParam')->willReturnMap(
-            [
-                ['namespace', null, null],
-                ['filters', null, null]
-            ]
-        );
+        $this->request->expects($this->any())->method('getParam')->with('filters')->willReturn(null);
         $this->request->expects($this->any())->method('getParams')->willReturn([]);
 
         $this->attributeHelper->expects($this->any())->method('getProductIds')->willReturn([1, 2, 3]);
@@ -166,12 +156,7 @@ public function testExecutePageReload()
 
     public function testExecutePageDirectAccess()
     {
-        $this->request->expects($this->any())->method('getParam')->willReturnMap(
-            [
-                ['namespace', null, null],
-                ['filters', null, null]
-            ]
-        );
+        $this->request->expects($this->any())->method('getParam')->with('filters')->willReturn(null);
         $this->request->expects($this->any())->method('getParams')->willReturn([]);
         $this->attributeHelper->expects($this->any())->method('getProductIds')->willReturn(null);
 

From 41c8dd49ff73212360d58f9623f76499d74c5171 Mon Sep 17 00:00:00 2001
From: Yurii Hryhoriev <yhryhoriev@magento.com>
Date: Tue, 22 Mar 2016 12:02:29 +0200
Subject: [PATCH 03/22] MAGETWO-48239: Improper escaping on RSS page on
 Storefront

---
 app/code/Magento/Rss/view/frontend/templates/feeds.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Rss/view/frontend/templates/feeds.phtml b/app/code/Magento/Rss/view/frontend/templates/feeds.phtml
index 86211e9977d7b..81ac6fd803259 100644
--- a/app/code/Magento/Rss/view/frontend/templates/feeds.phtml
+++ b/app/code/Magento/Rss/view/frontend/templates/feeds.phtml
@@ -14,7 +14,7 @@
     <?php foreach ($block->getFeeds() as $feed): ?>
         <?php if (!isset($feed['group'])): ?>
         <tr>
-            <td class="col feed"><?php /* @escapeNotVerified */ echo $feed['label'] ?></td>
+            <td class="col feed"><?php echo $block->escapeHtml($feed['label']) ?></td>
             <td class="col action">
                 <a href="<?php /* @escapeNotVerified */ echo $feed['link'] ?>" class="action get"><span><?php /* @escapeNotVerified */ echo __('Get Feed'); ?></span></a>
             </td>
@@ -23,7 +23,7 @@
             <th colspan="2" scope="col"><?php /* @escapeNotVerified */ echo $feed['group'] ?></th>
             <?php foreach ($feed['feeds'] as $item) :?>
                 <tr>
-                    <td class="col feed"><?php /* @escapeNotVerified */ echo $item['label'] ?></td>
+                    <td class="col feed"><?php echo $block->escapeHtml($item['label']) ?></td>
                     <td class="col action">
                         <a href="<?php /* @escapeNotVerified */ echo $item['link'] ?>" class="action get"><span><?php /* @escapeNotVerified */ echo __('Get Feed'); ?></span></a>
                     </td>

From c4d33abaa2d62138b253959ae2603819431cafd3 Mon Sep 17 00:00:00 2001
From: Yurii Hryhoriev <yhryhoriev@magento.com>
Date: Thu, 31 Mar 2016 15:30:06 +0300
Subject: [PATCH 04/22] MAGETWO-51238: Swatches are not displayed on category
 page

---
 .../ConfigurableProduct/Model/Product/Type/Configurable.php    | 3 +++
 .../view/frontend/templates/product/layered/renderer.phtml     | 2 +-
 .../view/frontend/templates/product/listing/renderer.phtml     | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index e2a2cdf527fd5..0cd50337b8f85 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -508,6 +508,9 @@ public function getUsedProducts($product, $requiredAttributeIds = null)
             $collection = $this->getUsedProductCollection($product)
                 ->addAttributeToSelect('name')
                 ->addAttributeToSelect('price')
+                ->addAttributeToSelect('color')
+                ->addAttributeToSelect('size')
+                ->addAttributeToSelect('image')
 //                ->addAttributeToSelect('msrp')
 //                ->addAttributeToSelect('media_gallery')
                 ->addFilterByRequiredOptions()
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
index 5f26d947a5d4f..2b3c9f148360f 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
@@ -69,7 +69,7 @@
 </div>
 
 <script>
-    require(["jquery", "jquery/ui", "swatchRenderer"], function ($) {
+    require(["jquery", "jquery/ui", "Magento_Swatches/js/swatch-renderer"], function ($) {
         $('.swatch-layered.<?php /* @escapeNotVerified */ echo $swatchData['attribute_code'] ?>')
             .find('[option-type="1"], [option-type="2"], [option-type="0"], [option-type="3"]')
             .SwatchRendererTooltip();
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
index df14889e223b9..86046fdce4b6e 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
@@ -7,7 +7,7 @@
 <?php /** @var $block \Magento\Swatches\Block\Product\Renderer\Configurable */ ?>
 <div class="swatch-opt-<?php /* @escapeNotVerified */ echo $block->getProduct()->getId() ?>"></div>
 <script>
-    require(["jquery", "jquery/ui", "swatchRenderer"], function ($) {
+    require(["jquery", "jquery/ui", "Magento_Swatches/js/swatch-renderer"], function ($) {
         $('.swatch-opt-<?php /* @escapeNotVerified */ echo $block->getProduct()->getId() ?>').SwatchRenderer({
             selectorProduct: '.product-item-details',
             onlySwatches: true,

From dc09a7c8a1d1dc69b0613901006e5e2b66f18c13 Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@ebay.com>
Date: Thu, 31 Mar 2016 17:14:26 +0300
Subject: [PATCH 05/22] MAGETWO-51314: Exception appears when sorting product
 by swatch attribute

---
 .../Model/Entity/Attribute/Source/Table.php   | 22 +++---
 .../Entity/Attribute/Source/TableTest.php     | 79 +++++++++++++++++--
 2 files changed, 85 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
index 04b414a70a245..1476624b2b540 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
@@ -138,18 +138,20 @@ public function getOptionText($value)
      */
     public function addValueSortToCollection($collection, $dir = \Magento\Framework\DB\Select::SQL_ASC)
     {
-        $valueTable1 = $this->getAttribute()->getAttributeCode() . '_t1';
-        $valueTable2 = $this->getAttribute()->getAttributeCode() . '_t2';
+        $attribute = $this->getAttribute();
+        $valueTable1 = $attribute->getAttributeCode() . '_t1';
+        $valueTable2 = $attribute->getAttributeCode() . '_t2';
+        $linkField = $attribute->getEntity()->getLinkField();
         $collection->getSelect()->joinLeft(
-            [$valueTable1 => $this->getAttribute()->getBackend()->getTable()],
-            "e.entity_id={$valueTable1}.entity_id" .
-            " AND {$valueTable1}.attribute_id='{$this->getAttribute()->getId()}'" .
+            [$valueTable1 => $attribute->getBackend()->getTable()],
+            "e.entity_id={$valueTable1}." . $linkField .
+            " AND {$valueTable1}.attribute_id='{$attribute->getId()}'" .
             " AND {$valueTable1}.store_id=0",
             []
         )->joinLeft(
-            [$valueTable2 => $this->getAttribute()->getBackend()->getTable()],
-            "e.entity_id={$valueTable2}.entity_id" .
-            " AND {$valueTable2}.attribute_id='{$this->getAttribute()->getId()}'" .
+            [$valueTable2 => $attribute->getBackend()->getTable()],
+            "e.entity_id={$valueTable2}." . $linkField .
+            " AND {$valueTable2}.attribute_id='{$attribute->getId()}'" .
             " AND {$valueTable2}.store_id='{$collection->getStoreId()}'",
             []
         );
@@ -161,11 +163,11 @@ public function addValueSortToCollection($collection, $dir = \Magento\Framework\
 
         $this->_attrOptionFactory->create()->addOptionValueToCollection(
             $collection,
-            $this->getAttribute(),
+            $attribute,
             $valueExpr
         );
 
-        $collection->getSelect()->order("{$this->getAttribute()->getAttributeCode()} {$dir}");
+        $collection->getSelect()->order("{$attribute->getAttributeCode()} {$dir}");
 
         return $this;
     }
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/TableTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/TableTest.php
index de1a5e6cbae4d..4cba076a178e4 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/TableTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/TableTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Eav\Test\Unit\Model\Entity\Attribute\Source;
 
-use Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class TableTest extends \PHPUnit_Framework_TestCase
@@ -16,10 +15,15 @@ class TableTest extends \PHPUnit_Framework_TestCase
     protected $_model;
 
     /**
-     * @var CollectionFactory | \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory | \PHPUnit_Framework_MockObject_MockObject
      */
     protected $collectionFactory;
 
+    /**
+     * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\OptionFactory | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $attrOptionFactory;
+
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
@@ -40,13 +44,23 @@ protected function setUp()
             false
         );
 
+        $this->attrOptionFactory = $this->getMockBuilder(
+            'Magento\Eav\Model\ResourceModel\Entity\Attribute\OptionFactory'
+        )
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
         $this->_model = $objectManager->getObject(
             'Magento\Eav\Model\Entity\Attribute\Source\Table',
-            ['attrOptionCollectionFactory' => $this->collectionFactory]
+            [
+                'attrOptionCollectionFactory' => $this->collectionFactory,
+                'attrOptionFactory' => $this->attrOptionFactory
+            ]
         );
     }
 
-    public function testGetFlatColumns()
+    public function te1stGetFlatColumns()
     {
         $abstractFrontendMock = $this->getMock(
             'Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend',
@@ -97,7 +111,7 @@ public function testGetFlatColumns()
      * @param array $optionIds
      * @param bool $withEmpty
      */
-    public function testGetSpecificOptions($optionIds, $withEmpty)
+    public function te1stGetSpecificOptions($optionIds, $withEmpty)
     {
         $attributeId = 1;
         $storeId = 5;
@@ -166,7 +180,7 @@ public function specificOptionsProvider()
      * @param array $options
      * @param array|string $expectedResult
      */
-    public function testGetOptionText($optionsIds, $value, $options, $expectedResult)
+    public function te1stGetOptionText($optionsIds, $value, $options, $expectedResult)
     {
         $attributeId = 1;
         $storeId = 5;
@@ -227,4 +241,57 @@ public function getOptionTextProvider()
             ['5', '5', [['label' => 'test label', 'value' => '5']], 'test label']
         ];
     }
+
+    public function testAddValueSortToCollection()
+    {
+        $attributeCode = 'attribute_code';
+        $dir = \Magento\Framework\DB\Select::SQL_ASC;
+        $collection = $this->getMockBuilder('Magento\Eav\Model\Entity\Collection\AbstractCollection')
+            ->setMethods([ 'getSelect', 'getStoreId'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $attribute = $this->getMockBuilder('Magento\Eav\Model\Entity\Attribute\AbstractAttribute')
+            ->setMethods(['getAttributeCode', 'getEntity', 'getBackend', 'getId'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $attribute->expects($this->any())->method('getAttributeCode')->willReturn($attributeCode);
+        $entity = $this->getMockBuilder('Magento\Eav\Model\Entity\AbstractEntity')
+            ->setMethods(['getLinkField'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $attribute->expects($this->once())->method('getEntity')->willReturn($entity);
+        $entity->expects($this->once())->method('getLinkField')->willReturn('entity_id');
+        $select = $this->getMockBuilder('Magento\Framework\DB\Select')
+            ->setMethods(['joinLeft', 'getConnection', 'order'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $collection->expects($this->any())->method('getSelect')->willReturn($select);
+        $select->expects($this->any())->method('joinLeft')->willReturnSelf();
+        $backend = $this->getMockBuilder('Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend')
+            ->setMethods(['getTable'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $attribute->expects($this->any())->method('getBackend')->willReturn($backend);
+        $backend->expects($this->any())->method('getTable')->willReturn('table_name');
+        $attribute->expects($this->any())->method('getId')->willReturn(1);
+        $collection->expects($this->once())->method('getStoreId')->willReturn(1);
+        $connection = $this->getMockBuilder('Magento\Framework\DB\Adapter\AdapterInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $expr = $this->getMockBuilder('Zend_Db_Expr')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $connection->expects($this->once())->method('getCheckSql')->willReturn($expr);
+        $select->expects($this->once())->method('getConnection')->willReturn($connection);
+        $attrOption = $this->getMockBuilder('Magento\Eav\Model\ResourceModel\Entity\Attribute\Option')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->attrOptionFactory->expects($this->once())->method('create')->willReturn($attrOption);
+        $attrOption->expects($this->once())->method('addOptionValueToCollection')->with($collection, $attribute, $expr)
+            ->willReturnSelf();
+        $select->expects($this->once())->method('order')->with("{$attributeCode} {$dir}");
+
+        $this->_model->setAttribute($attribute);
+        $this->assertEquals($this->_model, $this->_model->addValueSortToCollection($collection, $dir));
+    }
 }

From dc4c4451c77a80818caefaf2f59d65b11a1b0674 Mon Sep 17 00:00:00 2001
From: Victor Rad <vrad@ebay.com>
Date: Sun, 3 Apr 2016 10:35:01 +0300
Subject: [PATCH 06/22] MAGETWO-51074: Product images not switching when
 clicking on swatch

---
 .../Swatches/Block/Product/Renderer/Configurable.php   |  2 +-
 .../Unit/Block/Product/Renderer/ConfigurableTest.php   | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php b/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
index 0d06c0176980a..4546a01529d33 100644
--- a/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
+++ b/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
@@ -404,7 +404,7 @@ protected function getHtmlOutput()
      */
     public function getMediaCallback()
     {
-        return $this->getBaseUrl() . self::MEDIA_CALLBACK_ACTION;
+        return $this->getUrl(self::MEDIA_CALLBACK_ACTION, ['_secure' => $this->getRequest()->isSecure()]);
     }
 
     /**
diff --git a/app/code/Magento/Swatches/Test/Unit/Block/Product/Renderer/ConfigurableTest.php b/app/code/Magento/Swatches/Test/Unit/Block/Product/Renderer/ConfigurableTest.php
index e32e263391cb1..44ea9663bc86c 100644
--- a/app/code/Magento/Swatches/Test/Unit/Block/Product/Renderer/ConfigurableTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Block/Product/Renderer/ConfigurableTest.php
@@ -323,7 +323,13 @@ public function testGetJsonSwatchConfigWithoutVisualImageType()
 
     public function testGetMediaCallback()
     {
-        $this->urlBuilder->expects($this->once())->method('getBaseUrl')->willReturn('http://magento.com/');
-        $this->assertContains(Configurable::MEDIA_CALLBACK_ACTION, $this->configurable->getMediaCallback());
+        $url = 'http://localhost/' . Configurable::MEDIA_CALLBACK_ACTION;
+
+        $this->urlBuilder->expects($this->once())
+            ->method('getUrl')
+            ->with(Configurable::MEDIA_CALLBACK_ACTION)
+            ->willReturn($url);
+
+        $this->assertEquals($url, $this->configurable->getMediaCallback());
     }
 }

From b3ee91da2d6ab79b9c72530cb68b1a7e59be318a Mon Sep 17 00:00:00 2001
From: Yurii Hryhoriev <yhryhoriev@magento.com>
Date: Mon, 4 Apr 2016 18:56:06 +0300
Subject: [PATCH 07/22] MAGETWO-51238: Swatches are not displayed on category
 page

---
 .../Model/Product/Type/Configurable.php       |  3 -
 .../Swatches/Model/Plugin/Configurable.php    | 53 ++++++++++++++++++
 .../Unit/Model/Plugin/ConfigurableTest.php    | 55 +++++++++++++++++++
 app/code/Magento/Swatches/etc/di.xml          |  3 +
 4 files changed, 111 insertions(+), 3 deletions(-)
 create mode 100644 app/code/Magento/Swatches/Model/Plugin/Configurable.php
 create mode 100644 app/code/Magento/Swatches/Test/Unit/Model/Plugin/ConfigurableTest.php

diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index 0cd50337b8f85..e2a2cdf527fd5 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -508,9 +508,6 @@ public function getUsedProducts($product, $requiredAttributeIds = null)
             $collection = $this->getUsedProductCollection($product)
                 ->addAttributeToSelect('name')
                 ->addAttributeToSelect('price')
-                ->addAttributeToSelect('color')
-                ->addAttributeToSelect('size')
-                ->addAttributeToSelect('image')
 //                ->addAttributeToSelect('msrp')
 //                ->addAttributeToSelect('media_gallery')
                 ->addFilterByRequiredOptions()
diff --git a/app/code/Magento/Swatches/Model/Plugin/Configurable.php b/app/code/Magento/Swatches/Model/Plugin/Configurable.php
new file mode 100644
index 0000000000000..6e463b5bc3007
--- /dev/null
+++ b/app/code/Magento/Swatches/Model/Plugin/Configurable.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Swatches\Model\Plugin;
+
+
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableProductType;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection;
+
+class Configurable
+{
+    private $eavConfig;
+
+    private $swatchHelper;
+
+    /**
+     * @param \Magento\Swatches\Model\SwatchFactory $eavConfig
+     * @param \Magento\Swatches\Helper\Data $swatchHelper
+     */
+    public function __construct(
+        \Magento\Eav\Model\Config $eavConfig,
+        \Magento\Swatches\Helper\Data $swatchHelper
+    ) {
+        $this->eavConfig = $eavConfig;
+        $this->swatchHelper = $swatchHelper;
+    }
+
+    /**
+     * Returns Configurable Products Collection with added swatch attributes
+     *
+     * @param ConfigurableProduct $subject
+     * @param Collection $result
+     * @return Collection
+     */
+    public function afterGetUsedProductCollection(
+        ConfigurableProductType $subject,
+        Collection $result
+    ) {
+        $attributeCodes = ['image'];
+        $entityType = $result->getEntity()->getType();
+
+        foreach ($this->eavConfig->getEntityAttributeCodes($entityType) as $code) {
+            $attribute = $this->eavConfig->getAttribute($entityType, $code);
+            if ($this->swatchHelper->isVisualSwatch($attribute) || $this->swatchHelper->isTextSwatch($attribute)) {
+                $attributeCodes[] = $code;
+            }
+        }
+        $result->addAttributeToSelect($attributeCodes);
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ConfigurableTest.php b/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ConfigurableTest.php
new file mode 100644
index 0000000000000..4eae15541be79
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ConfigurableTest.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Swatches\Test\Unit\Model\Plugin;
+
+
+class ConfigurableTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject */
+    private $eavConfig;
+
+    /** @var \Magento\Swatches\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
+    private $swatchHelper;
+
+    /** @var \Magento\Swatches\Model\Plugin\Configurable|\Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
+    protected $pluginModel;
+    
+    protected function setUp()
+    {
+        $this->eavConfig = $this->getMock('\Magento\Eav\Model\Config', ['getEntityAttributeCodes', 'getAttribute'], [], '', false);
+        $this->swatchHelper = $this->getMock('\Magento\Swatches\Helper\Data', ['isVisualSwatch', 'isTextSwatch'], [], '', false);
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->pluginModel = $objectManager->getObject(
+            '\Magento\Swatches\Model\Plugin\Configurable',
+            [
+                'eavConfig' => $this->eavConfig,
+                'swatchHelper' => $this->swatchHelper,
+            ]
+        );
+    }
+
+    public function testAfterGetUsedProductCollection() {
+        $subject = $this->getMock('\Magento\ConfigurableProduct\Model\Product\Type\Configurable', [], [], '', false);
+        $result = $this->getMock('\Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection', ['getEntity', 'addAttributeToSelect'], [], '', false);
+
+        $collectionEntity = $this->getMock('\Magento\Eav\Model\Entity\Collection\AbstractCollection', ['getType'], [], '', false);
+        $collectionEntity->expects($this->once())->method('getType')->willReturn('catalog');
+        $result->expects($this->once())->method('getEntity')->willReturn($collectionEntity);
+
+        $attribute = $this->getMock('\Magento\Catalog\Model\ResourceModel\Eav\Attribute', [], [], '', false);
+
+        $this->eavConfig->expects($this->once())->method('getEntityAttributeCodes')->with('catalog')->willReturn(['size', 'color', 'swatch1']);
+        $this->eavConfig->expects($this->exactly(3))->method('getAttribute')->willReturn($attribute);
+
+        $this->swatchHelper->expects($this->exactly(3))->method('isVisualSwatch')->with($attribute)->willReturn(true);
+
+        $result->expects($this->once())->method('addAttributeToSelect')->with($this->identicalTo(['image', 'size', 'color', 'swatch1']))->willReturn($result);
+
+        $result = $this->pluginModel->afterGetUsedProductCollection($subject, $result);
+        $this->assertInstanceOf('\Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection', $result);
+    }
+}
diff --git a/app/code/Magento/Swatches/etc/di.xml b/app/code/Magento/Swatches/etc/di.xml
index f73753acfb714..f91a525777606 100644
--- a/app/code/Magento/Swatches/etc/di.xml
+++ b/app/code/Magento/Swatches/etc/di.xml
@@ -18,6 +18,9 @@
     <type name="Magento\LayeredNavigation\Block\Navigation\FilterRenderer">
         <plugin name="swatches_layered_renderer" type="Magento\Swatches\Model\Plugin\FilterRenderer" sortOrder="1" />
     </type>
+    <type name="Magento\ConfigurableProduct\Model\Product\Type\Configurable">
+        <plugin name="add_swatch_attributes_to_configurable" type="Magento\Swatches\Model\Plugin\Configurable" />
+    </type>
     <type name="Magento\Eav\Model\Attribute\FrontendType">
         <arguments>
             <argument name="config" xsi:type="array">

From c15fbf4a209c9887304b731c5c64abc862f21827 Mon Sep 17 00:00:00 2001
From: Yaroslav Onischenko <yonischenko@magento.com>
Date: Tue, 5 Apr 2016 12:41:06 +0300
Subject: [PATCH 08/22] MAGETWO-50898: [Add Product to Cart with Minimum Qty
 Allowed Set] No error message when qty is less than minimum

---
 app/code/Magento/Checkout/Model/Cart.php      |  7 +--
 .../Magento/Checkout/Model/CartTest.php       | 55 +++++++++++++++++++
 .../_files/set_product_min_in_cart.php        | 10 ++++
 3 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/Model/CartTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/set_product_min_in_cart.php

diff --git a/app/code/Magento/Checkout/Model/Cart.php b/app/code/Magento/Checkout/Model/Cart.php
index 585a1ed5336cf..579eb998e06af 100644
--- a/app/code/Magento/Checkout/Model/Cart.php
+++ b/app/code/Magento/Checkout/Model/Cart.php
@@ -321,9 +321,6 @@ protected function _getProductRequest($requestInfo)
             $request = new \Magento\Framework\DataObject($requestInfo);
         }
 
-        if (!$request->hasQty()) {
-            $request->setQty(1);
-        }
         !$request->hasFormKey() ?: $request->unsFormKey();
 
         return $request;
@@ -350,7 +347,7 @@ public function addProduct($productInfo, $requestInfo = null)
             //If product was not found in cart and there is set minimal qty for it
             if ($minimumQty
                 && $minimumQty > 0
-                && $request->getQty() < $minimumQty
+                && !$request->getQty()
                 && !$this->getQuote()->hasProductId($productId)
             ) {
                 $request->setQty($minimumQty);
@@ -690,7 +687,7 @@ public function updateItem($itemId, $requestInfo = null, $updatingParams = null)
                 // If product was not found in cart and there is set minimal qty for it
                 if ($minimumQty
                     && $minimumQty > 0
-                    && $request->getQty() < $minimumQty
+                    && !$request->getQty()
                     && !$this->getQuote()->hasProductId($productId)
                 ) {
                     $request->setQty($minimumQty);
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Model/CartTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Model/CartTest.php
new file mode 100644
index 0000000000000..4c3892acfb223
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Model/CartTest.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Checkout\Model;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+class CartTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Cart
+     */
+    private $cart;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    protected function setUp()
+    {
+        $this->cart = Bootstrap::getObjectManager()->create(Cart::class);
+        $this->productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Checkout/_files/simple_product.php
+     * @magentoDataFixture Magento/Checkout/_files/set_product_min_in_cart.php
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     */
+    public function testAddProductWithLowerQty()
+    {
+        $this->setExpectedException(
+            \Magento\Framework\Exception\LocalizedException::class,
+            'The fewest you may purchase is 3'
+        );
+        $product = $this->productRepository->get('simple');
+        $this->cart->addProduct($product->getId(), ['qty' => 1]);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Checkout/_files/simple_product.php
+     * @magentoDataFixture Magento/Checkout/_files/set_product_min_in_cart.php
+     * @magentoDbIsolation enabled
+     */
+    public function testAddProductWithNoQty()
+    {
+        $product = $this->productRepository->get('simple');
+        $this->cart->addProduct($product->getId(), []);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/set_product_min_in_cart.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/set_product_min_in_cart.php
new file mode 100644
index 0000000000000..ccc7b3ec93a2d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/set_product_min_in_cart.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+include 'simple_product.php';
+/** @var $product \Magento\Catalog\Model\Product */
+$product->setStockData(['use_config_manage_stock' => 0, 'min_sale_qty' => 3]);
+$product->save();

From 8a4b73296393f68d6b8211c8b9e9b43b9f281837 Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@ebay.com>
Date: Tue, 5 Apr 2016 14:04:01 +0300
Subject: [PATCH 09/22] MAGETWO-51314: Exception appears when sorting product
 by swatch attribute

---
 .../Entity/Attribute/Source/TableTest.php     | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/TableTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/TableTest.php
index 4cba076a178e4..32fa21d6d285f 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/TableTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/TableTest.php
@@ -12,17 +12,17 @@ class TableTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \Magento\Eav\Model\Entity\Attribute\Source\Table
      */
-    protected $_model;
+    private $model;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $collectionFactory;
+    private $collectionFactory;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\OptionFactory | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $attrOptionFactory;
+    private $attrOptionFactory;
 
     protected function setUp()
     {
@@ -51,7 +51,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
-        $this->_model = $objectManager->getObject(
+        $this->model = $objectManager->getObject(
             'Magento\Eav\Model\Entity\Attribute\Source\Table',
             [
                 'attrOptionCollectionFactory' => $this->collectionFactory,
@@ -60,7 +60,7 @@ protected function setUp()
         );
     }
 
-    public function te1stGetFlatColumns()
+    public function testGetFlatColumns()
     {
         $abstractFrontendMock = $this->getMock(
             'Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend',
@@ -88,9 +88,9 @@ public function te1stGetFlatColumns()
 
         $abstractAttributeMock->expects($this->any())->method('getAttributeCode')->will($this->returnValue('code'));
 
-        $this->_model->setAttribute($abstractAttributeMock);
+        $this->model->setAttribute($abstractAttributeMock);
 
-        $flatColumns = $this->_model->getFlatColumns();
+        $flatColumns = $this->model->getFlatColumns();
 
         $this->assertTrue(is_array($flatColumns), 'FlatColumns must be an array value');
         $this->assertTrue(!empty($flatColumns), 'FlatColumns must be not empty');
@@ -111,7 +111,7 @@ public function te1stGetFlatColumns()
      * @param array $optionIds
      * @param bool $withEmpty
      */
-    public function te1stGetSpecificOptions($optionIds, $withEmpty)
+    public function testGetSpecificOptions($optionIds, $withEmpty)
     {
         $attributeId = 1;
         $storeId = 5;
@@ -131,7 +131,7 @@ public function te1stGetSpecificOptions($optionIds, $withEmpty)
             ->method('getStoreId')
             ->willReturn($storeId);
 
-        $this->_model->setAttribute($attribute);
+        $this->model->setAttribute($attribute);
 
         $this->collectionFactory->expects($this->once())
             ->method('create')
@@ -162,7 +162,7 @@ public function te1stGetSpecificOptions($optionIds, $withEmpty)
             array_unshift($options, ['label' => '', 'value' => '']);
         }
 
-        $this->assertEquals($options, $this->_model->getSpecificOptions($optionIds, $withEmpty));
+        $this->assertEquals($options, $this->model->getSpecificOptions($optionIds, $withEmpty));
     }
 
     public function specificOptionsProvider()
@@ -180,7 +180,7 @@ public function specificOptionsProvider()
      * @param array $options
      * @param array|string $expectedResult
      */
-    public function te1stGetOptionText($optionsIds, $value, $options, $expectedResult)
+    public function testGetOptionText($optionsIds, $value, $options, $expectedResult)
     {
         $attributeId = 1;
         $storeId = 5;
@@ -198,7 +198,7 @@ public function te1stGetOptionText($optionsIds, $value, $options, $expectedResul
             ->method('getStoreId')
             ->willReturn($storeId);
 
-        $this->_model->setAttribute($attribute);
+        $this->model->setAttribute($attribute);
 
         $this->collectionFactory->expects($this->once())
             ->method('create')
@@ -225,7 +225,7 @@ public function te1stGetOptionText($optionsIds, $value, $options, $expectedResul
             ->method('toOptionArray')
             ->willReturn($options);
 
-        $this->assertEquals($expectedResult, $this->_model->getOptionText($value));
+        $this->assertEquals($expectedResult, $this->model->getOptionText($value));
     }
 
     public function getOptionTextProvider()
@@ -291,7 +291,7 @@ public function testAddValueSortToCollection()
             ->willReturnSelf();
         $select->expects($this->once())->method('order')->with("{$attributeCode} {$dir}");
 
-        $this->_model->setAttribute($attribute);
-        $this->assertEquals($this->_model, $this->_model->addValueSortToCollection($collection, $dir));
+        $this->model->setAttribute($attribute);
+        $this->assertEquals($this->model, $this->model->addValueSortToCollection($collection, $dir));
     }
 }

From afa8b108a0658d7267481ea908f4aadc494cc0d8 Mon Sep 17 00:00:00 2001
From: Yurii Hryhoriev <yhryhoriev@magento.com>
Date: Thu, 7 Apr 2016 10:28:15 +0300
Subject: [PATCH 10/22] MAGETWO-51069: Page View Optimization tab is absent on
 edit CMS Page

---
 .../form/renderer/fieldset/element.phtml      |  6 +-
 .../Cms/Page/Edit/Tab/Googleoptimizer.php     |  3 +
 .../Adminhtml/Cms/Page/EntityCmsPage.php      | 67 +++++++++++++++++++
 .../Adminhtml/EntityCodeResolverInterface.php | 19 ++++++
 .../GoogleOptimizer/Block/Adminhtml/Form.php  | 63 +++++++++++++++++
 .../GoogleOptimizer/etc/adminhtml/di.xml      |  8 +++
 .../adminhtml/ui_component/cms_page_form.xml  | 28 ++++++++
 7 files changed, 191 insertions(+), 3 deletions(-)
 create mode 100644 app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php
 create mode 100644 app/code/Magento/GoogleOptimizer/Block/Adminhtml/EntityCodeResolverInterface.php
 create mode 100644 app/code/Magento/GoogleOptimizer/Block/Adminhtml/Form.php
 create mode 100644 app/code/Magento/GoogleOptimizer/view/adminhtml/ui_component/cms_page_form.xml

diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml
index 5b50cdb8a1eaf..22f4385773240 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml
@@ -15,12 +15,12 @@
 <?php
 /* @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element */
 $element = $block->getElement();
-$note = $element->getNote() ? '<div class="note">' . $element->getNote() . '</div>' : '';
+$note = $element->getNote() ? '<div class="note admin__field-note">' . $element->getNote() . '</div>' : '';
 $elementBeforeLabel = $element->getExtType() == 'checkbox' || $element->getExtType() == 'radio';
 $addOn = $element->getBeforeElementHtml() || $element->getAfterElementHtml();
 $fieldId = ($element->getHtmlId()) ? ' id="attribute-' . $element->getHtmlId() . '-container"' : '';
 $entity = $element->getEntityAttribute();
-$fieldClass = "field field-{$element->getId()} {$element->getCssClass()}";
+$fieldClass = "admin__field field field-{$element->getId()} {$element->getCssClass()}";
 $fieldClass .= ($elementBeforeLabel) ? ' choice' : '';
 $fieldClass .= ($addOn) ? ' with-addon' : '';
 $fieldClass .= ($element->getRequired()) ? ' required' : '';
@@ -51,7 +51,7 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
             <?php /* @escapeNotVerified */ echo $note ?>
         <?php else: ?>
             <?php echo $element->getLabelHtml('', $block->getScopeLabel()) ?>
-            <div class="control">
+            <div class="admin__field-control control">
                 <?php /* @escapeNotVerified */ echo($addOn) ? '<div class="addon">' . $block->getElementHtml() . '</div>' : $block->getElementHtml(); ?>
                 <?php /* @escapeNotVerified */ echo $note ?>
             </div>
diff --git a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php
index bf903745f9fb8..be1ead2238080 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php
@@ -7,6 +7,9 @@
  */
 namespace Magento\GoogleOptimizer\Block\Adminhtml\Cms\Page\Edit\Tab;
 
+/**
+ * @deprecated
+ */
 class Googleoptimizer extends \Magento\GoogleOptimizer\Block\Adminhtml\AbstractTab
 {
     /**
diff --git a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php
new file mode 100644
index 0000000000000..64b645d8eebbc
--- /dev/null
+++ b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\GoogleOptimizer\Block\Adminhtml\Cms\Page;
+
+
+use Magento\Framework\DataObject;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\GoogleOptimizer\Block\Adminhtml\EntityCodeResolverInterface;
+
+class EntityCmsPage extends DataObject implements EntityCodeResolverInterface
+{
+    /**
+     * @var \Magento\Framework\Registry
+     */
+    private $coreRegistry;
+
+    /**
+     * @var \Magento\GoogleOptimizer\Model\Code
+     */
+    private $codeModel;
+
+    /**
+     * Google Optimizer binded entity
+     *
+     * @var \Magento\Cms\Model\Page
+     */
+    private $entity;
+
+    /**
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\GoogleOptimizer\Model\Code $code
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\Registry $registry,
+        \Magento\GoogleOptimizer\Model\Code $code,
+        array $data = []
+    ) {
+        $this->coreRegistry = $registry;
+        $this->codeModel = $code;
+        parent::__construct($data);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getCode()
+    {
+        $entity = $this->getEntity();
+        $this->codeModel->loadByEntityIdAndType($entity->getId(), \Magento\GoogleOptimizer\Model\Code::ENTITY_TYPE_PAGE);
+        return $this->codeModel;
+    }
+
+    private function getEntity()
+    {
+        if (!$this->entity) {
+            $this->entity = $this->coreRegistry->registry('cms_page');
+            if (!$this->entity || !$this->entity->getId()) {
+                throw new NoSuchEntityException();
+            }
+        }
+        return $this->entity;
+    }
+}
diff --git a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/EntityCodeResolverInterface.php b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/EntityCodeResolverInterface.php
new file mode 100644
index 0000000000000..2cd76eadbbed0
--- /dev/null
+++ b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/EntityCodeResolverInterface.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\GoogleOptimizer\Block\Adminhtml;
+
+/**
+ * @api
+ */
+interface EntityCodeResolverInterface
+{
+    /**
+     * Returns loaded Code model object
+     *
+     * @return \Magento\GoogleOptimizer\Model\Code
+     */
+    public function getCode();
+}
diff --git a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Form.php b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Form.php
new file mode 100644
index 0000000000000..40a50e3c87e69
--- /dev/null
+++ b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Form.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Google Optimizer Category Tab
+ *
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\GoogleOptimizer\Block\Adminhtml;
+
+use Magento\Framework\Exception\ConfigurationMismatchException;
+use Magento\Framework\App\ObjectManager;
+use Magento\Backend\Block\Widget\Form\Generic;
+
+/**
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
+ */
+class Form extends Generic
+{
+    /**
+     * @var \Magento\GoogleOptimizer\Helper\Form
+     */
+    protected $formHelper;
+
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Framework\Data\FormFactory $formFactory
+     * @param \Magento\GoogleOptimizer\Helper\Form $formHelper
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Framework\Registry $registry,
+        \Magento\Framework\Data\FormFactory $formFactory,
+        \Magento\GoogleOptimizer\Helper\Form $formHelper,
+        array $data = []
+    ) {
+        parent::__construct($context, $registry, $formFactory, $data);
+        $this->formHelper = $formHelper;
+        $this->setForm($formFactory->create());
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _prepareForm()
+    {
+        $entityClass = $this->getData('code-entity');
+        $formName = $this->getData('form-name');
+        if (!$entityClass) {
+            throw new ConfigurationMismatchException(__('Data key is missing: %1', ['code-entity']));
+        }
+        if (!$formName) {
+            throw new ConfigurationMismatchException(__('Data key is missing: %1', ['form-name']));
+        }
+
+        $entity = ObjectManager::getInstance()->create($entityClass);
+
+        $this->formHelper->addGoogleoptimizerFields($this->getForm(), $entity->getCode(), $formName);
+        $this->getForm()->getElement('googleoptimizer_fields')->setData(['legend' => null]);
+        return parent::_prepareForm();
+    }
+}
diff --git a/app/code/Magento/GoogleOptimizer/etc/adminhtml/di.xml b/app/code/Magento/GoogleOptimizer/etc/adminhtml/di.xml
index 1b7aa152f6ed6..9692cfed96eb1 100644
--- a/app/code/Magento/GoogleOptimizer/etc/adminhtml/di.xml
+++ b/app/code/Magento/GoogleOptimizer/etc/adminhtml/di.xml
@@ -16,6 +16,14 @@
             </argument>
         </arguments>
     </virtualType>
+    <virtualType name="Magento\GoogleOptimizer\Block\Adminhtml\Form\CmsPage" type="Magento\GoogleOptimizer\Block\Adminhtml\Form">
+        <arguments>
+            <argument name="data" xsi:type="array">
+                <item name="code-entity" xsi:type="string">Magento\GoogleOptimizer\Block\Adminhtml\Cms\Page\EntityCmsPage</item>
+                <item name="form-name" xsi:type="string">cms_page_form</item>
+            </argument>
+        </arguments>
+    </virtualType>
     <type name="Magento\Catalog\Model\Category\DataProvider">
         <plugin name="google_optimizer_category_data_provider" type="Magento\GoogleOptimizer\Model\Plugin\Catalog\Category\DataProvider" />
     </type>
diff --git a/app/code/Magento/GoogleOptimizer/view/adminhtml/ui_component/cms_page_form.xml b/app/code/Magento/GoogleOptimizer/view/adminhtml/ui_component/cms_page_form.xml
new file mode 100644
index 0000000000000..c27ea723a0570
--- /dev/null
+++ b/app/code/Magento/GoogleOptimizer/view/adminhtml/ui_component/cms_page_form.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <fieldset name="page_view_optimization">
+        <argument name="data" xsi:type="array">
+            <item name="config" xsi:type="array">
+                <item name="label" xsi:type="string" translate="true">Page View Optimization</item>
+                <item name="collapsible" xsi:type="boolean">true</item>
+            </item>
+        </argument>
+        <container name="google_experiment_container" >
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="sortOrder" xsi:type="number">250</item>
+                </item>
+            </argument>
+            <htmlContent name="html_content">
+                <argument name="block" xsi:type="object">Magento\GoogleOptimizer\Block\Adminhtml\Form\CmsPage</argument>
+            </htmlContent>
+        </container>
+    </fieldset>
+</form>

From 92f3cb26ad1724587ff992908424ba378bc8525e Mon Sep 17 00:00:00 2001
From: Yaroslav Onischenko <yonischenko@magento.com>
Date: Thu, 7 Apr 2016 16:08:43 +0300
Subject: [PATCH 11/22] MAGETWO-48722: [GITHUB] Improve performance of export

---
 .../Model/Export/Product.php                  | 31 ++++++++++++++-----
 .../ProcessingErrorAggregator.php             |  8 ++---
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
index c1f75a14e24c0..cf4efc5aea0e3 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -762,6 +762,8 @@ protected function getItemsPerPage()
             $memoryUsagePercent = 0.8;
             // Minimum Products limit
             $minProductsLimit = 500;
+            // Maximal Products limit
+            $maxProductsLimit = 5000;
 
             $this->_itemsPerPage = intval(
                 ($memoryLimit * $memoryUsagePercent - memory_get_usage(true)) / $memoryPerProduct
@@ -769,6 +771,9 @@ protected function getItemsPerPage()
             if ($this->_itemsPerPage < $minProductsLimit) {
                 $this->_itemsPerPage = $minProductsLimit;
             }
+            if ($this->_itemsPerPage > $maxProductsLimit) {
+                $this->_itemsPerPage = $maxProductsLimit;
+            }
         }
         return $this->_itemsPerPage;
     }
@@ -850,8 +855,10 @@ protected function getExportData()
                     if ($storeId == Store::DEFAULT_STORE_ID && isset($stockItemRows[$productId])) {
                         $dataRow = array_merge($dataRow, $stockItemRows[$productId]);
                     }
-
-                    $exportData = array_merge($exportData, $this->addMultirowData($dataRow, $multirawData));
+                    $this->appendMultirowData($dataRow, $multirawData);
+                    if ($dataRow) {
+                        $exportData[] = $dataRow;
+                    }
                 }
             }
         } catch (\Exception $e) {
@@ -1053,9 +1060,8 @@ protected function isValidAttributeValue($code, $value)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    protected function addMultirowData($dataRow, $multiRawData)
+    private function appendMultirowData(&$dataRow, &$multiRawData)
     {
-        $result = [];
         $productId = $dataRow['product_id'];
         $productLinkId = $dataRow['product_link_id'];
         $storeId = $dataRow['store_id'];
@@ -1121,7 +1127,6 @@ protected function addMultirowData($dataRow, $multiRawData)
                 }
             }
             $dataRow = $this->rowCustomizer->addData($dataRow, $productId);
-
         }
 
         if (!empty($this->collectedMultiselectsData[$storeId][$productId])) {
@@ -1144,7 +1149,7 @@ protected function addMultirowData($dataRow, $multiRawData)
         }
 
         if (empty($dataRow)) {
-            return $result;
+            return null;
         } elseif ($storeId != Store::DEFAULT_STORE_ID) {
             $dataRow[self::COL_STORE] = $this->_storeIdToCode[$storeId];
             if (isset($productData[Store::DEFAULT_STORE_ID][self::COL_VISIBILITY])) {
@@ -1152,9 +1157,19 @@ protected function addMultirowData($dataRow, $multiRawData)
             }
         }
         $dataRow[self::COL_SKU] = $sku;
-        $result[] = $dataRow;
+        return $dataRow;
+    }
 
-        return $result;
+    /**
+     * @deprecated
+     * @param array $dataRow
+     * @param array $multiRawData
+     * @return array
+     */
+    protected function addMultirowData($dataRow, $multiRawData)
+    {
+        $data = $this->appendMultirowData($dataRow, $multiRawData);
+        return $data ? [$data] : [];
     }
 
     /**
diff --git a/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php b/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
index 35bda74df5237..471dc2677bb1c 100644
--- a/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
+++ b/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
@@ -89,7 +89,7 @@ public function addError(
         /** @var ProcessingError $newError */
         $newError = $this->errorFactory->create();
         $newError->init($errorCode, $errorLevel, $rowNumber, $columnName, $errorMessage, $errorDescription);
-        $this->items[] = $newError;
+        $this->items[$rowNumber] = $newError;
 
         return $this;
     }
@@ -241,10 +241,8 @@ public function getErrorsByCode(array $codes)
     public function getErrorByRowNumber($rowNumber)
     {
         $result = [];
-        foreach ($this->items as $error) {
-            if ($error->getRowNumber() == (int)$rowNumber) {
-                $result[] = $error;
-            }
+        if (isset($this->items[$rowNumber])) {
+            $result[] = $this->items[$rowNumber];
         }
 
         return $result;

From 4a13c9508fe49159a14e0b8cee958ede4b053e79 Mon Sep 17 00:00:00 2001
From: Yurii Hryhoriev <yhryhoriev@magento.com>
Date: Thu, 7 Apr 2016 17:49:18 +0300
Subject: [PATCH 12/22] MAGETWO-51079: Saving 'Used in Product Listing' option
 in attribute works unpredictably

---
 .../Swatches/view/adminhtml/web/js/product-attributes.js  | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js b/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js
index e3e7ccb848782..17f52b5d5f68f 100644
--- a/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js
+++ b/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js
@@ -106,14 +106,6 @@ define([
                         this.backendType.val('int');
                     }
 
-                    if (this.frontendInput.is(':visible') &&
-                        (this.frontendInput.val() === 'swatch_text' || this.frontendInput.val() === 'swatch_visual')
-                    ) {
-                        this.usedInProductListing.val(1);
-                        this.isVisibleOnFront.val(1);
-                        this.updateProductPreviewImage.val(1);
-                    }
-
                     if (this.frontendInput.val() === 'multiselect' ||
                         this.frontendInput.val() === 'gallery' ||
                         this.frontendInput.val() === 'textarea'

From 11b9fe48e17b8f9ee63dd7f80ba395357e18d1aa Mon Sep 17 00:00:00 2001
From: Yurii Hryhoriev <yhryhoriev@magento.com>
Date: Thu, 7 Apr 2016 18:16:42 +0300
Subject: [PATCH 13/22] MAGETWO-51069: Page View Optimization tab is absent on
 edit CMS Page CR fix

---
 .../Block/Adminhtml/Cms/Page/EntityCmsPage.php              | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php
index 64b645d8eebbc..cd91883d06954 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php
@@ -54,6 +54,12 @@ public function getCode()
         return $this->codeModel;
     }
 
+    /**
+     * Retrieves Google Optimizer binded entity
+     *
+     * @return \Magento\Cms\Model\Page|mixed
+     * @throws NoSuchEntityException
+     */
     private function getEntity()
     {
         if (!$this->entity) {

From c637379ed54189612e67b11e578efca16f02a3e8 Mon Sep 17 00:00:00 2001
From: Ruslan Kostiv <rkostiv@magento.com>
Date: Fri, 8 Apr 2016 19:12:48 +0300
Subject: [PATCH 14/22] MAGETWO-49076: Prepare pull request (SP 35)

---
 .../Product/Action/Attribute/EditTest.php     |  2 +-
 .../Adminhtml/Cms/Page/EntityCmsPage.php      |  9 +--
 .../ProcessingErrorAggregator.php             | 51 +++++++++-----
 .../ProcessingErrorAggregatorTest.php         | 70 ++++++++++++++++---
 4 files changed, 101 insertions(+), 31 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/EditTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/EditTest.php
index d329ec1aabafc..9ce9d43db7b60 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/EditTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/EditTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\Action\Attribute;
diff --git a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php
index cd91883d06954..e4de3c7a7d75f 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php
@@ -9,6 +9,7 @@
 use Magento\Framework\DataObject;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\GoogleOptimizer\Block\Adminhtml\EntityCodeResolverInterface;
+use Magento\GoogleOptimizer\Model\Code as GoogleOptimizerCode;
 
 class EntityCmsPage extends DataObject implements EntityCodeResolverInterface
 {
@@ -18,7 +19,7 @@ class EntityCmsPage extends DataObject implements EntityCodeResolverInterface
     private $coreRegistry;
 
     /**
-     * @var \Magento\GoogleOptimizer\Model\Code
+     * @var GoogleOptimizerCode
      */
     private $codeModel;
 
@@ -31,12 +32,12 @@ class EntityCmsPage extends DataObject implements EntityCodeResolverInterface
 
     /**
      * @param \Magento\Framework\Registry $registry
-     * @param \Magento\GoogleOptimizer\Model\Code $code
+     * @param GoogleOptimizerCode $code
      * @param array $data
      */
     public function __construct(
         \Magento\Framework\Registry $registry,
-        \Magento\GoogleOptimizer\Model\Code $code,
+        GoogleOptimizerCode $code,
         array $data = []
     ) {
         $this->coreRegistry = $registry;
@@ -50,7 +51,7 @@ public function __construct(
     public function getCode()
     {
         $entity = $this->getEntity();
-        $this->codeModel->loadByEntityIdAndType($entity->getId(), \Magento\GoogleOptimizer\Model\Code::ENTITY_TYPE_PAGE);
+        $this->codeModel->loadByEntityIdAndType($entity->getId(), GoogleOptimizerCode::ENTITY_TYPE_PAGE);
         return $this->codeModel;
     }
 
diff --git a/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php b/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
index 471dc2677bb1c..262b773165b85 100644
--- a/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
+++ b/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
@@ -89,8 +89,9 @@ public function addError(
         /** @var ProcessingError $newError */
         $newError = $this->errorFactory->create();
         $newError->init($errorCode, $errorLevel, $rowNumber, $columnName, $errorMessage, $errorDescription);
-        $this->items[$rowNumber] = $newError;
-
+        $this->items['rows'][$rowNumber][] = $newError;
+        $this->items['codes'][$errorCode][] = $newError;
+        $this->items['messages'][$errorMessage][] = $newError;
         return $this;
     }
 
@@ -209,13 +210,21 @@ public function hasFatalExceptions()
         return (bool)$this->getErrorsCount([ProcessingError::ERROR_LEVEL_CRITICAL]);
     }
 
-
     /**
      * @return ProcessingError[]
      */
     public function getAllErrors()
     {
-        return $this->items;
+        $result = [];
+        if (empty($this->items)) {
+            return $result;
+        }
+
+        foreach (array_values($this->items['rows']) as $errors) {
+            $result = array_merge($result, $errors);
+        }
+
+        return $result;
     }
 
     /**
@@ -225,9 +234,9 @@ public function getAllErrors()
     public function getErrorsByCode(array $codes)
     {
         $result = [];
-        foreach ($this->items as $error) {
-            if (in_array($error->getErrorCode(), $codes)) {
-                $result[] = $error;
+        foreach ($codes as $code) {
+            if (isset($this->items['codes'][$code])) {
+                $result = array_merge($result, $this->items['codes'][$code]);
             }
         }
 
@@ -241,8 +250,8 @@ public function getErrorsByCode(array $codes)
     public function getErrorByRowNumber($rowNumber)
     {
         $result = [];
-        if (isset($this->items[$rowNumber])) {
-            $result[] = $this->items[$rowNumber];
+        if (isset($this->items['rows'][$rowNumber])) {
+            $result = $this->items['rows'][$rowNumber];
         }
 
         return $result;
@@ -259,16 +268,26 @@ public function getRowsGroupedByErrorCode(
         array $excludedCodes = [],
         $replaceCodeWithMessage = true
     ) {
+        if (empty($this->items)) {
+            return [];
+        }
+        $allCodes = array_keys($this->items['codes']);
+        if (!empty($excludedCodes)) {
+            $allCodes = array_diff($allCodes, $excludedCodes);
+        }
+        if (!empty($errorCode)) {
+            $allCodes = array_intersect($errorCode, $allCodes);
+        }
+
         $result = [];
-        foreach ($this->items as $error) {
-            if ((!empty($errorCode) && in_array($error->getErrorCode(), $errorCode))
-                || in_array($error->getErrorCode(), $excludedCodes)
-            ) {
-                continue;
+        foreach ($allCodes as $code) {
+            $errors = $this->getErrorsByCode([$code]);
+            foreach ($errors as $error) {
+                $key = $replaceCodeWithMessage ? $error->getErrorMessage() : $code;
+                $result[$key][] = $error->getRowNumber() + 1;
             }
-            $message = $replaceCodeWithMessage ? $error->getErrorMessage() : $error->getErrorCode();
-            $result[$message][] = $error->getRowNumber()+1;
         }
+
         return $result;
     }
 
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/ErrorProcessing/ProcessingErrorAggregatorTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/ErrorProcessing/ProcessingErrorAggregatorTest.php
index 3a534ce5adcf8..f8859da4f6f8a 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/ErrorProcessing/ProcessingErrorAggregatorTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/ErrorProcessing/ProcessingErrorAggregatorTest.php
@@ -117,10 +117,7 @@ public function testAddErrorMessageTemplate()
         $this->model->addError('columnNotFound', 'critical', 7, 'Some column name', null, 'Description');
         $this->model->addError('columnEmptyHeader', 'not-critical', 4, 'Some column name', 'No header', 'Description');
         $result = $this->model->getRowsGroupedByErrorCode(['systemException']);
-        $expectedResult = [
-            'Template: No column' => [8],
-            'No header' => [5]
-        ];
+        $expectedResult = ['systemException' => [0 => 1]];
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -348,20 +345,73 @@ public function testGetErrorsByCodeNotInArray()
 
     /**
      * Test for method getRowsGroupedByErrorCode. Expects errors.
+     *
+     * @param array $params
+     * @param array $expectedResult
+     *
+     * @dataProvider getRowsGroupedByErrorCodeWithErrorsDataProvider
      */
-    public function testGetRowsGroupedByErrorCodeWithErrors()
+    public function testGetRowsGroupedByErrorCodeWithErrors(array $params = [], array $expectedResult = [])
     {
         $this->model->addError('systemException');
         $this->model->addError('columnNotFound', 'critical', 7, 'Some column name', 'No column', 'Description');
         $this->model->addError('columnEmptyHeader', 'not-critical', 4, 'Some column name', 'No header', 'Description');
-        $result = $this->model->getRowsGroupedByErrorCode(['systemException']);
-        $expectedResult = [
-            'No column' => [8],
-            'No header' => [5]
-        ];
+
+        $result = call_user_func_array([$this->model, 'getRowsGroupedByErrorCode'], $params);
+
         $this->assertEquals($expectedResult, $result);
     }
 
+    /**
+     * @return array
+     */
+    public function getRowsGroupedByErrorCodeWithErrorsDataProvider()
+    {
+        $errorCode1 = 'systemException';
+        $errorCode2 = 'columnNotFound';
+        $errorCode3 = 'columnEmptyHeader';
+
+        $message1 = 'systemException';
+        $message2 = 'No column';
+        $message3 = 'No header';
+
+        return [
+            [
+                [[$errorCode1]],
+                [$message1 => [1]]
+            ],
+            [
+                [[], [$errorCode2]],
+                [$message1 => [1], $message3 => [5]]
+            ],
+            [
+                [[$errorCode3, $errorCode2], [$errorCode2]],
+                [$message3 => [5]]
+            ],
+            [
+                [[], []],
+                [$message1 => [1], $message2 => [8], $message3 => [5]]
+            ],
+
+            [
+                [[$errorCode1], [], false],
+                [$errorCode1 => [1]]
+            ],
+            [
+                [[], [$errorCode2], false],
+                [$errorCode1 => [1], $errorCode3 => [5]]
+            ],
+            [
+                [[$errorCode3, $errorCode2], [$errorCode2], false],
+                [$errorCode3 => [5]]
+            ],
+            [
+                [[], [], false],
+                [$errorCode1 => [1], $errorCode2 => [8], $errorCode3 => [5]]
+            ],
+        ];
+    }
+
     /**
      * Test for method getRowsGroupedByErrorCode. Unexpects errors.
      */

From 9abaf61b5869a709db7f618455e159b35c86f995 Mon Sep 17 00:00:00 2001
From: Ruslan Kostiv <rkostiv@magento.com>
Date: Mon, 11 Apr 2016 11:56:17 +0300
Subject: [PATCH 15/22] MAGETWO-49076: Prepare pull request (SP 35)

---
 .../Entity/Attribute/Source/TableTest.php     |  3 +-
 .../Swatches/Model/Plugin/Configurable.php    |  8 ++++
 .../Unit/Model/Plugin/ConfigurableTest.php    | 47 +++++++++++++++----
 3 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/TableTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/TableTest.php
index 32fa21d6d285f..3e7cdb9cc2500 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/TableTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/TableTest.php
@@ -15,7 +15,8 @@ class TableTest extends \PHPUnit_Framework_TestCase
     private $model;
 
     /**
-     * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory | \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory
+     *      | \PHPUnit_Framework_MockObject_MockObject
      */
     private $collectionFactory;
 
diff --git a/app/code/Magento/Swatches/Model/Plugin/Configurable.php b/app/code/Magento/Swatches/Model/Plugin/Configurable.php
index 6e463b5bc3007..05a575b820816 100644
--- a/app/code/Magento/Swatches/Model/Plugin/Configurable.php
+++ b/app/code/Magento/Swatches/Model/Plugin/Configurable.php
@@ -11,8 +11,14 @@
 
 class Configurable
 {
+    /**
+     * @var \Magento\Eav\Model\Config|\Magento\Swatches\Model\SwatchFactory
+     */
     private $eavConfig;
 
+    /**
+     * @var \Magento\Swatches\Helper\Data
+     */
     private $swatchHelper;
 
     /**
@@ -33,6 +39,8 @@ public function __construct(
      * @param ConfigurableProduct $subject
      * @param Collection $result
      * @return Collection
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterGetUsedProductCollection(
         ConfigurableProductType $subject,
diff --git a/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ConfigurableTest.php b/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ConfigurableTest.php
index 4eae15541be79..f4a657b453c57 100644
--- a/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ConfigurableTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ConfigurableTest.php
@@ -19,8 +19,20 @@ class ConfigurableTest extends \PHPUnit_Framework_TestCase
     
     protected function setUp()
     {
-        $this->eavConfig = $this->getMock('\Magento\Eav\Model\Config', ['getEntityAttributeCodes', 'getAttribute'], [], '', false);
-        $this->swatchHelper = $this->getMock('\Magento\Swatches\Helper\Data', ['isVisualSwatch', 'isTextSwatch'], [], '', false);
+        $this->eavConfig = $this->getMock(
+            '\Magento\Eav\Model\Config',
+            ['getEntityAttributeCodes', 'getAttribute'],
+            [],
+            '',
+            false
+        );
+        $this->swatchHelper = $this->getMock(
+            '\Magento\Swatches\Helper\Data',
+            ['isVisualSwatch', 'isTextSwatch'],
+            [],
+            '',
+            false
+        );
 
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->pluginModel = $objectManager->getObject(
@@ -32,24 +44,43 @@ protected function setUp()
         );
     }
 
-    public function testAfterGetUsedProductCollection() {
+    public function testAfterGetUsedProductCollection()
+    {
         $subject = $this->getMock('\Magento\ConfigurableProduct\Model\Product\Type\Configurable', [], [], '', false);
-        $result = $this->getMock('\Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection', ['getEntity', 'addAttributeToSelect'], [], '', false);
+        $result = $this->getMock(
+            '\Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection',
+            ['getEntity', 'addAttributeToSelect'],
+            [],
+            '',
+            false
+        );
 
-        $collectionEntity = $this->getMock('\Magento\Eav\Model\Entity\Collection\AbstractCollection', ['getType'], [], '', false);
+        $collectionEntity = $this->getMock(
+            '\Magento\Eav\Model\Entity\Collection\AbstractCollection',
+            ['getType'],
+            [],
+            '',
+            false
+        );
         $collectionEntity->expects($this->once())->method('getType')->willReturn('catalog');
         $result->expects($this->once())->method('getEntity')->willReturn($collectionEntity);
 
         $attribute = $this->getMock('\Magento\Catalog\Model\ResourceModel\Eav\Attribute', [], [], '', false);
 
-        $this->eavConfig->expects($this->once())->method('getEntityAttributeCodes')->with('catalog')->willReturn(['size', 'color', 'swatch1']);
+        $this->eavConfig->expects($this->once())->method('getEntityAttributeCodes')->with('catalog')
+            ->willReturn(['size', 'color', 'swatch1']);
+
         $this->eavConfig->expects($this->exactly(3))->method('getAttribute')->willReturn($attribute);
 
         $this->swatchHelper->expects($this->exactly(3))->method('isVisualSwatch')->with($attribute)->willReturn(true);
 
-        $result->expects($this->once())->method('addAttributeToSelect')->with($this->identicalTo(['image', 'size', 'color', 'swatch1']))->willReturn($result);
+        $result->expects($this->once())->method('addAttributeToSelect')
+            ->with($this->identicalTo(['image', 'size', 'color', 'swatch1']))->willReturn($result);
 
         $result = $this->pluginModel->afterGetUsedProductCollection($subject, $result);
-        $this->assertInstanceOf('\Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection', $result);
+        $this->assertInstanceOf(
+            '\Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection',
+            $result
+        );
     }
 }

From 80fff0cefba88afb9f7f015358619efcdef74323 Mon Sep 17 00:00:00 2001
From: Yurii Hryhoriev <yhryhoriev@magento.com>
Date: Tue, 12 Apr 2016 14:13:44 +0300
Subject: [PATCH 16/22] MAGETWO-51069: Page View Optimization tab is absent on
 edit CMS Page - fail while creating a new product fix - hiding tab if Google
 Analytics is disabled fix

---
 .../Magento/Cms/Model/Page/DataProvider.php   | 11 +++++++++++
 .../Adminhtml/Cms/Page/EntityCmsPage.php      | 12 ++++++++----
 .../Adminhtml/EntityCodeResolverInterface.php | 19 -------------------
 .../GoogleOptimizer/etc/adminhtml/di.xml      |  3 +++
 4 files changed, 22 insertions(+), 23 deletions(-)
 delete mode 100644 app/code/Magento/GoogleOptimizer/Block/Adminhtml/EntityCodeResolverInterface.php

diff --git a/app/code/Magento/Cms/Model/Page/DataProvider.php b/app/code/Magento/Cms/Model/Page/DataProvider.php
index fb9a54be74457..61be421073009 100644
--- a/app/code/Magento/Cms/Model/Page/DataProvider.php
+++ b/app/code/Magento/Cms/Model/Page/DataProvider.php
@@ -49,6 +49,17 @@ public function __construct(
         $this->collection = $pageCollectionFactory->create();
         $this->dataPersistor = $dataPersistor;
         parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
+        $this->meta = $this->prepareMeta($this->meta);
+    }
+
+    /**
+     * Prepares Meta
+     *
+     * @return array
+     */
+    public function prepareMeta($meta)
+    {
+        return $meta;
     }
 
     /**
diff --git a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php
index e4de3c7a7d75f..3965f4f0976d9 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php
@@ -11,7 +11,7 @@
 use Magento\GoogleOptimizer\Block\Adminhtml\EntityCodeResolverInterface;
 use Magento\GoogleOptimizer\Model\Code as GoogleOptimizerCode;
 
-class EntityCmsPage extends DataObject implements EntityCodeResolverInterface
+class EntityCmsPage extends DataObject
 {
     /**
      * @var \Magento\Framework\Registry
@@ -50,9 +50,13 @@ public function __construct(
      */
     public function getCode()
     {
+        $code = null;
         $entity = $this->getEntity();
-        $this->codeModel->loadByEntityIdAndType($entity->getId(), GoogleOptimizerCode::ENTITY_TYPE_PAGE);
-        return $this->codeModel;
+        if ($entity->getId()) {
+            $this->codeModel->loadByEntityIdAndType($entity->getId(), GoogleOptimizerCode::ENTITY_TYPE_PAGE);
+            $code = $this->codeModel;
+        }
+        return $code;
     }
 
     /**
@@ -65,7 +69,7 @@ private function getEntity()
     {
         if (!$this->entity) {
             $this->entity = $this->coreRegistry->registry('cms_page');
-            if (!$this->entity || !$this->entity->getId()) {
+            if (!$this->entity) {
                 throw new NoSuchEntityException();
             }
         }
diff --git a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/EntityCodeResolverInterface.php b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/EntityCodeResolverInterface.php
deleted file mode 100644
index 2cd76eadbbed0..0000000000000
--- a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/EntityCodeResolverInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Copyright © 2016 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\GoogleOptimizer\Block\Adminhtml;
-
-/**
- * @api
- */
-interface EntityCodeResolverInterface
-{
-    /**
-     * Returns loaded Code model object
-     *
-     * @return \Magento\GoogleOptimizer\Model\Code
-     */
-    public function getCode();
-}
diff --git a/app/code/Magento/GoogleOptimizer/etc/adminhtml/di.xml b/app/code/Magento/GoogleOptimizer/etc/adminhtml/di.xml
index 9692cfed96eb1..af6326d312ff9 100644
--- a/app/code/Magento/GoogleOptimizer/etc/adminhtml/di.xml
+++ b/app/code/Magento/GoogleOptimizer/etc/adminhtml/di.xml
@@ -24,6 +24,9 @@
             </argument>
         </arguments>
     </virtualType>
+    <type name="Magento\Cms\Model\Page\DataProvider">
+        <plugin name="google_optimizer_cms_page_data_provider" type="Magento\GoogleOptimizer\Model\Plugin\Cms\Page\DataProvider" />
+    </type>
     <type name="Magento\Catalog\Model\Category\DataProvider">
         <plugin name="google_optimizer_category_data_provider" type="Magento\GoogleOptimizer\Model\Plugin\Catalog\Category\DataProvider" />
     </type>

From 7b1d1b7ba77b0b51e3be5eb9e621335acc55f4b2 Mon Sep 17 00:00:00 2001
From: Yurii Hryhoriev <yhryhoriev@magento.com>
Date: Tue, 12 Apr 2016 15:45:00 +0300
Subject: [PATCH 17/22] MAGETWO-51069: Page View Optimization tab is absent on
 edit CMS Page - phpDoc fix

---
 .../Block/Adminhtml/Cms/Page/EntityCmsPage.php               | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php
index 3965f4f0976d9..6d4c96172d164 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php
@@ -46,7 +46,10 @@ public function __construct(
     }
 
     /**
-     * @inheritDoc
+     * Returns Code Model
+     *
+     * @return GoogleOptimizerCode|null
+     * @throws NoSuchEntityException
      */
     public function getCode()
     {

From 37c2536d0d1aee9650d5553dc7b2626d41e58678 Mon Sep 17 00:00:00 2001
From: Yurii Hryhoriev <yhryhoriev@magento.com>
Date: Tue, 12 Apr 2016 16:03:53 +0300
Subject: [PATCH 18/22] MAGETWO-51069: Page View Optimization tab is absent on
 edit CMS Page

---
 .../Model/Plugin/Cms/Page/DataProvider.php    | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 app/code/Magento/GoogleOptimizer/Model/Plugin/Cms/Page/DataProvider.php

diff --git a/app/code/Magento/GoogleOptimizer/Model/Plugin/Cms/Page/DataProvider.php b/app/code/Magento/GoogleOptimizer/Model/Plugin/Cms/Page/DataProvider.php
new file mode 100644
index 0000000000000..4a8628cf366c8
--- /dev/null
+++ b/app/code/Magento/GoogleOptimizer/Model/Plugin/Cms/Page/DataProvider.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\GoogleOptimizer\Model\Plugin\Cms\Page;
+
+
+
+class DataProvider
+{
+    /**
+     * @var \Magento\GoogleOptimizer\Helper\Data
+     */
+    private $helper;
+
+    /**
+     * @param \Magento\GoogleOptimizer\Helper\Data $helper
+     */
+    public function __construct(
+        \Magento\GoogleOptimizer\Helper\Data $helper
+    ) {
+        $this->helper = $helper;
+    }
+
+    /**
+     * @param \Magento\Cms\Model\Page\DataProvider $subject
+     * @param array $result
+     * @return mixed
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterPrepareMeta(\Magento\Cms\Model\Page\DataProvider $subject, $result)
+    {
+        $result['page_view_optimization']['arguments']['data']['disabled'] = !$this->helper->isGoogleExperimentActive();
+        $result['page_view_optimization']['arguments']['data']['config']['componentType'] = \Magento\Ui\Component\Form\Fieldset::NAME;
+        $result['page_view_optimization']['arguments']['data']['config']['label'] = __('Page View Optimization');
+        return $result;
+    }
+}

From b38f10f09860f137547133b7b0837d36f544fed2 Mon Sep 17 00:00:00 2001
From: Ruslan Kostiv <rkostiv@magento.com>
Date: Tue, 12 Apr 2016 16:27:22 +0300
Subject: [PATCH 19/22] MAGETWO-51069: Page View Optimization tab is absent on
 edit CMS Page

---
 .../GoogleOptimizer/Model/Plugin/Cms/Page/DataProvider.php   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/GoogleOptimizer/Model/Plugin/Cms/Page/DataProvider.php b/app/code/Magento/GoogleOptimizer/Model/Plugin/Cms/Page/DataProvider.php
index 4a8628cf366c8..26fd70e747417 100644
--- a/app/code/Magento/GoogleOptimizer/Model/Plugin/Cms/Page/DataProvider.php
+++ b/app/code/Magento/GoogleOptimizer/Model/Plugin/Cms/Page/DataProvider.php
@@ -6,8 +6,6 @@
 
 namespace Magento\GoogleOptimizer\Model\Plugin\Cms\Page;
 
-
-
 class DataProvider
 {
     /**
@@ -34,7 +32,8 @@ public function __construct(
     public function afterPrepareMeta(\Magento\Cms\Model\Page\DataProvider $subject, $result)
     {
         $result['page_view_optimization']['arguments']['data']['disabled'] = !$this->helper->isGoogleExperimentActive();
-        $result['page_view_optimization']['arguments']['data']['config']['componentType'] = \Magento\Ui\Component\Form\Fieldset::NAME;
+        $result['page_view_optimization']['arguments']['data']['config']['componentType'] =
+            \Magento\Ui\Component\Form\Fieldset::NAME;
         $result['page_view_optimization']['arguments']['data']['config']['label'] = __('Page View Optimization');
         return $result;
     }

From d60310ab4847b36c249f50ea9de561b793565f78 Mon Sep 17 00:00:00 2001
From: Ruslan Kostiv <rkostiv@magento.com>
Date: Tue, 12 Apr 2016 16:57:10 +0300
Subject: [PATCH 20/22] MAGETWO-51314: Exception appears when sorting product
 by swatch attribute

---
 app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
index 1476624b2b540..bbad307d28f90 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
@@ -144,13 +144,13 @@ public function addValueSortToCollection($collection, $dir = \Magento\Framework\
         $linkField = $attribute->getEntity()->getLinkField();
         $collection->getSelect()->joinLeft(
             [$valueTable1 => $attribute->getBackend()->getTable()],
-            "e.entity_id={$valueTable1}." . $linkField .
+            "e.{$linkField}={$valueTable1}." . $linkField .
             " AND {$valueTable1}.attribute_id='{$attribute->getId()}'" .
             " AND {$valueTable1}.store_id=0",
             []
         )->joinLeft(
             [$valueTable2 => $attribute->getBackend()->getTable()],
-            "e.entity_id={$valueTable2}." . $linkField .
+            "e.{$linkField}={$valueTable2}." . $linkField .
             " AND {$valueTable2}.attribute_id='{$attribute->getId()}'" .
             " AND {$valueTable2}.store_id='{$collection->getStoreId()}'",
             []

From 368bf2a863610cc5797fc386faa3c7c2b766da2f Mon Sep 17 00:00:00 2001
From: Ruslan Kostiv <rkostiv@magento.com>
Date: Tue, 12 Apr 2016 17:07:11 +0300
Subject: [PATCH 21/22] MAGETWO-51314: Exception appears when sorting product
 by swatch attribute

---
 app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
index 1476624b2b540..bbad307d28f90 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
@@ -144,13 +144,13 @@ public function addValueSortToCollection($collection, $dir = \Magento\Framework\
         $linkField = $attribute->getEntity()->getLinkField();
         $collection->getSelect()->joinLeft(
             [$valueTable1 => $attribute->getBackend()->getTable()],
-            "e.entity_id={$valueTable1}." . $linkField .
+            "e.{$linkField}={$valueTable1}." . $linkField .
             " AND {$valueTable1}.attribute_id='{$attribute->getId()}'" .
             " AND {$valueTable1}.store_id=0",
             []
         )->joinLeft(
             [$valueTable2 => $attribute->getBackend()->getTable()],
-            "e.entity_id={$valueTable2}." . $linkField .
+            "e.{$linkField}={$valueTable2}." . $linkField .
             " AND {$valueTable2}.attribute_id='{$attribute->getId()}'" .
             " AND {$valueTable2}.store_id='{$collection->getStoreId()}'",
             []

From c7fe2bbdc1af0d697b142eb3486a04b0c91f7556 Mon Sep 17 00:00:00 2001
From: Ruslan Kostiv <rkostiv@magento.com>
Date: Tue, 12 Apr 2016 19:10:43 +0300
Subject: [PATCH 22/22] MAGETWO-51069: Page View Optimization tab is absent on
 edit CMS Page

---
 app/code/Magento/Cms/Model/Page/DataProvider.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/Model/Page/DataProvider.php b/app/code/Magento/Cms/Model/Page/DataProvider.php
index 61be421073009..3771d55535e06 100644
--- a/app/code/Magento/Cms/Model/Page/DataProvider.php
+++ b/app/code/Magento/Cms/Model/Page/DataProvider.php
@@ -55,9 +55,10 @@ public function __construct(
     /**
      * Prepares Meta
      *
+     * @param array $meta
      * @return array
      */
-    public function prepareMeta($meta)
+    public function prepareMeta(array $meta)
     {
         return $meta;
     }