From dac8bfb4ab9fd1cc5659abaa9dc8b3e62c2dbecd Mon Sep 17 00:00:00 2001
From: Stsiapan Korf <Stsiapan_Korf@epam.com>
Date: Thu, 27 Jul 2017 18:17:39 +0300
Subject: [PATCH 01/85] MAGETWO-55937: [Complex product/Grouped productsl] Tax
 Amount and Custom Prices isn't displayed on Slide Panel (admin panel)

---
 .../Catalog/Pricing/Price/TierPrice.php       | 15 +++-
 .../Test/Unit/Pricing/Price/TierPriceTest.php | 15 +++-
 .../Customer/Model/Group/Retriever.php        | 35 ++++++++
 .../Model/Group/RetrieverInterface.php        | 21 +++++
 app/code/Magento/Customer/etc/di.xml          |  2 +
 .../Sales/Model/CustomerGroupRetriever.php    | 46 ++++++++++
 .../Unit/Model/CustomerGroupRetrieverTest.php | 84 +++++++++++++++++++
 app/code/Magento/Sales/etc/adminhtml/di.xml   |  2 +
 8 files changed, 215 insertions(+), 5 deletions(-)
 create mode 100644 app/code/Magento/Customer/Model/Group/Retriever.php
 create mode 100644 app/code/Magento/Customer/Model/Group/RetrieverInterface.php
 create mode 100644 app/code/Magento/Sales/Model/CustomerGroupRetriever.php
 create mode 100644 app/code/Magento/Sales/Test/Unit/Model/CustomerGroupRetrieverTest.php

diff --git a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
index 01c837f854856..1c438a5d14bb9 100644
--- a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
@@ -16,6 +16,7 @@
 use Magento\Framework\Pricing\Price\AbstractPrice;
 use Magento\Framework\Pricing\Price\BasePriceProviderInterface;
 use Magento\Framework\Pricing\PriceInfoInterface;
+use Magento\Customer\Model\Group\RetrieverInterface as CustomerGroupRetrieverInterface;
 
 /**
  * @api
@@ -29,6 +30,7 @@ class TierPrice extends AbstractPrice implements TierPriceInterface, BasePricePr
 
     /**
      * @var Session
+     * @deprecated
      */
     protected $customerSession;
 
@@ -56,6 +58,11 @@ class TierPrice extends AbstractPrice implements TierPriceInterface, BasePricePr
      */
     protected $groupManagement;
 
+    /**
+     * @var CustomerGroupRetrieverInterface
+     */
+    private $customerGroupRetriever;
+
     /**
      * @param Product $saleableItem
      * @param float $quantity
@@ -63,6 +70,7 @@ class TierPrice extends AbstractPrice implements TierPriceInterface, BasePricePr
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param Session $customerSession
      * @param GroupManagementInterface $groupManagement
+     * @param CustomerGroupRetrieverInterface|null $customerGroupRetriever
      */
     public function __construct(
         Product $saleableItem,
@@ -70,16 +78,19 @@ public function __construct(
         CalculatorInterface $calculator,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
         Session $customerSession,
-        GroupManagementInterface $groupManagement
+        GroupManagementInterface $groupManagement,
+        CustomerGroupRetrieverInterface $customerGroupRetriever = null
     ) {
         $quantity = $quantity ?: 1;
         parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
         $this->customerSession = $customerSession;
         $this->groupManagement = $groupManagement;
+        $this->customerGroupRetriever = $customerGroupRetriever
+            ?? \Magento\Framework\App\ObjectManager::getInstance()->get(CustomerGroupRetrieverInterface::class);
         if ($saleableItem->hasCustomerGroupId()) {
             $this->customerGroup = (int) $saleableItem->getCustomerGroupId();
         } else {
-            $this->customerGroup = (int) $this->customerSession->getCustomerGroupId();
+            $this->customerGroup = (int) $this->customerGroupRetriever->getCustomerGroupId();
         }
     }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php
index 34e4976faadca..a08a87af83e60 100644
--- a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php
@@ -67,6 +67,11 @@ class TierPriceTest extends \PHPUnit_Framework_TestCase
      */
     protected $groupManagement;
 
+    /**
+     * @var \Magento\Customer\Model\Group\RetrieverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $customerGroupRetriever;
+
     /**
      * Initialize base dependencies
      */
@@ -82,9 +87,11 @@ protected function setUp()
             false
         );
         $this->product->expects($this->any())->method('getPriceInfo')->will($this->returnValue($this->priceInfo));
+        $this->customerGroupRetriever = $this->getMockBuilder(\Magento\Customer\Model\Group\RetrieverInterface::class)
+            ->disableOriginalConstructor()->getMock();
 
         $this->session = $this->getMock(\Magento\Customer\Model\Session::class, [], [], '', false);
-        $this->session->expects($this->any())->method('getCustomerGroupId')
+        $this->customerGroupRetriever->expects($this->any())->method('getCustomerGroupId')
             ->will($this->returnValue($this->customerGroup));
 
         $this->calculator = $this->getMock(\Magento\Framework\Pricing\Adjustment\Calculator::class, [], [], '', false);
@@ -104,7 +111,8 @@ protected function setUp()
             $this->calculator,
             $this->priceCurrencyMock,
             $this->session,
-            $this->groupManagement
+            $this->groupManagement,
+            $this->customerGroupRetriever
         );
     }
 
@@ -248,7 +256,8 @@ public function testGetterStoredTierPrices()
             $this->calculator,
             $this->priceCurrencyMock,
             $this->session,
-            $this->groupManagement
+            $this->groupManagement,
+            $this->customerGroupRetriever
         );
         $group = $this->getMock(
             \Magento\Customer\Model\Data\Group::class,
diff --git a/app/code/Magento/Customer/Model/Group/Retriever.php b/app/code/Magento/Customer/Model/Group/Retriever.php
new file mode 100644
index 0000000000000..d72eb4fbc0e3f
--- /dev/null
+++ b/app/code/Magento/Customer/Model/Group/Retriever.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Model;
+
+use Magento\Customer\Model\Session;
+
+/**
+ * Class for getting current customer group from customer session.
+ */
+class Retriever implements \Magento\Customer\Model\Group\RetrieverInterface
+{
+    /**
+     * @var Session
+     */
+    private $customerSession;
+
+    /**
+     * @param Session $customerSession
+     */
+    public function __construct(Session $customerSession)
+    {
+        $this->customerSession = $customerSession;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCustomerGroupId()
+    {
+        return $this->customerSession->getCustomerGroupId();
+    }
+}
diff --git a/app/code/Magento/Customer/Model/Group/RetrieverInterface.php b/app/code/Magento/Customer/Model/Group/RetrieverInterface.php
new file mode 100644
index 0000000000000..701465cb00f2d
--- /dev/null
+++ b/app/code/Magento/Customer/Model/Group/RetrieverInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Model\Group;
+
+/**
+ * Interface for getting current customer group from session.
+ *
+ * @api
+ */
+interface RetrieverInterface
+{
+    /**
+     * Retrieve customer group id.
+     *
+     * @return int
+     */
+    public function getCustomerGroupId();
+}
diff --git a/app/code/Magento/Customer/etc/di.xml b/app/code/Magento/Customer/etc/di.xml
index 8ac75325bd481..f36b51efb1cc7 100644
--- a/app/code/Magento/Customer/etc/di.xml
+++ b/app/code/Magento/Customer/etc/di.xml
@@ -59,6 +59,8 @@
                 type="Magento\Customer\Model\Customer\Attribute\Source\Group"/>
     <preference for="Magento\Customer\Block\Account\SortLinkInterface"
                 type="Magento\Customer\Block\Account\SortLink"/>
+    <preference for="Magento\Customer\Model\Group\RetrieverInterface"
+                type="Magento\Customer\Model\Group\Retriever"/>
     <type name="Magento\Customer\Model\Session">
         <arguments>
             <argument name="configShare" xsi:type="object">Magento\Customer\Model\Config\Share\Proxy</argument>
diff --git a/app/code/Magento/Sales/Model/CustomerGroupRetriever.php b/app/code/Magento/Sales/Model/CustomerGroupRetriever.php
new file mode 100644
index 0000000000000..7444e7ae84a92
--- /dev/null
+++ b/app/code/Magento/Sales/Model/CustomerGroupRetriever.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Model;
+
+use Magento\Backend\Model\Session\Quote;
+use Magento\Customer\Api\GroupManagementInterface;
+
+/**
+ * Class for getting customer group from quote session for adminhtml area.
+ */
+class CustomerGroupRetriever implements \Magento\Customer\Model\Group\RetrieverInterface
+{
+    /**
+     * @var Quote
+     */
+    private $quoteSession;
+
+    /**
+     * @var GroupManagementInterface
+     */
+    private $groupManagement;
+
+    /**
+     * @param Quote $quoteSession
+     * @param GroupManagementInterface $groupManagement
+     */
+    public function __construct(Quote $quoteSession, GroupManagementInterface $groupManagement)
+    {
+        $this->quoteSession = $quoteSession;
+        $this->groupManagement = $groupManagement;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCustomerGroupId()
+    {
+        if ($this->quoteSession->getQuoteId() && $this->quoteSession->getQuote()) {
+            return $this->quoteSession->getQuote()->getCustomerGroupId();
+        }
+        return $this->groupManagement->getNotLoggedInGroup()->getId();
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/CustomerGroupRetrieverTest.php b/app/code/Magento/Sales/Test/Unit/Model/CustomerGroupRetrieverTest.php
new file mode 100644
index 0000000000000..07ac5bee904dc
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Model/CustomerGroupRetrieverTest.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Test\Unit\Model;
+
+use Magento\Backend\Model\Session\Quote;
+use Magento\Customer\Api\GroupManagementInterface;
+
+/**
+ * Test for class CustomerGroupRetriever.
+ */
+class CustomerGroupRetrieverTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Sales\Model\CustomerGroupRetriever
+     */
+    private $retriever;
+
+    /**
+     * @var Quote|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $quoteSession;
+
+    /**
+     * @var GroupManagementInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $groupManagement;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->quoteSession = $this->getMockBuilder(Quote::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getQuoteId', 'getQuote'])
+            ->getMock();
+        $this->groupManagement = $this->getMockBuilder(GroupManagementInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->retriever = $helper->getObject(
+            \Magento\Sales\Model\CustomerGroupRetriever::class,
+            [
+                'quoteSession' => $this->quoteSession,
+                'groupManagement' => $this->groupManagement
+            ]
+        );
+    }
+
+    /**
+     * Test method getCustomerGroupId with quote session.
+     */
+    public function testGetCustomerGroupIdQuote()
+    {
+        $this->quoteSession->expects($this->atLeastOnce())->method('getQuoteId')->willReturn(1);
+        $quote = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->quoteSession->expects($this->atLeastOnce())->method('getQuote')->willReturn($quote);
+        $quote->expects($this->once())->method('getCustomerGroupId')->willReturn(2);
+
+        $this->assertEquals(2, $this->retriever->getCustomerGroupId());
+    }
+
+    /**
+     * Test method getCustomerGroupId without quote session.
+     */
+    public function testGetCustomerGroupIdDefault()
+    {
+        $this->quoteSession->expects($this->atLeastOnce())->method('getQuoteId')->willReturn(0);
+        $this->quoteSession->expects($this->never())->method('getQuote');
+        $group = $this->getMockBuilder(\Magento\Customer\Api\Data\GroupInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->groupManagement->expects($this->once())->method('getNotLoggedInGroup')->willReturn($group);
+        $group->expects($this->once())->method('getId')->willReturn(2);
+
+        $this->assertEquals(2, $this->retriever->getCustomerGroupId());
+    }
+}
diff --git a/app/code/Magento/Sales/etc/adminhtml/di.xml b/app/code/Magento/Sales/etc/adminhtml/di.xml
index 0d86c866cbf93..35ef510d277bf 100644
--- a/app/code/Magento/Sales/etc/adminhtml/di.xml
+++ b/app/code/Magento/Sales/etc/adminhtml/di.xml
@@ -6,6 +6,8 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\Customer\Model\Group\RetrieverInterface"
+                type="Magento\Sales\Model\CustomerGroupRetriever"/>
     <type name="Magento\Framework\App\Rss\RssManagerInterface">
         <arguments>
             <argument name="dataProviders" xsi:type="array">

From 82da0258aff39b9492175fc87784a64ef67889d2 Mon Sep 17 00:00:00 2001
From: Maksim_Stsepantsevich <Maksim_Stsepantsevich@epam.com>
Date: Mon, 31 Jul 2017 12:26:00 +0300
Subject: [PATCH 02/85] MAGETWO-55937: [Complex product/Grouped productsl] Tax
 Amount and Custom Prices isn't displayed on Slide Panel (admin panel)

- Fix Retriever namespace
---
 app/code/Magento/Customer/Model/Group/Retriever.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Group/Retriever.php b/app/code/Magento/Customer/Model/Group/Retriever.php
index d72eb4fbc0e3f..3b3e0e635ec21 100644
--- a/app/code/Magento/Customer/Model/Group/Retriever.php
+++ b/app/code/Magento/Customer/Model/Group/Retriever.php
@@ -3,14 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Catalog\Model;
+namespace Magento\Customer\Model\Group;
 
 use Magento\Customer\Model\Session;
 
 /**
  * Class for getting current customer group from customer session.
  */
-class Retriever implements \Magento\Customer\Model\Group\RetrieverInterface
+class Retriever implements RetrieverInterface
 {
     /**
      * @var Session

From 6ddca8c0279d29ddfba4c90a311c23fc7b25e569 Mon Sep 17 00:00:00 2001
From: Vital_Pantsialeyeu <Vital_Pantsialeyeu@epam.com>
Date: Wed, 9 Aug 2017 12:33:34 +0300
Subject: [PATCH 03/85] MAGETWO-55937: [Complex product/Grouped productsl] Tax
 Amount and Custom Prices isn't displayed on Slide Panel (admin panel)

- Fix unit test
---
 .../Sales/Test/Unit/Model/CustomerGroupRetrieverTest.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Test/Unit/Model/CustomerGroupRetrieverTest.php b/app/code/Magento/Sales/Test/Unit/Model/CustomerGroupRetrieverTest.php
index 07ac5bee904dc..247e8188a60c6 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/CustomerGroupRetrieverTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/CustomerGroupRetrieverTest.php
@@ -11,7 +11,7 @@
 /**
  * Test for class CustomerGroupRetriever.
  */
-class CustomerGroupRetrieverTest extends \PHPUnit_Framework_TestCase
+class CustomerGroupRetrieverTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var \Magento\Sales\Model\CustomerGroupRetriever

From 3ce1791600fb77931ed0550da5ef32ebc38c11e6 Mon Sep 17 00:00:00 2001
From: Vital_Pantsialeyeu <Vital_Pantsialeyeu@epam.com>
Date: Thu, 10 Aug 2017 13:46:48 +0300
Subject: [PATCH 04/85] MAGETWO-55937: [Complex product/Grouped productsl] Tax
 Amount and Custom Prices isn't displayed on Slide Panel (admin panel)

- Fix CR comment
---
 .../Test/Unit/Pricing/Price/TierPriceTest.php | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php
index 0b4178bf0db90..152133ef903f0 100644
--- a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php
@@ -25,52 +25,52 @@ class TierPriceTest extends \PHPUnit\Framework\TestCase
      *
      * @var int
      */
-    protected $customerGroup = Group::NOT_LOGGED_IN_ID;
+    private $customerGroup = Group::NOT_LOGGED_IN_ID;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $priceInfo;
+    private $priceInfo;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $product;
+    private $product;
 
     /**
      * @var float
      */
-    protected $quantity = 3.;
+    private $quantity = 3.;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $calculator;
+    private $calculator;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $session;
+    private $session;
 
     /**
      * @var TierPrice
      */
-    protected $model;
+    private $model;
 
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $priceCurrencyMock;
+    private $priceCurrencyMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $groupManagement;
+    private $groupManagement;
 
     /**
      * @var \Magento\Customer\Model\Group\RetrieverInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $customerGroupRetriever;
+    private $customerGroupRetriever;
 
     /**
      * Initialize base dependencies

From 5ca86e132c6ef36bfb87ade32c85202ff396c87d Mon Sep 17 00:00:00 2001
From: Maksim_Stsepantsevich <Maksim_Stsepantsevich@epam.com>
Date: Fri, 11 Aug 2017 16:41:42 +0300
Subject: [PATCH 05/85] MAGETWO-71528: Add an ability to call methods through
 objects in email templates

---
 .../Magento/Framework/Filter/Template.php     | 14 ++++++-
 .../Filter/Test/Unit/TemplateTest.php         | 37 +++++++++++++++----
 2 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/lib/internal/Magento/Framework/Filter/Template.php b/lib/internal/Magento/Framework/Filter/Template.php
index 465b907348751..68b636cdc22c1 100644
--- a/lib/internal/Magento/Framework/Filter/Template.php
+++ b/lib/internal/Magento/Framework/Filter/Template.php
@@ -320,7 +320,7 @@ protected function getVariable($value, $default = '{no_value_defined}')
             } elseif (isset($stackVars[$i - 1]['variable'])
                     && $stackVars[$i - 1]['variable'] instanceof \Magento\Framework\DataObject
             ) {
-                // If object calling methods or getting properties
+                // If data object calling methods or getting properties
                 if ($stackVars[$i]['type'] == 'property') {
                     $caller = 'get' . $this->string->upperCaseWords($stackVars[$i]['name'], '_', '');
                     $stackVars[$i]['variable'] = method_exists(
@@ -330,7 +330,7 @@ protected function getVariable($value, $default = '{no_value_defined}')
                         $stackVars[$i]['name']
                     );
                 } elseif ($stackVars[$i]['type'] == 'method') {
-                    // Calling of object method
+                    // Calling of data object method
                     if (method_exists($stackVars[$i - 1]['variable'], $stackVars[$i]['name'])
                             || substr($stackVars[$i]['name'], 0, 3) == 'get'
                     ) {
@@ -342,6 +342,16 @@ protected function getVariable($value, $default = '{no_value_defined}')
                     }
                 }
                 $last = $i;
+            } elseif (isset($stackVars[$i - 1]['variable']) && $stackVars[$i]['type'] == 'method') {
+                // Calling object methods
+                if (method_exists($stackVars[$i - 1]['variable'], $stackVars[$i]['name'])) {
+                    $stackVars[$i]['args'] = $this->getStackArgs($stackVars[$i]['args']);
+                    $stackVars[$i]['variable'] = call_user_func_array(
+                        [$stackVars[$i - 1]['variable'], $stackVars[$i]['name']],
+                        $stackVars[$i]['args']
+                    );
+                }
+                $last = $i;
             }
         }
 
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
index 70d07f1c1a1af..14d84707fb0b4 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
@@ -140,16 +140,23 @@ public function testVarDirective($construction, $variables, $expectedResult)
 
     public function varDirectiveDataProvider()
     {
-        /* @var $stub \Magento\Framework\DataObject|\PHPUnit_Framework_MockObject_MockObject */
-        $stub = $this->getMockBuilder(\Magento\Framework\DataObject::class)
+        /* @var $dataObjectVariable \Magento\Framework\DataObject|\PHPUnit_Framework_MockObject_MockObject */
+        $dataObjectVariable = $this->getMockBuilder(\Magento\Framework\DataObject::class)
             ->disableOriginalConstructor()
             ->disableProxyingToOriginalMethods()
             ->setMethods(['bar'])
             ->getMock();
-
-        $stub->expects($this->once())
+        $dataObjectVariable->expects($this->once())
             ->method('bar')
-            ->willReturn('Mocked Method Return');
+            ->willReturn('DataObject Method Return');
+
+        /* @var $nonDataObjectVariable \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject */
+        $nonDataObjectVariable = $this->getMockBuilder(\Magento\Framework\Escaper::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $nonDataObjectVariable->expects($this->once())
+            ->method('escapeHtml')
+            ->willReturnArgument(0);
 
         return [
             'no variables' => [
@@ -170,12 +177,28 @@ public function varDirectiveDataProvider()
             'array argument to method' => [
                 '{{var foo.bar([param_1:value_1, param_2:$value_2, param_3:[a:$b, c:$d]])}}',
                 [
-                    'foo' => $stub,
+                    'foo' => $dataObjectVariable,
                     'value_2' => 'lorem',
                     'b' => 'bee',
                     'd' => 'dee',
                 ],
-                'Mocked Method Return'
+                'DataObject Method Return'
+            ],
+            'non DataObject method call' => [
+                '{{var foo.escapeHtml($value)}}',
+                [
+                    'foo' => $nonDataObjectVariable,
+                    'value' => 'lorem'
+                ],
+                'lorem'
+            ],
+            'non DataObject undefined method call' => [
+                '{{var foo.undefinedMethod($value)}}',
+                [
+                    'foo' => $nonDataObjectVariable,
+                    'value' => 'lorem'
+                ],
+                ''
             ],
         ];
     }

From bfc0ccfb92211ad67871ea33621b2af939d7ccc1 Mon Sep 17 00:00:00 2001
From: Kiryl Bakun <Kiryl_Bakun@epam.com>
Date: Tue, 15 Aug 2017 17:47:51 +0300
Subject: [PATCH 06/85] MAGETWO-71595: Issue while loading product options for
 bundle products with the same ids and different options

- Fix loading product options for bundle products
---
 app/code/Magento/Bundle/Model/Product/Type.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index ed2e46158aebd..bd261d287273e 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -687,7 +687,7 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
                         $options
                     );
 
-                    $optionsCollection->appendSelections($selections, false, $_appendAllSelections);
+                    $optionsCollection->appendSelections($selections, true, $_appendAllSelections);
 
                     $selections = $selections->getItems();
                 } else {
@@ -704,7 +704,7 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
                     ->getOptionsIds($product);
                 $selectionCollection = $product->getTypeInstance()
                     ->getSelectionsCollection($optionIds, $product);
-                $options = $optionCollection->appendSelections($selectionCollection, false, $_appendAllSelections);
+                $options = $optionCollection->appendSelections($selectionCollection, true, $_appendAllSelections);
 
                 $selections = $this->mergeSelectionsWithOptions($options, $selections);
             }

From d0b85b36ff745e24cce7fb3d983dc5782f1566d4 Mon Sep 17 00:00:00 2001
From: Pieter Hoste <hoste.pieter@gmail.com>
Date: Sun, 13 Aug 2017 17:07:15 +0200
Subject: [PATCH 07/85] Set correct Content-Type header for ajax responses in
 the Magento_UI module.

---
 .../Ui/Controller/Adminhtml/Index/Render.php  | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
index 0d14569742585..94a5ea3a71c2d 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
@@ -9,6 +9,7 @@
 use Magento\Ui\Controller\Adminhtml\AbstractAction;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponentInterface;
+use Magento\Framework\View\Element\UiComponent\ContentType;
 
 /**
  * Class Render
@@ -30,6 +31,7 @@ public function execute()
         $component = $this->factory->create($this->_request->getParam('namespace'));
         $this->prepareComponent($component);
         $this->_response->appendBody((string) $component->render());
+        $this->setResponseContentTypeHeader($component);
     }
 
     /**
@@ -45,4 +47,26 @@ protected function prepareComponent(UiComponentInterface $component)
         }
         $component->prepare();
     }
+
+    /**
+     * Set the response 'Content-Type' header based on the component's render engine
+     *
+     * @param UiComponentInterface $component
+     * @return void
+     */
+    private function setResponseContentTypeHeader(UiComponentInterface $component)
+    {
+        $contentType = 'text/html';
+
+        if ($component->getContext()) {
+            $renderEngine = $component->getContext()->getRenderEngine();
+            if ($renderEngine instanceof ContentType\Json) {
+                $contentType = 'application/json';
+            } elseif ($renderEngine instanceof ContentType\Xml) {
+                $contentType = 'application/xml';
+            }
+        }
+
+        $this->_response->setHeader('Content-Type', $contentType, true);
+    }
 }

From 9de3b46ca47cd8644a40a3fccd4cf5229230013b Mon Sep 17 00:00:00 2001
From: Anthoula Wojczak <anthoula@users.noreply.github.com>
Date: Wed, 16 Aug 2017 16:40:08 -0500
Subject: [PATCH 08/85] MAGETWO-64085: [GitHub] Static versioning and styles
 minification break email fonts styles #8241

---
 .../Magento/Email/Model/Template/Filter.php   | 20 ++---
 .../Magento/Widget/Model/Template/Filter.php  |  6 +-
 .../Css/PreProcessor/Adapter/CssInliner.php   | 79 +++++++++++++++++++
 3 files changed, 92 insertions(+), 13 deletions(-)
 create mode 100644 lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php

diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index 52bc141b82bb2..14b6e014c65c4 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -149,9 +149,9 @@ class Filter extends \Magento\Framework\Filter\Template
     protected $urlModel;
 
     /**
-     * @var \Pelago\Emogrifier
+     * @var \Magento\Framework\Css\PreProcessor\Adapter\CssInliner
      */
-    protected $emogrifier;
+    protected $cssInliner;
 
     /**
      * @var \Magento\Email\Model\Source\Variables
@@ -180,7 +180,7 @@ class Filter extends \Magento\Framework\Filter\Template
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\UrlInterface $urlModel
-     * @param \Pelago\Emogrifier $emogrifier
+     * @param \Magento\Framework\Css\PreProcessor\Adapter\CssInliner $cssInliner
      * @param \Magento\Email\Model\Source\Variables $configVariables
      * @param array $variables
      *
@@ -198,7 +198,7 @@ public function __construct(
         \Magento\Framework\View\LayoutFactory $layoutFactory,
         \Magento\Framework\App\State $appState,
         \Magento\Framework\UrlInterface $urlModel,
-        \Pelago\Emogrifier $emogrifier,
+        \Magento\Framework\Css\PreProcessor\Adapter\CssInliner $cssInliner,
         \Magento\Email\Model\Source\Variables $configVariables,
         $variables = []
     ) {
@@ -213,7 +213,7 @@ public function __construct(
         $this->_layoutFactory = $layoutFactory;
         $this->_appState = $appState;
         $this->urlModel = $urlModel;
-        $this->emogrifier = $emogrifier;
+        $this->cssInliner = $cssInliner;
         $this->configVariables = $configVariables;
         parent::__construct($string, $variables);
     }
@@ -975,14 +975,14 @@ public function applyInlineCss($html)
                     );
                 }
 
-                $emogrifier = $this->emogrifier;
-                $emogrifier->setHtml($html);
-                $emogrifier->setCss($cssToInline);
+                $this->cssInliner->setHtml($html);
+
+                $this->cssInliner->setCss($cssToInline);
 
                 // Don't parse inline <style> tags, since existing tag is intentionally for non-inline styles
-                $emogrifier->disableStyleBlocksParsing();
+                $this->cssInliner->disableStyleBlocksParsing();
 
-                $processedHtml = $emogrifier->emogrify();
+                $processedHtml = $this->cssInliner->process();
             } catch (\Exception $e) {
                 if ($this->_appState->getMode() == \Magento\Framework\App\State::MODE_DEVELOPER) {
                     $processedHtml = __('CSS inlining error:') . PHP_EOL . $e->getMessage()
diff --git a/app/code/Magento/Widget/Model/Template/Filter.php b/app/code/Magento/Widget/Model/Template/Filter.php
index 273a4aaf1fa37..88a0b707a0b6a 100644
--- a/app/code/Magento/Widget/Model/Template/Filter.php
+++ b/app/code/Magento/Widget/Model/Template/Filter.php
@@ -33,7 +33,7 @@ class Filter extends \Magento\Cms\Model\Template\Filter
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\UrlInterface $urlModel
-     * @param \Pelago\Emogrifier $emogrifier
+     * @param \Magento\Framework\Css\PreProcessor\Adapter\CssInliner $cssInliner
      * @param \Magento\Email\Model\Source\Variables $configVariables
      * @param \Magento\Widget\Model\ResourceModel\Widget $widgetResource
      * @param \Magento\Widget\Model\Widget $widget
@@ -51,7 +51,7 @@ public function __construct(
         \Magento\Framework\View\LayoutFactory $layoutFactory,
         \Magento\Framework\App\State $appState,
         \Magento\Framework\UrlInterface $urlModel,
-        \Pelago\Emogrifier $emogrifier,
+        \Magento\Framework\Css\PreProcessor\Adapter\CssInliner $cssInliner,
         \Magento\Email\Model\Source\Variables $configVariables,
         \Magento\Widget\Model\ResourceModel\Widget $widgetResource,
         \Magento\Widget\Model\Widget $widget
@@ -70,7 +70,7 @@ public function __construct(
             $layoutFactory,
             $appState,
             $urlModel,
-            $emogrifier,
+            $cssInliner,
             $configVariables
         );
     }
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
new file mode 100644
index 0000000000000..6dd32d8b13568
--- /dev/null
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Css\PreProcessor\Adapter;
+use Pelago\Emogrifier;
+
+class CssInliner
+{
+    /**
+     * @var Emogrifier
+     */
+    private $emogrifier;
+
+    /**
+     * @param Emogrifier $emogrifier
+     */
+    public function __construct(Emogrifier $emogrifier)
+    {
+        $this->emogrifier = $emogrifier;
+    }
+
+    /**
+     * Sets the HTML to emogrify.
+     *
+     * @param string $html the HTML to emogrify, must be UTF-8-encoded
+     *
+     * @return void
+     */
+    public function setHtml($html)
+    {
+        $this->emogrifier->setHtml($html);
+    }
+
+    /**
+     * Sets the CSS to merge with the HTML.
+     *
+     * @param string $css the CSS to merge, must be UTF-8-encoded
+     *
+     * @return void
+     */
+    public function setCss($css)
+    {
+        /**
+         * Adds space to CSS string before passing to Emogrifier to fix known parsing issue with library.
+         * https://github.com/jjriv/emogrifier/issues/370
+         */
+        $cssWithAddedSpaces = preg_replace('#([\{\}>])#i', ' $1 ', $css);
+
+        $this->emogrifier->setCss($cssWithAddedSpaces);
+    }
+
+    /**
+     * Disables the parsing of <style> blocks.
+     *
+     * @return void
+     */
+    public function disableStyleBlocksParsing()
+    {
+        $this->emogrifier->disableStyleBlocksParsing();
+    }
+
+    /**
+     * Applies $this->css to $this->html and returns the HTML with the CSS
+     * applied.
+     *
+     * This method places the CSS inline.
+     *
+     * @return string
+     *
+     * @throws \BadMethodCallException
+     */
+    public function process()
+    {
+        return $this->emogrifier->emogrify();
+    }
+
+}
\ No newline at end of file

From fbbf3758f7585f0459b0957b721d875986f3488c Mon Sep 17 00:00:00 2001
From: Kiryl Bakun <Kiryl_Bakun@epam.com>
Date: Thu, 17 Aug 2017 10:46:10 +0300
Subject: [PATCH 09/85] MAGETWO-71595: Issue while loading product options for
 bundle products with the same ids and different options

- Unit test update
---
 .../Bundle/Test/Unit/Model/Product/TypeTest.php     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
index 3649db9f899d6..d5a11e0310d35 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
@@ -249,6 +249,7 @@ public function testPrepareForCartAdvancedWithoutOptions()
             ->willReturn($productType);
         $optionCollection->expects($this->any())
             ->method('appendSelections')
+            ->with($selectionCollection, true, true)
             ->willReturn([$option]);
         $productType->expects($this->once())
             ->method('setStoreFilter');
@@ -433,7 +434,8 @@ function ($key) use ($optionCollection, $selectionCollection) {
             ->method('getItemById')
             ->willReturn($option);
         $optionCollection->expects($this->once())
-            ->method('appendSelections');
+            ->method('appendSelections')
+            ->with($selectionCollection, true, true);
         $productType->expects($this->once())
             ->method('setStoreFilter');
         $buyRequest->expects($this->once())
@@ -668,7 +670,8 @@ function ($key) use ($optionCollection, $selectionCollection) {
             ->method('getItemById')
             ->willReturn($option);
         $optionCollection->expects($this->once())
-            ->method('appendSelections');
+            ->method('appendSelections')
+            ->with($selectionCollection, true, true);
         $productType->expects($this->once())
             ->method('setStoreFilter');
         $buyRequest->expects($this->once())
@@ -891,7 +894,8 @@ function ($key) use ($optionCollection, $selectionCollection) {
             ->method('getItemById')
             ->willReturn($option);
         $optionCollection->expects($this->once())
-            ->method('appendSelections');
+            ->method('appendSelections')
+            ->with($selectionCollection, true, true);
         $productType->expects($this->once())
             ->method('setStoreFilter');
         $buyRequest->expects($this->once())
@@ -1169,7 +1173,8 @@ function ($key) use ($optionCollection, $selectionCollection) {
                 }
             );
         $optionCollection->expects($this->once())
-            ->method('appendSelections');
+            ->method('appendSelections')
+            ->with($selectionCollection, true, true);
         $productType->expects($this->once())
             ->method('setStoreFilter');
         $buyRequest->expects($this->once())

From 247f7935c9941a8650f0a45f28a69a0235c26aa1 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Thu, 17 Aug 2017 10:58:17 +0300
Subject: [PATCH 10/85] MAGETWO-67037: core_config_data table is not populated
 correctly when upgrading from 2.1 to 2.2

---
 .../Magento/Directory/Setup/InstallData.php   |  21 ----
 .../Magento/Directory/Setup/UpgradeData.php   | 103 ++++++++++++++++++
 app/code/Magento/Directory/etc/module.xml     |   2 +-
 3 files changed, 104 insertions(+), 22 deletions(-)
 create mode 100644 app/code/Magento/Directory/Setup/UpgradeData.php

diff --git a/app/code/Magento/Directory/Setup/InstallData.php b/app/code/Magento/Directory/Setup/InstallData.php
index 06dcb70bf934f..33c3ae4558e16 100644
--- a/app/code/Magento/Directory/Setup/InstallData.php
+++ b/app/code/Magento/Directory/Setup/InstallData.php
@@ -809,27 +809,6 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
             ['BR', 'SE', 'Sergipe'],
             ['BR', 'TO', 'Tocantins'],
             ['BR', 'DF', 'Distrito Federal'],
-            ['HR', 'HR-01', 'Zagrebačka županija'],
-            ['HR', 'HR-02', 'Krapinsko-zagorska županija'],
-            ['HR', 'HR-03', 'Sisačko-moslavačka županija'],
-            ['HR', 'HR-04', 'Karlovačka županija'],
-            ['HR', 'HR-05', 'Varaždinska županija'],
-            ['HR', 'HR-06', 'Koprivničko-križevačka županija'],
-            ['HR', 'HR-07', 'Bjelovarsko-bilogorska županija'],
-            ['HR', 'HR-08', 'Primorsko-goranska županija'],
-            ['HR', 'HR-09', 'Ličko-senjska županija'],
-            ['HR', 'HR-10', 'Virovitičko-podravska županija'],
-            ['HR', 'HR-11', 'Požeško-slavonska županija'],
-            ['HR', 'HR-12', 'Brodsko-posavska županija'],
-            ['HR', 'HR-13', 'Zadarska županija'],
-            ['HR', 'HR-14', 'Osječko-baranjska županija'],
-            ['HR', 'HR-15', 'Šibensko-kninska županija'],
-            ['HR', 'HR-16', 'Vukovarsko-srijemska županija'],
-            ['HR', 'HR-17', 'Splitsko-dalmatinska županija'],
-            ['HR', 'HR-18', 'Istarska županija'],
-            ['HR', 'HR-19', 'Dubrovačko-neretvanska županija'],
-            ['HR', 'HR-20', 'Međimurska županija'],
-            ['HR', 'HR-21', 'Grad Zagreb']
         ];
 
         foreach ($data as $row) {
diff --git a/app/code/Magento/Directory/Setup/UpgradeData.php b/app/code/Magento/Directory/Setup/UpgradeData.php
new file mode 100644
index 0000000000000..e5090902c9713
--- /dev/null
+++ b/app/code/Magento/Directory/Setup/UpgradeData.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Directory\Setup;
+
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
+use Magento\Directory\Helper\Data;
+
+class UpgradeData implements UpgradeDataInterface
+{
+    /**
+     * Directory data.
+     *
+     * @var Data
+     */
+    private $directoryData;
+
+    /**
+     * @param Data $directoryData
+     */
+    public function __construct(Data $directoryData)
+    {
+        $this->directoryData = $directoryData;
+    }
+
+    /**
+     * Upgrades data for Directry module.
+     *
+     * @param ModuleDataSetupInterface $setup
+     * @param ModuleContextInterface $context
+     * @return void
+     */
+    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    {
+        if (version_compare($context->getVersion(), '2.0.1', '<')) {
+            $this->addCroatia($setup);
+        }
+    }
+
+    /**
+     * Add Croatia and it's states to appropriate tables.
+     *
+     * @param ModuleDataSetupInterface $setup
+     * @return void
+     */
+    private function addCroatia($setup)
+    {
+        /**
+         * Fill table directory/country_region
+         * Fill table directory/country_region_name for en_US locale
+         */
+        $data = [
+            ['HR', 'HR-01', 'Zagrebačka županija'],
+            ['HR', 'HR-02', 'Krapinsko-zagorska županija'],
+            ['HR', 'HR-03', 'Sisačko-moslavačka županija'],
+            ['HR', 'HR-04', 'Karlovačka županija'],
+            ['HR', 'HR-05', 'Varaždinska županija'],
+            ['HR', 'HR-06', 'Koprivničko-križevačka županija'],
+            ['HR', 'HR-07', 'Bjelovarsko-bilogorska županija'],
+            ['HR', 'HR-08', 'Primorsko-goranska županija'],
+            ['HR', 'HR-09', 'Ličko-senjska županija'],
+            ['HR', 'HR-10', 'Virovitičko-podravska županija'],
+            ['HR', 'HR-11', 'Požeško-slavonska županija'],
+            ['HR', 'HR-12', 'Brodsko-posavska županija'],
+            ['HR', 'HR-13', 'Zadarska županija'],
+            ['HR', 'HR-14', 'Osječko-baranjska županija'],
+            ['HR', 'HR-15', 'Šibensko-kninska županija'],
+            ['HR', 'HR-16', 'Vukovarsko-srijemska županija'],
+            ['HR', 'HR-17', 'Splitsko-dalmatinska županija'],
+            ['HR', 'HR-18', 'Istarska županija'],
+            ['HR', 'HR-19', 'Dubrovačko-neretvanska županija'],
+            ['HR', 'HR-20', 'Međimurska županija'],
+            ['HR', 'HR-21', 'Grad Zagreb']
+        ];
+        foreach ($data as $row) {
+            $bind = ['country_id' => $row[0], 'code' => $row[1], 'default_name' => $row[2]];
+            $setup->getConnection()->insert($setup->getTable('directory_country_region'), $bind);
+            $regionId = $setup->getConnection()->lastInsertId($setup->getTable('directory_country_region'));
+            $bind = ['locale' => 'en_US', 'region_id' => $regionId, 'name' => $row[2]];
+            $setup->getConnection()->insert($setup->getTable('directory_country_region_name'), $bind);
+        }
+        /**
+         * Upgrade core_config_data general/region/state_required field.
+         */
+        $countries = $this->directoryData->getCountryCollection()->getCountriesWithRequiredStates();
+        $setup->getConnection()->update(
+            $setup->getTable('core_config_data'),
+            [
+                'value' => implode(',', array_keys($countries))
+            ],
+            [
+                'scope="default"',
+                'scope_id=0',
+                'path=?' => Data::XML_PATH_STATES_REQUIRED
+            ]
+        );
+    }
+}
diff --git a/app/code/Magento/Directory/etc/module.xml b/app/code/Magento/Directory/etc/module.xml
index f4a673789f64d..2711a91577a9a 100644
--- a/app/code/Magento/Directory/etc/module.xml
+++ b/app/code/Magento/Directory/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Directory" setup_version="2.0.0">
+    <module name="Magento_Directory" setup_version="2.0.1">
         <sequence>
             <module name="Magento_Store"/>
         </sequence>

From 33b824fdcef843a4c801facaad9fd982cb45892f Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Thu, 17 Aug 2017 11:41:33 +0300
Subject: [PATCH 11/85] MAGETWO-67037: core_config_data table is not populated
 correctly when upgrading from 2.1 to 2.2

---
 app/code/Magento/Directory/Setup/UpgradeData.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/code/Magento/Directory/Setup/UpgradeData.php b/app/code/Magento/Directory/Setup/UpgradeData.php
index e5090902c9713..767305e2798c3 100644
--- a/app/code/Magento/Directory/Setup/UpgradeData.php
+++ b/app/code/Magento/Directory/Setup/UpgradeData.php
@@ -11,6 +11,10 @@
 use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Directory\Helper\Data;
 
+/**
+ * Upgrade Data script for Directory module.
+ * @codeCoverageIgnore
+ */
 class UpgradeData implements UpgradeDataInterface
 {
     /**

From 984213677dbaa00332c66ff14a5d46a45ffbf571 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Thu, 17 Aug 2017 11:42:12 +0300
Subject: [PATCH 12/85] MAGETWO-70540: Edit bundle product from shopping cart
 work unexpected

---
 .../Product/View/Type/Bundle/Option/Multi.php |  24 ++++
 .../product/view/type/bundle/options.phtml    |   2 +-
 .../Catalog/Product/View/Type/Bundle.php      |  37 +++--
 ...AssertBundleProductOnConfigureCartPage.php | 132 ++++++++++++++++++
 .../Page/Checkout/CheckoutCartConfigure.xml   |  15 ++
 .../Bundle/Test/Repository/BundleProduct.xml  |  38 +++++
 .../BundleProduct/BundleSelections.xml        |  39 ++++++
 .../Repository/BundleProduct/CheckoutData.xml |  48 +++++++
 .../Checkout/Test/Block/Cart/CartItem.php     |   2 +-
 .../Test/Page/CheckoutCartConfigure.xml       |  21 +++
 .../AddProductsToShoppingCartEntityTest.xml   |  24 ++++
 11 files changed, 370 insertions(+), 12 deletions(-)
 create mode 100644 dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductOnConfigureCartPage.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Bundle/Test/Page/Checkout/CheckoutCartConfigure.xml
 create mode 100644 dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutCartConfigure.xml

diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php
index 86d77ae3d8cc8..d94948e7af0ab 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php
@@ -17,4 +17,28 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
      * @var string
      */
     protected $_template = 'catalog/product/view/type/bundle/option/multi.phtml';
+
+    /**
+     * @inheritdoc
+     */
+    protected function _getSelectedOptions()
+    {
+        if ($this->_selectedOptions === null) {
+            $this->_selectedOptions = [];
+            /** @var \Magento\Bundle\Model\Option $option */
+            $option = $this->getOption();
+            if ($this->getProduct()->hasPreconfiguredValues()) {
+                $selectionIds = $this->getProduct()->getPreconfiguredValues()->getData(
+                    'bundle_option/' . $option->getId()
+                );
+                foreach ($selectionIds as $selectionId) {
+                    if ($selectionId && $option->getSelectionById($selectionId)) {
+                        $this->_selectedOptions[] = $selectionId;
+                    }
+                }
+            }
+        }
+
+        return $this->_selectedOptions;
+    }
 }
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
index 0d01afb664bd0..12cea0101013b 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
@@ -12,7 +12,7 @@
 $product = $block->getProduct();
 $helper = $this->helper('Magento\Catalog\Helper\Output');
 ?>
-<?php $options = $block->decorateArray($block->getOptions()); ?>
+<?php $options = $block->decorateArray($block->getOptions($product->getConfigureMode())); ?>
 <?php if ($product->isSaleable()):?>
     <?php if (count($options)): ?>
 <script type="text/x-magento-init">
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
index 0dea64d1e1348..c91a3cb7c9d47 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
@@ -115,10 +115,11 @@ public function addToCart(BundleProduct $product, CatalogProductView $catalogPro
      * Get product options
      *
      * @param FixtureInterface $product
+     * @param bool $showSelected
      * @return array
      * @throws \Exception
      */
-    public function getOptions(FixtureInterface $product)
+    public function getOptions(FixtureInterface $product, bool $showSelected = false)
     {
         /** @var BundleProduct  $product */
         $this->product = $product;
@@ -139,7 +140,9 @@ public function getOptions(FixtureInterface $product)
             $optionElement = $listFormOptions[$title];
             $getTypeData = 'get' . $this->optionNameConvert($option['frontend_type']) . 'Data';
 
-            $optionData = $this->$getTypeData($optionElement);
+            $optionData = $showSelected
+                ? $this->$getTypeData($optionElement, $showSelected)
+                : $this->$getTypeData($optionElement);
             $optionData['title'] = $title;
             $optionData['type'] = $option['frontend_type'];
             $optionData['is_require'] = $optionElement->find($this->required, Locator::SELECTOR_XPATH)->isVisible()
@@ -203,12 +206,13 @@ protected function getDropdownData(SimpleElement $option)
      * Get data of "Multiple select" option
      *
      * @param SimpleElement $option
+     * @param bool $showSelected
      * @return array
      */
-    protected function getMultipleselectData(SimpleElement $option)
+    protected function getMultipleselectData(SimpleElement $option, bool $showSelected = false)
     {
         $multiselect = $option->find($this->selectOption, Locator::SELECTOR_XPATH, 'multiselect');
-        $data = $this->getSelectOptionsData($multiselect, 1);
+        $data = $this->getSelectOptionsData($multiselect, 1, $showSelected);
 
         foreach ($data['options'] as $key => $option) {
             $option['title'] = trim(preg_replace('/^[\d]+ x/', '', $option['title']));
@@ -261,16 +265,24 @@ protected function getCheckboxData(SimpleElement $option)
      *
      * @param SimpleElement $element
      * @param int $firstOption
+     * @param bool $showSelected
      * @return array
      */
-    protected function getSelectOptionsData(SimpleElement $element, $firstOption = 1)
+    protected function getSelectOptionsData(SimpleElement $element, $firstOption = 1, bool $showSelected = false)
     {
         $listOptions = [];
 
         $count = $firstOption;
         $selectOption = $element->find(sprintf($this->option, $count), Locator::SELECTOR_XPATH);
         while ($selectOption->isVisible()) {
-            $listOptions[] = $this->parseOptionText($selectOption->getText());
+            if ($showSelected) {
+                $listOptions[] = $this->parseOptionText(
+                    $selectOption->getText(),
+                    $selectOption->getAttribute('selected')
+                );
+            } else {
+                $listOptions[] = $this->parseOptionText($selectOption->getText());
+            }
             ++$count;
             $selectOption = $element->find(sprintf($this->option, $count), Locator::SELECTOR_XPATH);
         }
@@ -279,21 +291,26 @@ protected function getSelectOptionsData(SimpleElement $element, $firstOption = 1
     }
 
     /**
-     * Parse option text to title and price
+     * Parse option text to title, price and optionally add selected attribute value.
      *
      * @param string $optionText
+     * @param string|null $selected
      * @return array
      */
-    protected function parseOptionText($optionText)
+    protected function parseOptionText($optionText, $selected = null)
     {
         preg_match('`^(.*?)\+ ?\$(\d.*?)$`sim', $optionText, $match);
         $optionPrice = isset($match[2]) ? str_replace(',', '', $match[2]) : 0;
         $optionTitle = isset($match[1]) ? trim($match[1]) : $optionText;
-
-        return [
+        $option = [
             'title' => $optionTitle,
             'price' => $optionPrice
         ];
+        if ($selected) {
+            $option['selected'] = true;
+        }
+
+        return $option;
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductOnConfigureCartPage.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductOnConfigureCartPage.php
new file mode 100644
index 0000000000000..eaef4a4d32e31
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductOnConfigureCartPage.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Test\Constraint;
+
+use Magento\Bundle\Test\Fixture\BundleProduct;
+use Magento\Checkout\Test\Fixture\Cart;
+use Magento\Checkout\Test\Page\CheckoutCart;
+use Magento\Checkout\Test\Page\CheckoutCartConfigure;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+
+/**
+ * Assertion that bundle product is correctly displayed on cart configuration page.
+ */
+class AssertBundleProductOnConfigureCartPage extends AbstractAssertForm
+{
+    /**
+     * Check bundle product options correctly displayed on cart configuration page.
+     *
+     * @param CheckoutCart $checkoutCart
+     * @param Cart $cart
+     * @param CheckoutCartConfigure $checkoutCartConfigure
+     * @return void
+     */
+    public function processAssert(CheckoutCart $checkoutCart, Cart $cart, CheckoutCartConfigure $checkoutCartConfigure)
+    {
+        $checkoutCart->open();
+        $sourceProducts = $cart->getDataFieldConfig('items')['source'];
+        $products = $sourceProducts->getProducts();
+        foreach ($cart->getItems() as $key => $item) {
+            $product = $products[$key];
+            $cartItem = $checkoutCart->getCartBlock()->getCartItem($product);
+            $cartItem->edit();
+            $options = $checkoutCartConfigure->getBundleViewBlock()->getBundleBlock()->getOptions($product, true);
+            $this->checkOptions($product, $options, $item->getData()['options']);
+        }
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Bundle options data on cart configuration page is correct.';
+    }
+
+    /**
+     * Compare bundle product options from fixture with product form.
+     *
+     * @param BundleProduct $product
+     * @param array $formOptions
+     * @param array $cartItemOptions
+     * @return void
+     */
+    private function checkOptions(BundleProduct $product, array $formOptions, array $cartItemOptions)
+    {
+        $productOptions = $this->prepareBundleOptions($product, $cartItemOptions);
+        $productOptions = $this->sortDataByPath($productOptions, '::title');
+        foreach ($productOptions as $key => $productOption) {
+            $productOptions[$key] = $this->sortDataByPath($productOption, 'options::title');
+        }
+        $formOptions = $this->sortDataByPath($formOptions, '::title');
+        foreach ($formOptions as $key => $formOption) {
+            $formOptions[$key] = $this->sortDataByPath($formOption, 'options::title');
+        }
+
+        $error = $this->verifyData($productOptions, $formOptions);
+        \PHPUnit_Framework_Assert::assertEmpty($error, $error);
+    }
+
+    /**
+     * Prepare bundle options.
+     *
+     * @param BundleProduct $product
+     * @param array $cartItemOptions
+     * @return array
+     */
+    private function prepareBundleOptions(BundleProduct $product, array $cartItemOptions)
+    {
+        $bundleSelections = $product->getBundleSelections();
+        $bundleOptions = isset($bundleSelections['bundle_options']) ? $bundleSelections['bundle_options'] : [];
+        $result = [];
+        foreach ($bundleOptions as $optionKey => $bundleOption) {
+            $optionData = [
+                'title' => $bundleOption['title'],
+                'type' => $bundleOption['frontend_type'],
+                'is_require' => $bundleOption['required'],
+            ];
+            $key = 0;
+            foreach ($bundleOption['assigned_products'] as $productKey => $assignedProduct) {
+                if ($this->isInStock($product, $key++)) {
+                    $price = isset($assignedProduct['data']['selection_price_value'])
+                        ? $assignedProduct['data']['selection_price_value']
+                        : $bundleSelections['products'][$optionKey][$productKey]->getPrice();
+                    $title = $assignedProduct['search_data']['name'];
+                    $optionData['options'][$productKey] = [
+                        'title' => $title,
+                        'price' => number_format($price, 2),
+                    ];
+                    foreach ($cartItemOptions as $option) {
+                        if (strpos($option['value'], $title)) {
+                            $optionData['options'][$productKey]['selected'] = true;
+                        }
+                    }
+                }
+            }
+            $result[$optionKey] = $optionData;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Check product is in stock.
+     *
+     * @param BundleProduct $product
+     * @param int $key
+     * @return bool
+     */
+    private function isInStock(BundleProduct $product, int $key)
+    {
+        $assignedProducts = $product->getBundleSelections()['products'][0];
+        $status = $assignedProducts[$key]->getData()['quantity_and_stock_status']['is_in_stock'];
+
+        return $status === 'In Stock';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Page/Checkout/CheckoutCartConfigure.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Page/Checkout/CheckoutCartConfigure.xml
new file mode 100644
index 0000000000000..c8e4699a91be9
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Page/Checkout/CheckoutCartConfigure.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
+    <page name="CheckoutCartConfigure" mca="checkout/cart/configure" module="Magento_Checkout">
+        <block name="viewBlock">
+            <render name="bundle" class="Magento\Bundle\Test\Block\Catalog\Product\View" />
+        </block>
+        <block name="bundleViewBlock" class="Magento\Bundle\Test\Block\Catalog\Product\View" locator="#maincontent" strategy="css selector" />
+    </page>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml
index e21d98238a3f1..6950a0299897a 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml
@@ -478,5 +478,43 @@
                 <item name="dataset" xsi:type="string">default_with_one_simple_product_and_custom_option</item>
             </field>
         </dataset>
+
+        <dataset name="bundle_with_multiselect_option_one_selection">
+            <field name="name" xsi:type="string">Bundle with multiselect option %isolation%</field>
+            <field name="url_key" xsi:type="string">bundle-with-multiselect-option-%isolation%</field>
+            <field name="sku" xsi:type="string">sku_bundle_with_multiselect_option_%isolation%</field>
+            <field name="sku_type" xsi:type="string">Yes</field>
+            <field name="price_type" xsi:type="string">Yes</field>
+            <field name="website_ids" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="dataset" xsi:type="string">default</item>
+                </item>
+            </field>
+            <field name="bundle_selections" xsi:type="array">
+                <item name="dataset" xsi:type="string">multiselect_option</item>
+            </field>
+            <field name="checkout_data" xsi:type="array">
+                <item name="dataset" xsi:type="string">bundle_multiselect_one_option</item>
+            </field>
+        </dataset>
+
+        <dataset name="bundle_with_multiselect_option_two_selections">
+            <field name="name" xsi:type="string">Bundle with multiselect option %isolation%</field>
+            <field name="url_key" xsi:type="string">bundle-with-multiselect-option-%isolation%</field>
+            <field name="sku" xsi:type="string">sku_bundle_with_multiselect_option_%isolation%</field>
+            <field name="sku_type" xsi:type="string">Yes</field>
+            <field name="price_type" xsi:type="string">Yes</field>
+            <field name="website_ids" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="dataset" xsi:type="string">default</item>
+                </item>
+            </field>
+            <field name="bundle_selections" xsi:type="array">
+                <item name="dataset" xsi:type="string">multiselect_option</item>
+            </field>
+            <field name="checkout_data" xsi:type="array">
+                <item name="dataset" xsi:type="string">bundle_multiselect_two_options</item>
+            </field>
+        </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/BundleSelections.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/BundleSelections.xml
index a40114d4c6253..279a29d0a47b2 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/BundleSelections.xml
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/BundleSelections.xml
@@ -1066,5 +1066,44 @@
                 </item>
             </field>
         </dataset>
+
+        <dataset name="multiselect_option">
+            <field name="bundle_options" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="title" xsi:type="string">Multiple Select Option</item>
+                    <item name="type" xsi:type="string">Multiple Select</item>
+                    <item name="frontend_type" xsi:type="string">Multiple Select</item>
+                    <item name="required" xsi:type="string">Yes</item>
+                    <item name="assigned_products" xsi:type="array">
+                        <item name="0" xsi:type="array">
+                            <item name="search_data" xsi:type="array">
+                                <item name="name" xsi:type="string">%product_name%</item>
+                            </item>
+                            <item name="data" xsi:type="array">
+                                <item name="selection_price_value" xsi:type="string">560.00</item>
+                                <item name="selection_price_type" xsi:type="string">Fixed</item>
+                                <item name="selection_qty" xsi:type="string">1</item>
+                            </item>
+                        </item>
+                        <item name="1" xsi:type="array">
+                            <item name="search_data" xsi:type="array">
+                                <item name="name" xsi:type="string">%product_name%</item>
+                            </item>
+                            <item name="data" xsi:type="array">
+                                <item name="selection_price_value" xsi:type="string">100.00</item>
+                                <item name="selection_price_type" xsi:type="string">Fixed</item>
+                                <item name="selection_qty" xsi:type="string">1</item>
+                            </item>
+                        </item>
+                    </item>
+                </item>
+            </field>
+            <field name="products" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="0" xsi:type="string">catalogProductSimple::default</item>
+                    <item name="1" xsi:type="string">catalogProductSimple::product_100_dollar</item>
+                </item>
+            </field>
+        </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/CheckoutData.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/CheckoutData.xml
index 067ce4a7ee569..8459ce271e4d9 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/CheckoutData.xml
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/CheckoutData.xml
@@ -462,5 +462,53 @@
                 </item>
             </field>
         </dataset>
+
+        <dataset name="bundle_multiselect_one_option">
+            <field name="options" xsi:type="array">
+                <item name="bundle_options" xsi:type="array">
+                    <item name="0" xsi:type="array">
+                        <item name="title" xsi:type="string">Multiple Select Option</item>
+                        <item name="type" xsi:type="string">Multiple Select</item>
+                        <item name="frontend_type" xsi:type="string">Multiple</item>
+                        <item name="value" xsi:type="array">
+                            <item name="name" xsi:type="string">product_100_dollar</item>
+                        </item>
+                    </item>
+                </item>
+            </field>
+            <field name="cartItem" xsi:type="array">
+                <item name="price" xsi:type="string">100</item>
+                <item name="qty" xsi:type="string">1</item>
+                <item name="subtotal" xsi:type="string">100</item>
+            </field>
+        </dataset>
+
+        <dataset name="bundle_multiselect_two_options">
+            <field name="options" xsi:type="array">
+                <item name="bundle_options" xsi:type="array">
+                    <item name="0" xsi:type="array">
+                        <item name="title" xsi:type="string">Multiple Select Option</item>
+                        <item name="type" xsi:type="string">Multiple Select</item>
+                        <item name="frontend_type" xsi:type="string">Multiple</item>
+                        <item name="value" xsi:type="array">
+                            <item name="name" xsi:type="string">Simple Product</item>
+                        </item>
+                    </item>
+                    <item name="1" xsi:type="array">
+                        <item name="title" xsi:type="string">Multiple Select Option</item>
+                        <item name="type" xsi:type="string">Multiple Select</item>
+                        <item name="frontend_type" xsi:type="string">Multiple</item>
+                        <item name="value" xsi:type="array">
+                            <item name="name" xsi:type="string">product_100_dollar</item>
+                        </item>
+                    </item>
+                </item>
+            </field>
+            <field name="cartItem" xsi:type="array">
+                <item name="price" xsi:type="string">660</item>
+                <item name="qty" xsi:type="string">1</item>
+                <item name="subtotal" xsi:type="string">660</item>
+            </field>
+        </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php
index 5fbc76a6eca5e..44068c21418c4 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php
@@ -19,7 +19,7 @@ class CartItem extends AbstractCartItem
      *
      * @var string
      */
-    protected $edit = '.action.edit';
+    protected $edit = '.action-edit';
 
     /**
      * Selector for "Remove item" button
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutCartConfigure.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutCartConfigure.xml
new file mode 100644
index 0000000000000..b7afe8b1860f8
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutCartConfigure.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
+    <page name="CheckoutCartConfigure" mca="checkout/cart/configure" module="Magento_Checkout">
+        <block name="viewBlock" class="Magento\Catalog\Test\Block\Product\View" locator="#maincontent" strategy="css selector" />
+        <block name="additionalInformationBlock" class="Magento\Catalog\Test\Block\Product\Additional" locator="#additional" strategy="css selector" />
+        <block name="customOptionsBlock" class="Magento\Catalog\Test\Block\Product\View\CustomOptions" locator="#product-options-wrapper" strategy="css selector" />
+        <block name="relatedProductBlock" class="Magento\Catalog\Test\Block\Product\ProductList\Related" locator=".block.related" strategy="css selector" />
+        <block name="upsellBlock" class="Magento\Catalog\Test\Block\Product\ProductList\Upsell" locator=".block.upsell" strategy="css selector" />
+        <block name="crosssellBlock" class="Magento\Catalog\Test\Block\Product\ProductList\Crosssell" locator=".block.crosssell" strategy="css selector" />
+        <block name="downloadableLinksBlock" class="Magento\Downloadable\Test\Block\Catalog\Product\View\Links" locator="[data-container-for=downloadable-links]" strategy="css selector" />
+        <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator=".page.messages" strategy="css selector" />
+        <block name="titleBlock" class="Magento\Theme\Test\Block\Html\Title" locator=".page-title-wrapper h1.page-title .base" strategy="css selector" />
+        <block name="widgetView" class="Magento\Widget\Test\Block\WidgetView" locator=".column.main .widget" strategy="css selector" />
+    </page>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml
index 483caa4adc40e..8d054c0230873 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml
@@ -264,5 +264,29 @@
             <data name="isValidationFailed" xsi:type="boolean">true</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertCartItemsOptions" />
         </variation>
+        <variation name="AddProductsToShoppingCartEntityTestVariation13" summary="Check Bundle on Cart Configuration Page." ticketId="MAGETWO-71634">
+            <data name="productsData/0" xsi:type="string">bundleProduct::bundle_with_multiselect_option_one_selection</data>
+            <data name="cart/data/grand_total" xsi:type="string">105</data>
+            <data name="cart/data/subtotal" xsi:type="string">100</data>
+            <data name="expectedItemsQty" xsi:type="number">1</data>
+            <constraint name="Magento\Bundle\Test\Constraint\AssertBundleProductOnConfigureCartPage" />
+            <constraint name="Magento\Checkout\Test\Constraint\AssertPriceInShoppingCart" />
+            <constraint name="Magento\Checkout\Test\Constraint\AssertProductQtyInShoppingCart" />
+            <constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInShoppingCart" />
+            <constraint name="Magento\Checkout\Test\Constraint\AssertCartItemsOptions" />
+            <constraint name="Magento\Checkout\Test\Constraint\AssertGrandTotalInShoppingCart" />
+        </variation>
+        <variation name="AddProductsToShoppingCartEntityTestVariation14" summary="Check Bundle on Cart Configuration Page." ticketId="MAGETWO-71634">
+            <data name="productsData/0" xsi:type="string">bundleProduct::bundle_with_multiselect_option_two_selections</data>
+            <data name="cart/data/grand_total" xsi:type="string">665</data>
+            <data name="cart/data/subtotal" xsi:type="string">660</data>
+            <data name="expectedItemsQty" xsi:type="number">1</data>
+            <constraint name="Magento\Bundle\Test\Constraint\AssertBundleProductOnConfigureCartPage" />
+            <constraint name="Magento\Checkout\Test\Constraint\AssertPriceInShoppingCart" />
+            <constraint name="Magento\Checkout\Test\Constraint\AssertProductQtyInShoppingCart" />
+            <constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInShoppingCart" />
+            <constraint name="Magento\Checkout\Test\Constraint\AssertCartItemsOptions" />
+            <constraint name="Magento\Checkout\Test\Constraint\AssertGrandTotalInShoppingCart" />
+        </variation>
     </testCase>
 </config>

From f9696ceaf0b7a0041ef2152a6f7b5d043a7d0761 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Thu, 17 Aug 2017 16:13:39 +0300
Subject: [PATCH 13/85] MAGETWO-67037: core_config_data table is not populated
 correctly when upgrading from 2.1 to 2.2

---
 app/code/Magento/Directory/Setup/UpgradeData.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Directory/Setup/UpgradeData.php b/app/code/Magento/Directory/Setup/UpgradeData.php
index 767305e2798c3..aa0f81a32fff0 100644
--- a/app/code/Magento/Directory/Setup/UpgradeData.php
+++ b/app/code/Magento/Directory/Setup/UpgradeData.php
@@ -13,7 +13,6 @@
 
 /**
  * Upgrade Data script for Directory module.
- * @codeCoverageIgnore
  */
 class UpgradeData implements UpgradeDataInterface
 {

From eef82fd4a0006f504ded7030c3ca06642e0055fb Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Thu, 17 Aug 2017 16:19:42 +0300
Subject: [PATCH 14/85] MAGETWO-67092: Table salesrule_product_attribute is not
 populated when upgrading to 2.2

---
 .../Magento/SalesRule/Setup/UpgradeData.php   | 100 +++++++++++++++++-
 app/code/Magento/SalesRule/etc/module.xml     |   2 +-
 2 files changed, 96 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/SalesRule/Setup/UpgradeData.php b/app/code/Magento/SalesRule/Setup/UpgradeData.php
index 609f5ff5a6845..28f59ebc25dd1 100644
--- a/app/code/Magento/SalesRule/Setup/UpgradeData.php
+++ b/app/code/Magento/SalesRule/Setup/UpgradeData.php
@@ -3,17 +3,27 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\SalesRule\Setup;
 
+use Magento\Backend\App\Area\FrontNameResolver;
+use Magento\Framework\App\State;
 use Magento\Framework\DB\AggregatedFieldDataConverter;
 use Magento\Framework\DB\DataConverter\SerializedToJson;
 use Magento\Framework\DB\FieldToConvert;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\SalesRule\Api\Data\RuleInterface;
+use Magento\SalesRule\Model\ResourceModel\Rule as ResourceModelRule;
+use Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory as RuleCollectionFactory;
+use Magento\SalesRule\Model\Rule as ModelRule;
 
+/**
+ * Class \Magento\SalesRule\Setup\UpgradeData
+ */
 class UpgradeData implements UpgradeDataInterface
 {
     /**
@@ -27,17 +37,55 @@ class UpgradeData implements UpgradeDataInterface
     private $aggregatedFieldConverter;
 
     /**
-     * UpgradeData constructor.
+     * Resource Model of sales rule.
      *
+     * @var ResourceModelRule;
+     */
+    private $resourceModelRule;
+
+    /**
+     * App state.
+     *
+     * @var State
+     */
+    private $state;
+
+    /**
+     * Serializer.
+     *
+     * @var Json
+     */
+    private $serializer;
+
+    /**
+     * Rule Collection Factory.
+     *
+     * @var RuleColletionFactory
+     */
+    private $ruleColletionFactory;
+
+    /**
      * @param AggregatedFieldDataConverter $aggregatedFieldConverter
      * @param MetadataPool $metadataPool
+     * @param ResourceModelRule $resourceModelRule
+     * @param Json $serializer
+     * @param State $state
+     * @param RuleCollectionFactory $ruleColletionFactory
      */
     public function __construct(
         AggregatedFieldDataConverter $aggregatedFieldConverter,
-        MetadataPool $metadataPool
+        MetadataPool $metadataPool,
+        ResourceModelRule $resourceModelRule,
+        Json $serializer,
+        State $state,
+        RuleCollectionFactory $ruleColletionFactory
     ) {
         $this->aggregatedFieldConverter = $aggregatedFieldConverter;
         $this->metadataPool = $metadataPool;
+        $this->resourceModelRule = $resourceModelRule;
+        $this->serializer = $serializer;
+        $this->state = $state;
+        $this->ruleColletionFactory = $ruleColletionFactory;
     }
 
     /**
@@ -46,11 +94,17 @@ public function __construct(
     public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
         $setup->startSetup();
-
         if (version_compare($context->getVersion(), '2.0.2', '<')) {
             $this->convertSerializedDataToJson($setup);
         }
-
+        if (version_compare($context->getVersion(), '2.0.3', '<')) {
+            $this->state->emulateAreaCode(
+                FrontNameResolver::AREA_CODE,
+                [$this, 'fillSalesRuleProductAttributeTable'],
+                [$setup]
+            );
+            $this->fillSalesRuleProductAttributeTable();
+        }
         $setup->endSetup();
     }
 
@@ -82,4 +136,40 @@ public function convertSerializedDataToJson($setup)
             $setup->getConnection()
         );
     }
+
+    /**
+     * Fills blank table salesrule_product_attribute with data.
+     *
+     * @return void
+     */
+    public function fillSalesRuleProductAttributeTable()
+    {
+        $ruleCollection = $this->getRuleColletion();
+        /** @var ModelRule $rule */
+        foreach ($ruleCollection as $rule) {
+            // Save product attributes used in rule
+            $ruleProductAttributes = array_merge(
+                $this->resourceModelRule->getProductAttributes(
+                    $this->serializer->serialize($rule->getConditions()->asArray())
+                ),
+                $this->resourceModelRule->getProductAttributes(
+                    $this->serializer->serialize($rule->getActions()->asArray())
+                )
+            );
+            if (count($ruleProductAttributes)) {
+                $this->resourceModelRule->setActualProductAttributes($rule, $ruleProductAttributes);
+            }
+        }
+    }
+
+    /**
+     * Get sales rule collection.
+     *
+     * @deprecated
+     * @return ResourceModelRule\Collection
+     */
+    private function getRuleColletion()
+    {
+        return $this->ruleColletionFactory->create();
+    }
 }
diff --git a/app/code/Magento/SalesRule/etc/module.xml b/app/code/Magento/SalesRule/etc/module.xml
index b3adcdaaa82eb..f3f160eb7d40b 100644
--- a/app/code/Magento/SalesRule/etc/module.xml
+++ b/app/code/Magento/SalesRule/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_SalesRule" setup_version="2.0.2">
+    <module name="Magento_SalesRule" setup_version="2.0.3">
         <sequence>
             <module name="Magento_Rule"/>
             <module name="Magento_Catalog"/>

From 39cbc85c2f1fbb3963eff1840c3a507a626cea33 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Thu, 17 Aug 2017 16:43:26 +0300
Subject: [PATCH 15/85] MAGETWO-67092: Table salesrule_product_attribute is not
 populated when upgrading to 2.2

---
 .../Magento/SalesRule/Setup/UpgradeData.php   | 31 ++++++-------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/app/code/Magento/SalesRule/Setup/UpgradeData.php b/app/code/Magento/SalesRule/Setup/UpgradeData.php
index 28f59ebc25dd1..b0db3b555af56 100644
--- a/app/code/Magento/SalesRule/Setup/UpgradeData.php
+++ b/app/code/Magento/SalesRule/Setup/UpgradeData.php
@@ -144,32 +144,21 @@ public function convertSerializedDataToJson($setup)
      */
     public function fillSalesRuleProductAttributeTable()
     {
-        $ruleCollection = $this->getRuleColletion();
+        /** @var ResourceModelRule\Collection $ruleCollection */
+        $ruleCollection = $this->ruleColletionFactory->create();
         /** @var ModelRule $rule */
         foreach ($ruleCollection as $rule) {
             // Save product attributes used in rule
-            $ruleProductAttributes = array_merge(
-                $this->resourceModelRule->getProductAttributes(
-                    $this->serializer->serialize($rule->getConditions()->asArray())
-                ),
-                $this->resourceModelRule->getProductAttributes(
-                    $this->serializer->serialize($rule->getActions()->asArray())
-                )
-            );
-            if (count($ruleProductAttributes)) {
+            $conditions = $rule->getConditions()->asArray();
+            $actions = $rule->getActions()->asArray();
+            $serializedConditions = $this->serializer->serialize($conditions);
+            $serializedActions = $this->serializer->serialize($actions);
+            $conditionAttributes = $this->resourceModelRule->getProductAttributes($serializedConditions);
+            $actionAttributes = $this->resourceModelRule->getProductAttributes($serializedActions);
+            $ruleProductAttributes = array_merge($conditionAttributes, $actionAttributes);
+            if ($ruleProductAttributes) {
                 $this->resourceModelRule->setActualProductAttributes($rule, $ruleProductAttributes);
             }
         }
     }
-
-    /**
-     * Get sales rule collection.
-     *
-     * @deprecated
-     * @return ResourceModelRule\Collection
-     */
-    private function getRuleColletion()
-    {
-        return $this->ruleColletionFactory->create();
-    }
 }

From f245f6da20a188ac2d04d872086aeaf9e50b2210 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Thu, 17 Aug 2017 17:11:12 +0300
Subject: [PATCH 16/85] MAGETWO-67092: Table salesrule_product_attribute is not
 populated when upgrading to 2.2

---
 app/code/Magento/SalesRule/Setup/UpgradeData.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/SalesRule/Setup/UpgradeData.php b/app/code/Magento/SalesRule/Setup/UpgradeData.php
index b0db3b555af56..289fd2ed13a50 100644
--- a/app/code/Magento/SalesRule/Setup/UpgradeData.php
+++ b/app/code/Magento/SalesRule/Setup/UpgradeData.php
@@ -17,8 +17,6 @@
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\SalesRule\Api\Data\RuleInterface;
-use Magento\SalesRule\Model\ResourceModel\Rule as ResourceModelRule;
-use Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory as RuleCollectionFactory;
 use Magento\SalesRule\Model\Rule as ModelRule;
 
 /**
@@ -39,7 +37,7 @@ class UpgradeData implements UpgradeDataInterface
     /**
      * Resource Model of sales rule.
      *
-     * @var ResourceModelRule;
+     * @var \Magento\SalesRule\Model\ResourceModel\Rule;
      */
     private $resourceModelRule;
 
@@ -60,25 +58,25 @@ class UpgradeData implements UpgradeDataInterface
     /**
      * Rule Collection Factory.
      *
-     * @var RuleColletionFactory
+     * @var \Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory
      */
     private $ruleColletionFactory;
 
     /**
      * @param AggregatedFieldDataConverter $aggregatedFieldConverter
      * @param MetadataPool $metadataPool
-     * @param ResourceModelRule $resourceModelRule
+     * @param \Magento\SalesRule\Model\ResourceModel\Rule $resourceModelRule
      * @param Json $serializer
      * @param State $state
-     * @param RuleCollectionFactory $ruleColletionFactory
+     * @param \Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory $ruleColletionFactory
      */
     public function __construct(
         AggregatedFieldDataConverter $aggregatedFieldConverter,
         MetadataPool $metadataPool,
-        ResourceModelRule $resourceModelRule,
+        \Magento\SalesRule\Model\ResourceModel\Rule $resourceModelRule,
         Json $serializer,
         State $state,
-        RuleCollectionFactory $ruleColletionFactory
+        \Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory $ruleColletionFactory
     ) {
         $this->aggregatedFieldConverter = $aggregatedFieldConverter;
         $this->metadataPool = $metadataPool;

From b26849839afd87a56191634e812a40c6b658d9e8 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Thu, 17 Aug 2017 17:22:41 +0300
Subject: [PATCH 17/85] MAGETWO-67092: Table salesrule_product_attribute is not
 populated when upgrading to 2.2

---
 .../Magento/SalesRule/Setup/UpgradeData.php   | 64 ++++++++-----------
 1 file changed, 26 insertions(+), 38 deletions(-)

diff --git a/app/code/Magento/SalesRule/Setup/UpgradeData.php b/app/code/Magento/SalesRule/Setup/UpgradeData.php
index 289fd2ed13a50..52189c64fc75b 100644
--- a/app/code/Magento/SalesRule/Setup/UpgradeData.php
+++ b/app/code/Magento/SalesRule/Setup/UpgradeData.php
@@ -6,31 +6,18 @@
 
 namespace Magento\SalesRule\Setup;
 
-use Magento\Backend\App\Area\FrontNameResolver;
-use Magento\Framework\App\State;
-use Magento\Framework\DB\AggregatedFieldDataConverter;
-use Magento\Framework\DB\DataConverter\SerializedToJson;
-use Magento\Framework\DB\FieldToConvert;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\Serialize\Serializer\Json;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\SalesRule\Api\Data\RuleInterface;
-use Magento\SalesRule\Model\Rule as ModelRule;
-
 /**
  * Class \Magento\SalesRule\Setup\UpgradeData
  */
-class UpgradeData implements UpgradeDataInterface
+class UpgradeData implements \Magento\Framework\Setup\UpgradeDataInterface
 {
     /**
-     * @var MetadataPool
+     * @var \Magento\Framework\EntityManager\MetadataPool
      */
     private $metadataPool;
 
     /**
-     * @var AggregatedFieldDataConverter
+     * @var \Magento\Framework\DB\AggregatedFieldDataConverter
      */
     private $aggregatedFieldConverter;
 
@@ -44,14 +31,14 @@ class UpgradeData implements UpgradeDataInterface
     /**
      * App state.
      *
-     * @var State
+     * @var \Magento\Framework\App\State
      */
     private $state;
 
     /**
      * Serializer.
      *
-     * @var Json
+     * @var \Magento\Framework\Serialize\Serializer\Json
      */
     private $serializer;
 
@@ -63,19 +50,19 @@ class UpgradeData implements UpgradeDataInterface
     private $ruleColletionFactory;
 
     /**
-     * @param AggregatedFieldDataConverter $aggregatedFieldConverter
-     * @param MetadataPool $metadataPool
+     * @param \Magento\Framework\DB\AggregatedFieldDataConverter $aggregatedFieldConverter
+     * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param \Magento\SalesRule\Model\ResourceModel\Rule $resourceModelRule
-     * @param Json $serializer
-     * @param State $state
+     * @param \Magento\Framework\Serialize\Serializer\Json $serializer
+     * @param \Magento\Framework\App\State $state
      * @param \Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory $ruleColletionFactory
      */
     public function __construct(
-        AggregatedFieldDataConverter $aggregatedFieldConverter,
-        MetadataPool $metadataPool,
+        \Magento\Framework\DB\AggregatedFieldDataConverter $aggregatedFieldConverter,
+        \Magento\Framework\EntityManager\MetadataPool $metadataPool,
         \Magento\SalesRule\Model\ResourceModel\Rule $resourceModelRule,
-        Json $serializer,
-        State $state,
+        \Magento\Framework\Serialize\Serializer\Json $serializer,
+        \Magento\Framework\App\State $state,
         \Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory $ruleColletionFactory
     ) {
         $this->aggregatedFieldConverter = $aggregatedFieldConverter;
@@ -89,15 +76,17 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
-    {
+    public function upgrade(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $setup,
+        \Magento\Framework\Setup\ModuleContextInterface $context
+    ) {
         $setup->startSetup();
         if (version_compare($context->getVersion(), '2.0.2', '<')) {
             $this->convertSerializedDataToJson($setup);
         }
         if (version_compare($context->getVersion(), '2.0.3', '<')) {
             $this->state->emulateAreaCode(
-                FrontNameResolver::AREA_CODE,
+                \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE,
                 [$this, 'fillSalesRuleProductAttributeTable'],
                 [$setup]
             );
@@ -109,23 +98,22 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
     /**
      * Convert metadata from serialized to JSON format:
      *
-     * @param ModuleDataSetupInterface $setup
-     *
+     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $setup     *
      * @return void
      */
     public function convertSerializedDataToJson($setup)
     {
-        $metadata = $this->metadataPool->getMetadata(RuleInterface::class);
+        $metadata = $this->metadataPool->getMetadata(\Magento\SalesRule\Api\Data\RuleInterface::class);
         $this->aggregatedFieldConverter->convert(
             [
-                new FieldToConvert(
-                    SerializedToJson::class,
+                new \Magento\Framework\DB\FieldToConvert(
+                    \Magento\Framework\DB\DataConverter\SerializedToJson::class,
                     $setup->getTable('salesrule'),
                     $metadata->getLinkField(),
                     'conditions_serialized'
                 ),
-                new FieldToConvert(
-                    SerializedToJson::class,
+                new \Magento\Framework\DB\FieldToConvert(
+                    \Magento\Framework\DB\DataConverter\SerializedToJson::class,
                     $setup->getTable('salesrule'),
                     $metadata->getLinkField(),
                     'actions_serialized'
@@ -142,9 +130,9 @@ public function convertSerializedDataToJson($setup)
      */
     public function fillSalesRuleProductAttributeTable()
     {
-        /** @var ResourceModelRule\Collection $ruleCollection */
+        /** @var \Magento\SalesRule\Model\ResourceModel\Rule\Collection $ruleCollection */
         $ruleCollection = $this->ruleColletionFactory->create();
-        /** @var ModelRule $rule */
+        /** @var \Magento\SalesRule\Model\Rule $rule */
         foreach ($ruleCollection as $rule) {
             // Save product attributes used in rule
             $conditions = $rule->getConditions()->asArray();

From 849d1e3e9699a21aab976149c7227158bbce689c Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Thu, 17 Aug 2017 17:42:06 +0300
Subject: [PATCH 18/85] MAGETWO-67092: Table salesrule_product_attribute is not
 populated when upgrading to 2.2

---
 app/code/Magento/SalesRule/Setup/UpgradeData.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/SalesRule/Setup/UpgradeData.php b/app/code/Magento/SalesRule/Setup/UpgradeData.php
index 52189c64fc75b..4f1ce0db4cd7b 100644
--- a/app/code/Magento/SalesRule/Setup/UpgradeData.php
+++ b/app/code/Magento/SalesRule/Setup/UpgradeData.php
@@ -38,7 +38,7 @@ class UpgradeData implements \Magento\Framework\Setup\UpgradeDataInterface
     /**
      * Serializer.
      *
-     * @var \Magento\Framework\Serialize\Serializer\Json
+     * @var \Magento\Framework\Serialize\SerializerInterface
      */
     private $serializer;
 
@@ -53,7 +53,7 @@ class UpgradeData implements \Magento\Framework\Setup\UpgradeDataInterface
      * @param \Magento\Framework\DB\AggregatedFieldDataConverter $aggregatedFieldConverter
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param \Magento\SalesRule\Model\ResourceModel\Rule $resourceModelRule
-     * @param \Magento\Framework\Serialize\Serializer\Json $serializer
+     * @param \Magento\Framework\Serialize\SerializerInterface $serializer
      * @param \Magento\Framework\App\State $state
      * @param \Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory $ruleColletionFactory
      */
@@ -61,7 +61,7 @@ public function __construct(
         \Magento\Framework\DB\AggregatedFieldDataConverter $aggregatedFieldConverter,
         \Magento\Framework\EntityManager\MetadataPool $metadataPool,
         \Magento\SalesRule\Model\ResourceModel\Rule $resourceModelRule,
-        \Magento\Framework\Serialize\Serializer\Json $serializer,
+        \Magento\Framework\Serialize\SerializerInterface $serializer,
         \Magento\Framework\App\State $state,
         \Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory $ruleColletionFactory
     ) {
@@ -77,7 +77,7 @@ public function __construct(
      * @inheritdoc
      */
     public function upgrade(
-        \Magento\Framework\Setup\ModuleDataSetupInterface $setup,
+        \Magento\Framework\Setup\ModuleDataSetupInterface $setup, 
         \Magento\Framework\Setup\ModuleContextInterface $context
     ) {
         $setup->startSetup();

From 5c2d2083bdab45347459fa31065ad145c21be775 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Fri, 18 Aug 2017 11:21:01 +0300
Subject: [PATCH 19/85] MAGETWO-70540: Edit bundle product from shopping cart
 work unexpected

---
 .../Product/View/Type/Bundle/Option.php       | 24 ++++++++++++++-----
 .../Product/View/Type/Bundle/Option/Multi.php | 22 ++++++-----------
 .../product/view/type/bundle/options.phtml    |  3 ++-
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
index 16cdc58f1a1e4..62a895ae8445b 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
@@ -142,7 +142,7 @@ public function getDefaultValues()
      */
     protected function _getSelectedOptions()
     {
-        if (is_null($this->_selectedOptions)) {
+        if ($this->_selectedOptions === null) {
             $this->_selectedOptions = [];
 
             /** @var \Magento\Bundle\Model\Option $option */
@@ -152,17 +152,29 @@ protected function _getSelectedOptions()
                 $selectionId = $this->getProduct()->getPreconfiguredValues()->getData(
                     'bundle_option/' . $option->getId()
                 );
-                if ($selectionId && $option->getSelectionById($selectionId)) {
-                    $this->_selectedOptions = $selectionId;
-                } elseif (!$option->getRequired()) {
-                    $this->_selectedOptions = 'None';
-                }
+                $this->assignSelection($option, $selectionId);
             }
         }
 
         return $this->_selectedOptions;
     }
 
+    /**
+     * Set selected options.
+     *
+     * @param \Magento\Bundle\Model\Option $option
+     * @param mixed $selectionId
+     * @return void
+     */
+    protected function assignSelection(\Magento\Bundle\Model\Option $option, $selectionId)
+    {
+        if ($selectionId && $option->getSelectionById($selectionId)) {
+            $this->_selectedOptions = $selectionId;
+        } elseif (!$option->getRequired()) {
+            $this->_selectedOptions = 'None';
+        }
+    }
+
     /**
      * Define if selection is selected
      *
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php
index d94948e7af0ab..2942b479cbabf 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php
@@ -21,24 +21,16 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
     /**
      * @inheritdoc
      */
-    protected function _getSelectedOptions()
+    protected function assignSelection(\Magento\Bundle\Model\Option $option, $selectionId)
     {
-        if ($this->_selectedOptions === null) {
-            $this->_selectedOptions = [];
-            /** @var \Magento\Bundle\Model\Option $option */
-            $option = $this->getOption();
-            if ($this->getProduct()->hasPreconfiguredValues()) {
-                $selectionIds = $this->getProduct()->getPreconfiguredValues()->getData(
-                    'bundle_option/' . $option->getId()
-                );
-                foreach ($selectionIds as $selectionId) {
-                    if ($selectionId && $option->getSelectionById($selectionId)) {
-                        $this->_selectedOptions[] = $selectionId;
-                    }
+        if (is_array($selectionId)) {
+            foreach ($selectionId as $id) {
+                if ($id && $option->getSelectionById($id)) {
+                    $this->_selectedOptions[] = $id;
                 }
             }
+        } else {
+            parent::assignSelection($option, $selectionId);
         }
-
-        return $this->_selectedOptions;
     }
 }
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
index 12cea0101013b..157e2d959720b 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
@@ -11,8 +11,9 @@
 <?php
 $product = $block->getProduct();
 $helper = $this->helper('Magento\Catalog\Helper\Output');
+$stripSelection = $product->getConfigureMode() ? true : false;
+$options = $block->decorateArray($block->getOptions($stripSelection));
 ?>
-<?php $options = $block->decorateArray($block->getOptions($product->getConfigureMode())); ?>
 <?php if ($product->isSaleable()):?>
     <?php if (count($options)): ?>
 <script type="text/x-magento-init">

From 31a6fed7a379dea1573025f9f486619fbc15bbea Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Fri, 18 Aug 2017 16:10:16 -0500
Subject: [PATCH 20/85] MAGETWO-71551: Inconsistent quote information after
 upgrade on 2.2

- changed version in upgrade script
---
 app/code/Magento/Quote/Setup/UpgradeData.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Quote/Setup/UpgradeData.php b/app/code/Magento/Quote/Setup/UpgradeData.php
index ce24e85e99f0b..fde232c2e593b 100644
--- a/app/code/Magento/Quote/Setup/UpgradeData.php
+++ b/app/code/Magento/Quote/Setup/UpgradeData.php
@@ -40,7 +40,7 @@ public function __construct(
      */
     public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
-        if (version_compare($context->getVersion(), '2.0.4', '<')) {
+        if (version_compare($context->getVersion(), '2.0.6', '<')) {
             $quoteSetup = $this->quoteSetupFactory->create(['setup' => $setup]);
             $this->convertSerializedDataToJsonFactory->create(['quoteSetup' => $quoteSetup])
                 ->convert();

From 143cfb0f398d34bc15094163ad6ec17e972df4b2 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Mon, 21 Aug 2017 13:07:45 +0300
Subject: [PATCH 21/85] MAGETWO-70540: Edit bundle product from shopping cart
 work unexpected

---
 .../Catalog/Product/View/Type/Bundle.php      | 33 ++++--------
 ...AssertBundleProductOnConfigureCartPage.php | 51 ++++++-------------
 .../Page/Checkout/CheckoutCartConfigure.xml   | 15 ------
 .../Test/Page/CheckoutCartConfigure.xml       | 21 --------
 4 files changed, 27 insertions(+), 93 deletions(-)
 delete mode 100644 dev/tests/functional/tests/app/Magento/Bundle/Test/Page/Checkout/CheckoutCartConfigure.xml
 delete mode 100644 dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutCartConfigure.xml

diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
index c91a3cb7c9d47..18ac354adbc8e 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
@@ -115,11 +115,10 @@ public function addToCart(BundleProduct $product, CatalogProductView $catalogPro
      * Get product options
      *
      * @param FixtureInterface $product
-     * @param bool $showSelected
      * @return array
      * @throws \Exception
      */
-    public function getOptions(FixtureInterface $product, bool $showSelected = false)
+    public function getOptions(FixtureInterface $product)
     {
         /** @var BundleProduct  $product */
         $this->product = $product;
@@ -140,9 +139,7 @@ public function getOptions(FixtureInterface $product, bool $showSelected = false
             $optionElement = $listFormOptions[$title];
             $getTypeData = 'get' . $this->optionNameConvert($option['frontend_type']) . 'Data';
 
-            $optionData = $showSelected
-                ? $this->$getTypeData($optionElement, $showSelected)
-                : $this->$getTypeData($optionElement);
+            $optionData = $this->$getTypeData($optionElement);
             $optionData['title'] = $title;
             $optionData['type'] = $option['frontend_type'];
             $optionData['is_require'] = $optionElement->find($this->required, Locator::SELECTOR_XPATH)->isVisible()
@@ -206,13 +203,12 @@ protected function getDropdownData(SimpleElement $option)
      * Get data of "Multiple select" option
      *
      * @param SimpleElement $option
-     * @param bool $showSelected
      * @return array
      */
-    protected function getMultipleselectData(SimpleElement $option, bool $showSelected = false)
+    protected function getMultipleselectData(SimpleElement $option)
     {
         $multiselect = $option->find($this->selectOption, Locator::SELECTOR_XPATH, 'multiselect');
-        $data = $this->getSelectOptionsData($multiselect, 1, $showSelected);
+        $data = $this->getSelectOptionsData($multiselect, 1);
 
         foreach ($data['options'] as $key => $option) {
             $option['title'] = trim(preg_replace('/^[\d]+ x/', '', $option['title']));
@@ -265,24 +261,21 @@ protected function getCheckboxData(SimpleElement $option)
      *
      * @param SimpleElement $element
      * @param int $firstOption
-     * @param bool $showSelected
      * @return array
      */
-    protected function getSelectOptionsData(SimpleElement $element, $firstOption = 1, bool $showSelected = false)
+    protected function getSelectOptionsData(SimpleElement $element, $firstOption = 1)
     {
         $listOptions = [];
 
         $count = $firstOption;
         $selectOption = $element->find(sprintf($this->option, $count), Locator::SELECTOR_XPATH);
         while ($selectOption->isVisible()) {
-            if ($showSelected) {
-                $listOptions[] = $this->parseOptionText(
-                    $selectOption->getText(),
-                    $selectOption->getAttribute('selected')
-                );
-            } else {
-                $listOptions[] = $this->parseOptionText($selectOption->getText());
+            $option = $this->parseOptionText($selectOption->getText());
+            $selected = $selectOption->getAttribute('selected');
+            if ($selected) {
+                $option['selected'] = $selected;
             }
+            $listOptions[] = $option;
             ++$count;
             $selectOption = $element->find(sprintf($this->option, $count), Locator::SELECTOR_XPATH);
         }
@@ -294,10 +287,9 @@ protected function getSelectOptionsData(SimpleElement $element, $firstOption = 1
      * Parse option text to title, price and optionally add selected attribute value.
      *
      * @param string $optionText
-     * @param string|null $selected
      * @return array
      */
-    protected function parseOptionText($optionText, $selected = null)
+    protected function parseOptionText($optionText)
     {
         preg_match('`^(.*?)\+ ?\$(\d.*?)$`sim', $optionText, $match);
         $optionPrice = isset($match[2]) ? str_replace(',', '', $match[2]) : 0;
@@ -306,9 +298,6 @@ protected function parseOptionText($optionText, $selected = null)
             'title' => $optionTitle,
             'price' => $optionPrice
         ];
-        if ($selected) {
-            $option['selected'] = true;
-        }
 
         return $option;
     }
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductOnConfigureCartPage.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductOnConfigureCartPage.php
index eaef4a4d32e31..8828f31f9965a 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductOnConfigureCartPage.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductOnConfigureCartPage.php
@@ -7,9 +7,9 @@
 namespace Magento\Bundle\Test\Constraint;
 
 use Magento\Bundle\Test\Fixture\BundleProduct;
+use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Fixture\Cart;
 use Magento\Checkout\Test\Page\CheckoutCart;
-use Magento\Checkout\Test\Page\CheckoutCartConfigure;
 use Magento\Mtf\Constraint\AbstractAssertForm;
 
 /**
@@ -22,10 +22,10 @@ class AssertBundleProductOnConfigureCartPage extends AbstractAssertForm
      *
      * @param CheckoutCart $checkoutCart
      * @param Cart $cart
-     * @param CheckoutCartConfigure $checkoutCartConfigure
+     * @param CatalogProductView $catalogProductView
      * @return void
      */
-    public function processAssert(CheckoutCart $checkoutCart, Cart $cart, CheckoutCartConfigure $checkoutCartConfigure)
+    public function processAssert(CheckoutCart $checkoutCart, Cart $cart, CatalogProductView $catalogProductView)
     {
         $checkoutCart->open();
         $sourceProducts = $cart->getDataFieldConfig('items')['source'];
@@ -34,8 +34,8 @@ public function processAssert(CheckoutCart $checkoutCart, Cart $cart, CheckoutCa
             $product = $products[$key];
             $cartItem = $checkoutCart->getCartBlock()->getCartItem($product);
             $cartItem->edit();
-            $options = $checkoutCartConfigure->getBundleViewBlock()->getBundleBlock()->getOptions($product, true);
-            $this->checkOptions($product, $options, $item->getData()['options']);
+            $formOptions = $catalogProductView->getBundleViewBlock()->getBundleBlock()->getOptions($product);
+            $this->checkOptions($product, $formOptions, $item->getData()['options']);
         }
     }
 
@@ -83,7 +83,7 @@ private function checkOptions(BundleProduct $product, array $formOptions, array
     private function prepareBundleOptions(BundleProduct $product, array $cartItemOptions)
     {
         $bundleSelections = $product->getBundleSelections();
-        $bundleOptions = isset($bundleSelections['bundle_options']) ? $bundleSelections['bundle_options'] : [];
+        $bundleOptions = $bundleSelections['bundle_options'] ?? [];
         $result = [];
         foreach ($bundleOptions as $optionKey => $bundleOption) {
             $optionData = [
@@ -91,21 +91,17 @@ private function prepareBundleOptions(BundleProduct $product, array $cartItemOpt
                 'type' => $bundleOption['frontend_type'],
                 'is_require' => $bundleOption['required'],
             ];
-            $key = 0;
             foreach ($bundleOption['assigned_products'] as $productKey => $assignedProduct) {
-                if ($this->isInStock($product, $key++)) {
-                    $price = isset($assignedProduct['data']['selection_price_value'])
-                        ? $assignedProduct['data']['selection_price_value']
-                        : $bundleSelections['products'][$optionKey][$productKey]->getPrice();
-                    $title = $assignedProduct['search_data']['name'];
-                    $optionData['options'][$productKey] = [
-                        'title' => $title,
-                        'price' => number_format($price, 2),
-                    ];
-                    foreach ($cartItemOptions as $option) {
-                        if (strpos($option['value'], $title)) {
-                            $optionData['options'][$productKey]['selected'] = true;
-                        }
+                $price = $assignedProduct['data']['selection_price_value']
+                    ?? $bundleSelections['products'][$optionKey][$productKey]->getPrice();
+                $title = $assignedProduct['search_data']['name'];
+                $optionData['options'][$productKey] = [
+                    'title' => $title,
+                    'price' => number_format($price, 2),
+                ];
+                foreach ($cartItemOptions as $option) {
+                    if (strpos($option['value'], $title)) {
+                        $optionData['options'][$productKey]['selected'] = true;
                     }
                 }
             }
@@ -114,19 +110,4 @@ private function prepareBundleOptions(BundleProduct $product, array $cartItemOpt
 
         return $result;
     }
-
-    /**
-     * Check product is in stock.
-     *
-     * @param BundleProduct $product
-     * @param int $key
-     * @return bool
-     */
-    private function isInStock(BundleProduct $product, int $key)
-    {
-        $assignedProducts = $product->getBundleSelections()['products'][0];
-        $status = $assignedProducts[$key]->getData()['quantity_and_stock_status']['is_in_stock'];
-
-        return $status === 'In Stock';
-    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Page/Checkout/CheckoutCartConfigure.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Page/Checkout/CheckoutCartConfigure.xml
deleted file mode 100644
index c8e4699a91be9..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Page/Checkout/CheckoutCartConfigure.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
- -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
-    <page name="CheckoutCartConfigure" mca="checkout/cart/configure" module="Magento_Checkout">
-        <block name="viewBlock">
-            <render name="bundle" class="Magento\Bundle\Test\Block\Catalog\Product\View" />
-        </block>
-        <block name="bundleViewBlock" class="Magento\Bundle\Test\Block\Catalog\Product\View" locator="#maincontent" strategy="css selector" />
-    </page>
-</config>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutCartConfigure.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutCartConfigure.xml
deleted file mode 100644
index b7afe8b1860f8..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutCartConfigure.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
- -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
-    <page name="CheckoutCartConfigure" mca="checkout/cart/configure" module="Magento_Checkout">
-        <block name="viewBlock" class="Magento\Catalog\Test\Block\Product\View" locator="#maincontent" strategy="css selector" />
-        <block name="additionalInformationBlock" class="Magento\Catalog\Test\Block\Product\Additional" locator="#additional" strategy="css selector" />
-        <block name="customOptionsBlock" class="Magento\Catalog\Test\Block\Product\View\CustomOptions" locator="#product-options-wrapper" strategy="css selector" />
-        <block name="relatedProductBlock" class="Magento\Catalog\Test\Block\Product\ProductList\Related" locator=".block.related" strategy="css selector" />
-        <block name="upsellBlock" class="Magento\Catalog\Test\Block\Product\ProductList\Upsell" locator=".block.upsell" strategy="css selector" />
-        <block name="crosssellBlock" class="Magento\Catalog\Test\Block\Product\ProductList\Crosssell" locator=".block.crosssell" strategy="css selector" />
-        <block name="downloadableLinksBlock" class="Magento\Downloadable\Test\Block\Catalog\Product\View\Links" locator="[data-container-for=downloadable-links]" strategy="css selector" />
-        <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator=".page.messages" strategy="css selector" />
-        <block name="titleBlock" class="Magento\Theme\Test\Block\Html\Title" locator=".page-title-wrapper h1.page-title .base" strategy="css selector" />
-        <block name="widgetView" class="Magento\Widget\Test\Block\WidgetView" locator=".column.main .widget" strategy="css selector" />
-    </page>
-</config>

From 1c514217996c7165f9c93713c7ec5b42d1097c79 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Mon, 21 Aug 2017 13:09:17 +0300
Subject: [PATCH 22/85] MAGETWO-70540: Edit bundle product from shopping cart
 work unexpected

---
 .../Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
index 18ac354adbc8e..f1ab255013280 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
@@ -284,7 +284,7 @@ protected function getSelectOptionsData(SimpleElement $element, $firstOption = 1
     }
 
     /**
-     * Parse option text to title, price and optionally add selected attribute value.
+     * Parse option text to title and price
      *
      * @param string $optionText
      * @return array
@@ -294,12 +294,11 @@ protected function parseOptionText($optionText)
         preg_match('`^(.*?)\+ ?\$(\d.*?)$`sim', $optionText, $match);
         $optionPrice = isset($match[2]) ? str_replace(',', '', $match[2]) : 0;
         $optionTitle = isset($match[1]) ? trim($match[1]) : $optionText;
-        $option = [
+
+        return [
             'title' => $optionTitle,
             'price' => $optionPrice
         ];
-
-        return $option;
     }
 
     /**

From 083147c3af1c63d7045dc8ce7de49383cdee61d2 Mon Sep 17 00:00:00 2001
From: Tommy Wiebell <twiebell@magento.com>
Date: Mon, 21 Aug 2017 11:14:27 -0500
Subject: [PATCH 23/85] MAGETWO-71013: Export missing configurable variations
 when exporting more than one item

- Remove logic for dependent headers. Headers should be fixed.
- Pass clean collection to row customizers to resolve conflict with pagination.
- Remove unnecessary code in appendMultirowData method.
---
 .../Model/Export/Product.php                  | 46 +++++++++----------
 .../Model/Export/RowCustomizer.php            | 37 +++++++++------
 2 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
index 0cf2256d7342e..34bd8d9600410 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -153,7 +153,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
     /**
      * Items per page for collection limitation
      *
-     * @var null
+     * @var int|null
      */
     protected $_itemsPerPage = null;
 
@@ -161,6 +161,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * Header columns for export file
      *
      * @var array
+     * @deprecated
      */
     protected $_headerColumns = [];
 
@@ -234,17 +235,15 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
     protected $_fieldsMap = [
         'image' => 'base_image',
         'image_label' => "base_image_label",
-        'image' => 'base_image',
-        'image_label' => 'base_image_label',
         'thumbnail' => 'thumbnail_image',
         'thumbnail_label' => 'thumbnail_image_label',
         self::COL_MEDIA_IMAGE => 'additional_images',
         '_media_image_label' => 'additional_image_labels',
-        Product::COL_STORE => 'store_view_code',
-        Product::COL_ATTR_SET => 'attribute_set_code',
-        Product::COL_TYPE => 'product_type',
-        Product::COL_CATEGORY => 'categories',
-        Product::COL_PRODUCT_WEBSITES => 'product_websites',
+        self::COL_STORE => 'store_view_code',
+        self::COL_ATTR_SET => 'attribute_set_code',
+        self::COL_TYPE => 'product_type',
+        self::COL_CATEGORY => 'categories',
+        self::COL_PRODUCT_WEBSITES => 'product_websites',
         'status' => 'product_online',
         'news_from_date' => 'new_from_date',
         'news_to_date' => 'new_to_date',
@@ -691,7 +690,7 @@ protected function updateDataWithCategoryColumns(&$dataRow, &$rowCategories, $pr
      */
     public function _getHeaderColumns()
     {
-        return $this->_customHeadersMapping($this->_headerColumns);
+        return $this->_customHeadersMapping($this->rowCustomizer->addHeaderColumns($this->_headerColumns));
     }
 
     /**
@@ -700,13 +699,13 @@ public function _getHeaderColumns()
      * @param array $customOptionsData
      * @param array $stockItemRows
      * @return void
+     * @deprecated Logic will be moved to _getHeaderColumns in future release
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     protected function setHeaderColumns($customOptionsData, $stockItemRows)
     {
         if (!$this->_headerColumns) {
-            $customOptCols = [
-                'custom_options',
-            ];
             $this->_headerColumns = array_merge(
                 [
                     self::COL_SKU,
@@ -719,21 +718,19 @@ protected function setHeaderColumns($customOptionsData, $stockItemRows)
                 $this->_getExportMainAttrCodes(),
                 [self::COL_ADDITIONAL_ATTRIBUTES],
                 reset($stockItemRows) ? array_keys(end($stockItemRows)) : [],
-                [],
                 [
                     'related_skus',
                     'related_position',
                     'crosssell_skus',
                     'crosssell_position',
                     'upsell_skus',
-                    'upsell_position'
-                ],
-                ['additional_images', 'additional_image_labels', 'hide_from_product_page']
+                    'upsell_position',
+                    'additional_images',
+                    'additional_image_labels',
+                    'hide_from_product_page',
+                    'custom_options'
+                ]
             );
-            // have we merge custom options columns
-            if ($customOptionsData) {
-                $this->_headerColumns = array_merge($this->_headerColumns, $customOptCols);
-            }
         }
     }
 
@@ -892,10 +889,12 @@ protected function getExportData()
             $productIds = array_keys($rawData);
             $stockItemRows = $this->prepareCatalogInventory($productIds);
 
-            $this->rowCustomizer->prepareData($this->_getEntityCollection(), $productIds);
+            $this->rowCustomizer->prepareData(
+                $this->_prepareEntityCollection($this->_entityCollectionFactory->create()),
+                $productIds
+            );
 
             $this->setHeaderColumns($multirawData['customOptionsData'], $stockItemRows);
-            $this->_headerColumns = $this->rowCustomizer->addHeaderColumns($this->_headerColumns);
 
             foreach ($rawData as $productId => $productData) {
                 foreach ($productData as $storeId => $dataRow) {
@@ -1231,9 +1230,6 @@ private function appendMultirowData(&$dataRow, &$multiRawData)
             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])) {
-                $dataRow[self::COL_VISIBILITY] = $productData[Store::DEFAULT_STORE_ID][self::COL_VISIBILITY];
-            }
         }
         $dataRow[self::COL_SKU] = $sku;
         return $dataRow;
diff --git a/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php b/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php
index 322d272599b06..58462b873d8b1 100644
--- a/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php
+++ b/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php
@@ -13,11 +13,29 @@
 
 class RowCustomizer implements RowCustomizerInterface
 {
+    /**
+     * Header column for Configurable Product variations
+     */
+    const CONFIGURABLE_VARIATIONS_COLUMN = 'configurable_variations';
+
+    /**
+     * Header column for Configurable Product variation labels
+     */
+    const CONFIGURABLE_VARIATIONS_LABELS_COLUMN = 'configurable_variation_labels';
+
     /**
      * @var array
      */
     protected $configurableData = [];
 
+    /**
+     * @var string[]
+     */
+    private $configurableColumns = [
+        self::CONFIGURABLE_VARIATIONS_COLUMN,
+        self::CONFIGURABLE_VARIATIONS_LABELS_COLUMN
+    ];
+
     /**
      * Prepare configurable data for export
      *
@@ -54,8 +72,11 @@ public function prepareData($collection, $productIds)
             }
 
             $this->configurableData[$product->getId()] = [
-                'configurable_variations' => implode(ImportProduct::PSEUDO_MULTI_LINE_SEPARATOR, $variations),
-                'configurable_variation_labels' => implode(
+                self::CONFIGURABLE_VARIATIONS_COLUMN => implode(
+                    ImportProduct::PSEUDO_MULTI_LINE_SEPARATOR,
+                    $variations
+                ),
+                self::CONFIGURABLE_VARIATIONS_LABELS_COLUMN => implode(
                     Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR,
                     $variationsLabels
                 )
@@ -71,17 +92,7 @@ public function prepareData($collection, $productIds)
      */
     public function addHeaderColumns($columns)
     {
-        // have we merge configurable products data
-        if (!empty($this->configurableData)) {
-            $columns = array_merge(
-                $columns,
-                [
-                    'configurable_variations',
-                    'configurable_variation_labels',
-                ]
-            );
-        }
-        return $columns;
+        return array_merge($columns, $this->configurableColumns);
     }
 
     /**

From 9d563cb37a4dbb8a747088de567c472880cad6d1 Mon Sep 17 00:00:00 2001
From: Tommy Wiebell <twiebell@magento.com>
Date: Mon, 21 Aug 2017 17:17:22 -0500
Subject: [PATCH 24/85] MAGETWO-71013: Export missing configurable variations
 when exporting more than one item

- Fix unit test
---
 .../Test/Unit/Model/Export/ProductTest.php                | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Export/ProductTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Export/ProductTest.php
index 859b61e9b4f5b..a02ea21d51232 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Export/ProductTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Export/ProductTest.php
@@ -270,11 +270,15 @@ public function testGetHeaderColumns()
         $headerColumnsValue = ['headerColumns value'];
         $expectedResult = 'result';
         $this->setPropertyValue($product, '_headerColumns', $headerColumnsValue);
-        $product
-            ->expects($this->once())
+        $this->setPropertyValue($product, 'rowCustomizer', $this->rowCustomizer);
+        $product->expects($this->once())
             ->method('_customHeadersMapping')
             ->with($headerColumnsValue)
             ->willReturn($expectedResult);
+        $this->rowCustomizer->expects($this->once())
+            ->method('addHeaderColumns')
+            ->with($headerColumnsValue)
+            ->willReturn($headerColumnsValue);
 
         $result = $product->_getHeaderColumns();
 

From 427c2c3d5a48d97595dd9d625208abc9e1fdf045 Mon Sep 17 00:00:00 2001
From: Michael Yu <hyu@magento.com>
Date: Mon, 21 Aug 2017 17:51:44 -0500
Subject: [PATCH 25/85] MAGETWO-71415 [The system grids] Mass actions process
 only 20 elements from all selected - Allow more than 20 elements to be
 updated at once.

---
 .../Adminhtml/Index/AbstractMassAction.php    |  2 +-
 .../Ui/Component/MassAction/Filter.php        | 24 ++++++++++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php
index ebab2a42a02ec..3263f1e799029 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php
@@ -61,7 +61,7 @@ public function __construct(Context $context, Filter $filter, CollectionFactory
     public function execute()
     {
         try {
-            $collection = $this->filter->getCollection($this->collectionFactory->create());
+            $collection = $this->filter->getCollection($this->collectionFactory->create(), false);
             return $this->massAction($collection);
         } catch (\Exception $e) {
             $this->messageManager->addError($e->getMessage());
diff --git a/app/code/Magento/Ui/Component/MassAction/Filter.php b/app/code/Magento/Ui/Component/MassAction/Filter.php
index f2f25bb2f95f7..f340129905a28 100644
--- a/app/code/Magento/Ui/Component/MassAction/Filter.php
+++ b/app/code/Magento/Ui/Component/MassAction/Filter.php
@@ -82,10 +82,11 @@ public function getComponent()
      * Adds filters to collection using DataProvider filter results
      *
      * @param AbstractDb $collection
+     * @param bool $limit for limiting maximum amount of query results
      * @return AbstractDb
      * @throws LocalizedException
      */
-    public function getCollection(AbstractDb $collection)
+    public function getCollection(AbstractDb $collection, $limit = true)
     {
         $selected = $this->request->getParam(static::SELECTED_PARAM);
         $excluded = $this->request->getParam(static::EXCLUDED_PARAM);
@@ -99,7 +100,7 @@ public function getCollection(AbstractDb $collection)
             }
         }
         /** @var \Magento\Customer\Model\ResourceModel\Customer\Collection $collection */
-        $idsArray = $this->getFilterIds();
+        $idsArray = $this->getFilterIds($limit);
         if (!empty($idsArray)) {
             $collection->addFieldToFilter(
                 $collection->getIdFieldName(),
@@ -212,22 +213,27 @@ private function getDataProvider()
 
     /**
      * Get filter ids as array
-     *
+     * @param bool $limit
      * @return int[]
      */
-    private function getFilterIds()
+    private function getFilterIds($limit = true)
     {
         $idsArray = [];
         $this->applySelectionOnTargetProvider();
         if ($this->getDataProvider() instanceof \Magento\Ui\DataProvider\AbstractDataProvider) {
             // Use collection's getAllIds for optimization purposes.
             $idsArray = $this->getDataProvider()->getAllIds();
-        } else {
+        }else {
             $searchResult = $this->getDataProvider()->getSearchResult();
-            // Use compatible search api getItems when searchResult is not a collection.
-            foreach ($searchResult->getItems() as $item) {
-                /** @var $item \Magento\Framework\Api\Search\DocumentInterface */
-                $idsArray[] = $item->getId();
+            if($limit){
+                // Use compatible search api getItems when searchResult is not a collection.
+                foreach ($searchResult->getItems() as $item) {
+                    /** @var $item \Magento\Framework\Api\Search\DocumentInterface */
+                    $idsArray[] = $item->getId();
+                }
+            }else{
+                //Grab all selected even if they are not on the current page.
+                $idsArray = $searchResult->getAllIds();
             }
         }
         return  $idsArray;

From db7ceef70c6b11889f0558b6958187a279199888 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Tue, 22 Aug 2017 13:44:42 +0300
Subject: [PATCH 26/85] MAGETWO-67092: Table salesrule_product_attribute is not
 populated when upgrading to 2.2

---
 app/code/Magento/SalesRule/Setup/UpgradeData.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/SalesRule/Setup/UpgradeData.php b/app/code/Magento/SalesRule/Setup/UpgradeData.php
index 4f1ce0db4cd7b..9a34d85bba995 100644
--- a/app/code/Magento/SalesRule/Setup/UpgradeData.php
+++ b/app/code/Magento/SalesRule/Setup/UpgradeData.php
@@ -77,7 +77,7 @@ public function __construct(
      * @inheritdoc
      */
     public function upgrade(
-        \Magento\Framework\Setup\ModuleDataSetupInterface $setup, 
+        \Magento\Framework\Setup\ModuleDataSetupInterface $setup,
         \Magento\Framework\Setup\ModuleContextInterface $context
     ) {
         $setup->startSetup();

From 4047ddf2e3a39409aa76832d71d8a9aeb4e81eb9 Mon Sep 17 00:00:00 2001
From: Maksim_Stsepantsevich <Maksim_Stsepantsevich@epam.com>
Date: Tue, 22 Aug 2017 14:32:39 +0300
Subject: [PATCH 27/85] MAGETWO-71639: Parent ID is hardcoded as "1" in the
 \Magento\Setup\Fixtures\AdminUsersFixture

---
 .../Setup/Fixtures/AdminUsersFixture.php      | 88 ++++++++++++++-----
 1 file changed, 64 insertions(+), 24 deletions(-)

diff --git a/setup/src/Magento/Setup/Fixtures/AdminUsersFixture.php b/setup/src/Magento/Setup/Fixtures/AdminUsersFixture.php
index 1ebaef4d17773..836a2aab18b18 100644
--- a/setup/src/Magento/Setup/Fixtures/AdminUsersFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/AdminUsersFixture.php
@@ -6,6 +6,14 @@
 
 namespace Magento\Setup\Fixtures;
 
+use Magento\Authorization\Model\Acl\Role\Group;
+use Magento\Authorization\Model\RoleFactory;
+use Magento\Authorization\Model\RulesFactory;
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Framework\Acl\RootResource;
+use Magento\User\Model\ResourceModel\User\CollectionFactory as UserCollectionFactory;
+use Magento\User\Model\UserFactory;
+
 /**
  * Generate admin users
  *
@@ -21,36 +29,52 @@ class AdminUsersFixture extends Fixture
     protected $priority = 5;
 
     /**
-     * @var \Magento\User\Model\UserFactory
+     * @var UserFactory
      */
     private $userFactory;
 
     /**
-     * @var \Magento\Authorization\Model\RoleFactory
+     * @var RoleFactory
      */
     private $roleFactory;
 
     /**
-     * @var \Magento\User\Model\ResourceModel\User\CollectionFactory
+     * @var UserCollectionFactory
      */
     private $userCollectionFactory;
 
     /**
-     * @param \Magento\User\Model\UserFactory $userFactory
-     * @param \Magento\User\Model\ResourceModel\User\CollectionFactory $userCollectionFactory
-     * @param \Magento\Authorization\Model\RoleFactory $roleFactory
+     * @var RulesFactory
+     */
+    private $rulesFactory;
+
+    /**
+     * @var RootResource
+     */
+    private $rootResource;
+
+    /**
      * @param FixtureModel $fixtureModel
+     * @param UserFactory $userFactory
+     * @param UserCollectionFactory $userCollectionFactory
+     * @param RoleFactory $roleFactory
+     * @param RulesFactory $rulesFactory
+     * @param RootResource $rootResource
      */
     public function __construct(
-        \Magento\User\Model\UserFactory $userFactory,
-        \Magento\User\Model\ResourceModel\User\CollectionFactory $userCollectionFactory,
-        \Magento\Authorization\Model\RoleFactory $roleFactory,
-        FixtureModel $fixtureModel
+        FixtureModel $fixtureModel,
+        UserFactory $userFactory,
+        UserCollectionFactory $userCollectionFactory,
+        RoleFactory $roleFactory,
+        RulesFactory $rulesFactory,
+        RootResource $rootResource
     ) {
         parent::__construct($fixtureModel);
         $this->userFactory = $userFactory;
         $this->roleFactory = $roleFactory;
         $this->userCollectionFactory = $userCollectionFactory;
+        $this->rulesFactory = $rulesFactory;
+        $this->rootResource = $rootResource;
     }
 
     /**
@@ -65,12 +89,11 @@ public function execute()
             return;
         }
 
-        $defaultAdminUser = $this->userFactory->create()->loadByUsername('admin');
-        $defaultAdminRole = $this->roleFactory->create()->load($defaultAdminUser->getAclRole());
+        $role = $this->createAdministratorRole();
 
         for ($i = $adminUsersStartIndex; $i <= $adminUsersNumber; $i++) {
             $adminUser = $this->userFactory->create();
-            $adminUser
+            $adminUser->setRoleId($role->getId())
                 ->setEmail('admin' . $i . '@example.com')
                 ->setFirstName('Firstname')
                 ->setLastName('Lastname')
@@ -78,17 +101,6 @@ public function execute()
                 ->setPassword('123123q')
                 ->setIsActive(1);
             $adminUser->save();
-
-            $role = $this->roleFactory->create();
-            $role
-                ->setUserId($adminUser->getId())
-                ->setRoleName('admin')
-                ->setRoleType($defaultAdminRole->getRoleType())
-                ->setUserType($defaultAdminRole->getUserType())
-                ->setTreeLevel($defaultAdminRole->getTreeLevel())
-                ->setSortOrder($defaultAdminRole->getSortOrder())
-                ->setParentId(1);
-            $role->save();
         }
     }
 
@@ -109,4 +121,32 @@ public function introduceParamLabels()
             'admin_users' => 'Admin Users'
         ];
     }
+
+    /**
+     * Create administrator role with all privileges.
+     *
+     * @return \Magento\Authorization\Model\Role
+     */
+    private function createAdministratorRole()
+    {
+        $role = $this->roleFactory->create();
+        $role->setParentId(0)
+            ->setTreeLevel(1)
+            ->setSortOrder(1)
+            ->setRoleType(Group::ROLE_TYPE)
+            ->setUserId(0)
+            ->setUserType(UserContextInterface::USER_TYPE_ADMIN)
+            ->setRoleName('Example Administrator');
+        $role->save();
+
+        /** @var \Magento\Authorization\Model\Rules $rule */
+        $rule = $this->rulesFactory->create();
+        $rule->setRoleId($role->getId())
+            ->setResourceId($this->rootResource->getId())
+            ->setPrivilegies(null)
+            ->setPermission('allow');
+        $rule->save();
+
+        return $role;
+    }
 }

From c8808afe2eb5e6a29f6cd2c8c31a9a408159b3c7 Mon Sep 17 00:00:00 2001
From: Michael Yu <hyu@magento.com>
Date: Tue, 22 Aug 2017 10:06:41 -0500
Subject: [PATCH 28/85] MAGETWO-71415 [The system grids] Mass actions process
 only 20 elements from all selected - Add integration test for mass assign
 group for 21 customers - Add 21 customers fixture - Fix filter code style

---
 .../Ui/Component/MassAction/Filter.php        |   6 +-
 .../Adminhtml/Index/MassAssignGroupTest.php   |  27 ++
 .../Customer/_files/twenty_one_customers.php  | 427 ++++++++++++++++++
 3 files changed, 457 insertions(+), 3 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/_files/twenty_one_customers.php

diff --git a/app/code/Magento/Ui/Component/MassAction/Filter.php b/app/code/Magento/Ui/Component/MassAction/Filter.php
index f340129905a28..a3ae32c6840d0 100644
--- a/app/code/Magento/Ui/Component/MassAction/Filter.php
+++ b/app/code/Magento/Ui/Component/MassAction/Filter.php
@@ -223,15 +223,15 @@ private function getFilterIds($limit = true)
         if ($this->getDataProvider() instanceof \Magento\Ui\DataProvider\AbstractDataProvider) {
             // Use collection's getAllIds for optimization purposes.
             $idsArray = $this->getDataProvider()->getAllIds();
-        }else {
+        } else {
             $searchResult = $this->getDataProvider()->getSearchResult();
-            if($limit){
+            if ($limit) {
                 // Use compatible search api getItems when searchResult is not a collection.
                 foreach ($searchResult->getItems() as $item) {
                     /** @var $item \Magento\Framework\Api\Search\DocumentInterface */
                     $idsArray[] = $item->getId();
                 }
-            }else{
+            } else {
                 //Grab all selected even if they are not on the current page.
                 $idsArray = $searchResult->getAllIds();
             }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php
index cb4aa686b6682..acfc5c620a70f 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php
@@ -69,6 +69,33 @@ public function testMassAssignGroupAction()
         $this->assertEquals(0, $customer->getGroupId());
     }
 
+    /**
+     * @magentoDataFixture Magento/Customer/_files/twenty_one_customers.php
+     */
+    public function testLargeGroupMassAssignGroupAction()
+    {
+
+        for($i = 1; $i < 22; $i++){
+            $customer = $this->customerRepository->getById($i);
+            $this->assertEquals(1, $customer->getGroupId());
+        }
+
+        $this->getRequest()
+            ->setParam('group', 0)
+            ->setPostValue('namespace', 'customer_listing')
+            ->setPostValue('selected', [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21]);
+        $this->dispatch('backend/customer/index/massAssignGroup');
+        $this->assertSessionMessages(
+            $this->equalTo(['A total of 21 record(s) were updated.']),
+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+        );
+        $this->assertRedirect($this->stringStartsWith($this->baseControllerUrl));
+        for($i = 1; $i < 22; $i++){
+            $customer = $this->customerRepository->getById($i);
+            $this->assertEquals(0, $customer->getGroupId());
+        }
+    }
+
     /**
      * Valid group Id but no customer Ids specified
      * @magentoDbIsolation enabled
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/twenty_one_customers.php b/dev/tests/integration/testsuite/Magento/Customer/_files/twenty_one_customers.php
new file mode 100644
index 0000000000000..205fc7fe12ddd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/twenty_one_customers.php
@@ -0,0 +1,427 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Customer::class
+);
+/** @var Magento\Customer\Model\Customer $customer */
+$customer->setWebsiteId(1)
+    ->setId(1)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(1)
+    ->setEmail('customer@search.example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Firstname')
+    ->setLastname('Lastname')
+    ->setDefaultBilling(1)
+    ->setDefaultShipping(1)
+    ->setCreatedAt('2014-02-28 15:52:26');
+$customer->isObjectNew(true);
+
+$customer->save();
+$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Customer::class
+);
+$customer->setWebsiteId(1)
+    ->setEntityId(2)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('customer2@search.example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Firstname2')
+    ->setLastname('Lastname2')
+    ->setDefaultBilling(2)
+    ->setDefaultShipping(2)
+    ->setCreatedAt('2010-02-28 15:52:26');
+$customer->isObjectNew(true);
+$customer->save();
+
+$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Customer::class
+);
+$customer->setWebsiteId(1)
+    ->setEntityId(3)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('customer3@search.example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Firstname3')
+    ->setLastname('Lastname3')
+    ->setDefaultBilling(3)
+    ->setDefaultShipping(3)
+    ->setCreatedAt('2012-02-28 15:52:26');
+$customer->isObjectNew(true);
+$customer->save();
+
+$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Customer::class
+);
+/** @var Magento\Customer\Model\Customer $customer */
+$customer->setWebsiteId(1)
+    ->setId(4)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(1)
+    ->setEmail('customer4@search.example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Firstname4')
+    ->setLastname('Lastname4')
+    ->setDefaultBilling(4)
+    ->setDefaultShipping(4)
+    ->setCreatedAt('2014-02-28 15:52:26');
+$customer->isObjectNew(true);
+
+$customer->save();
+$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Customer::class
+);
+$customer->setWebsiteId(1)
+    ->setEntityId(5)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('customer5@search.example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Firstname5')
+    ->setLastname('Lastname5')
+    ->setDefaultBilling(5)
+    ->setDefaultShipping(5)
+    ->setCreatedAt('2010-02-28 15:52:26');
+$customer->isObjectNew(true);
+$customer->save();
+
+$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Customer::class
+);
+$customer->setWebsiteId(1)
+    ->setEntityId(6)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('customer6@search.example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Firstname6')
+    ->setLastname('Lastname6')
+    ->setDefaultBilling(6)
+    ->setDefaultShipping(6)
+    ->setCreatedAt('2012-02-28 15:52:26');
+$customer->isObjectNew(true);
+$customer->save();
+
+$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Customer::class
+);
+$customer->setWebsiteId(1)
+    ->setEntityId(7)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('customer7@search.example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Firstname7')
+    ->setLastname('Lastname7')
+    ->setDefaultBilling(7)
+    ->setDefaultShipping(7)
+    ->setCreatedAt('2012-02-28 15:52:26');
+$customer->isObjectNew(true);
+$customer->save();
+
+$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Customer::class
+);
+$customer->setWebsiteId(1)
+    ->setEntityId(8)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('customer8@search.example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Firstname8')
+    ->setLastname('Lastname8')
+    ->setDefaultBilling(8)
+    ->setDefaultShipping(8)
+    ->setCreatedAt('2012-02-28 15:52:26');
+$customer->isObjectNew(true);
+$customer->save();
+
+$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Customer::class
+);
+$customer->setWebsiteId(1)
+    ->setEntityId(9)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('customer9@search.example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Firstname9')
+    ->setLastname('Lastname9')
+    ->setDefaultBilling(9)
+    ->setDefaultShipping(9)
+    ->setCreatedAt('2012-02-28 15:52:26');
+$customer->isObjectNew(true);
+$customer->save();
+
+$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Customer::class
+);
+$customer->setWebsiteId(1)
+    ->setEntityId(10)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('customer10@search.example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Firstname10')
+    ->setLastname('Lastname10')
+    ->setDefaultBilling(10)
+    ->setDefaultShipping(10)
+    ->setCreatedAt('2012-02-28 15:52:26');
+$customer->isObjectNew(true);
+$customer->save();
+
+$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Customer::class
+);
+$customer->setWebsiteId(1)
+    ->setEntityId(11)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('customer11@search.example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Firstname11')
+    ->setLastname('Lastname11')
+    ->setDefaultBilling(11)
+    ->setDefaultShipping(11)
+    ->setCreatedAt('2012-02-28 15:52:26');
+$customer->isObjectNew(true);
+$customer->save();
+
+$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Customer::class
+);
+$customer->setWebsiteId(1)
+    ->setEntityId(12)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('customer12@search.example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Firstname12')
+    ->setLastname('Lastname12')
+    ->setDefaultBilling(12)
+    ->setDefaultShipping(12)
+    ->setCreatedAt('2012-02-28 15:52:26');
+$customer->isObjectNew(true);
+$customer->save();
+
+$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Customer::class
+);
+$customer->setWebsiteId(1)
+    ->setEntityId(13)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('customer13@search.example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Firstname13')
+    ->setLastname('Lastname13')
+    ->setDefaultBilling(13)
+    ->setDefaultShipping(13)
+    ->setCreatedAt('2012-02-28 15:52:26');
+$customer->isObjectNew(true);
+$customer->save();
+
+$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Customer::class
+);
+$customer->setWebsiteId(1)
+    ->setEntityId(14)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('customer14@search.example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Firstname14')
+    ->setLastname('Lastname14')
+    ->setDefaultBilling(14)
+    ->setDefaultShipping(14)
+    ->setCreatedAt('2012-02-28 15:52:26');
+$customer->isObjectNew(true);
+$customer->save();
+
+$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Customer::class
+);
+$customer->setWebsiteId(1)
+    ->setEntityId(15)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('customer15@search.example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Firstname15')
+    ->setLastname('Lastname15')
+    ->setDefaultBilling(15)
+    ->setDefaultShipping(15)
+    ->setCreatedAt('2012-02-28 15:52:26');
+$customer->isObjectNew(true);
+$customer->save();
+
+$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Customer::class
+);
+$customer->setWebsiteId(1)
+    ->setEntityId(16)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('customer16@search.example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Firstname16')
+    ->setLastname('Lastname16')
+    ->setDefaultBilling(16)
+    ->setDefaultShipping(16)
+    ->setCreatedAt('2012-02-28 15:52:26');
+$customer->isObjectNew(true);
+$customer->save();
+
+$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Customer::class
+);
+$customer->setWebsiteId(1)
+    ->setEntityId(17)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('customer17@search.example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Firstname17')
+    ->setLastname('Lastname17')
+    ->setDefaultBilling(17)
+    ->setDefaultShipping(17)
+    ->setCreatedAt('2012-02-28 15:52:26');
+$customer->isObjectNew(true);
+$customer->save();
+
+$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Customer::class
+);
+$customer->setWebsiteId(1)
+    ->setEntityId(18)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('customer18@search.example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Firstname18')
+    ->setLastname('Lastname18')
+    ->setDefaultBilling(18)
+    ->setDefaultShipping(18)
+    ->setCreatedAt('2012-02-28 15:52:26');
+$customer->isObjectNew(true);
+$customer->save();
+
+$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Customer::class
+);
+$customer->setWebsiteId(1)
+    ->setEntityId(19)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('customer19@search.example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Firstname19')
+    ->setLastname('Lastname19')
+    ->setDefaultBilling(19)
+    ->setDefaultShipping(19)
+    ->setCreatedAt('2012-02-28 15:52:26');
+$customer->isObjectNew(true);
+$customer->save();
+
+$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Customer::class
+);
+$customer->setWebsiteId(1)
+    ->setEntityId(20)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('customer20@search.example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Firstname20')
+    ->setLastname('Lastname20')
+    ->setDefaultBilling(20)
+    ->setDefaultShipping(20)
+    ->setCreatedAt('2012-02-28 15:52:26');
+$customer->isObjectNew(true);
+$customer->save();
+
+$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Customer::class
+);
+$customer->setWebsiteId(1)
+    ->setEntityId(21)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('customer21@search.example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Firstname21')
+    ->setLastname('Lastname21')
+    ->setDefaultBilling(21)
+    ->setDefaultShipping(21)
+    ->setCreatedAt('2012-02-28 15:52:26');
+$customer->isObjectNew(true);
+$customer->save();
+

From 0bca27c7071f7833d0e6bfb84adabcd83ddc8e7f Mon Sep 17 00:00:00 2001
From: Michael Yu <hyu@magento.com>
Date: Tue, 22 Aug 2017 10:24:57 -0500
Subject: [PATCH 29/85] MAGETWO-71415 [The system grids] Mass actions process
 only 20 elements from all selected - Fix integration test code style

---
 .../Controller/Adminhtml/Index/MassAssignGroupTest.php        | 4 ++--
 .../Magento/Customer/_files/twenty_one_customers.php          | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php
index acfc5c620a70f..b2ecd5bf7c3a2 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php
@@ -75,7 +75,7 @@ public function testMassAssignGroupAction()
     public function testLargeGroupMassAssignGroupAction()
     {
 
-        for($i = 1; $i < 22; $i++){
+        for ($i = 1; $i < 22; $i++) {
             $customer = $this->customerRepository->getById($i);
             $this->assertEquals(1, $customer->getGroupId());
         }
@@ -90,7 +90,7 @@ public function testLargeGroupMassAssignGroupAction()
             \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
         );
         $this->assertRedirect($this->stringStartsWith($this->baseControllerUrl));
-        for($i = 1; $i < 22; $i++){
+        for ($i = 1; $i < 22; $i++) {
             $customer = $this->customerRepository->getById($i);
             $this->assertEquals(0, $customer->getGroupId());
         }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/twenty_one_customers.php b/dev/tests/integration/testsuite/Magento/Customer/_files/twenty_one_customers.php
index 205fc7fe12ddd..f430714627f3a 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/_files/twenty_one_customers.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/twenty_one_customers.php
@@ -424,4 +424,3 @@
     ->setCreatedAt('2012-02-28 15:52:26');
 $customer->isObjectNew(true);
 $customer->save();
-

From 9f71bed5e1d8bfe80259223b75d92ba1e3596f5c Mon Sep 17 00:00:00 2001
From: Maksym Aposov <maxim.aposov@gmail.com>
Date: Wed, 23 Aug 2017 17:47:44 +0300
Subject: [PATCH 30/85] Static versioning and styles minification break email
 fonts styles #8241  - update pelago/emogrifier version to the latest

---
 composer.json |   2 +-
 composer.lock | 251 +++++++++++++++++++++++++-------------------------
 2 files changed, 129 insertions(+), 124 deletions(-)

diff --git a/composer.json b/composer.json
index 304a96e0d407c..e8c5826a812f5 100644
--- a/composer.json
+++ b/composer.json
@@ -43,7 +43,7 @@
         "composer/composer": "1.4.1",
         "monolog/monolog": "^1.17",
         "oyejorge/less.php": "~1.7.0",
-        "pelago/emogrifier": "0.1.1",
+        "pelago/emogrifier": "1.2.0",
         "tubalmartin/cssmin": "4.1.0",
         "magento/magento-composer-installer": ">=0.1.11",
         "braintree/braintree_php": "3.22.0",
diff --git a/composer.lock b/composer.lock
index 6901e4d3dae83..c2d91b17dca5a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "0eca7aabf215b503b570a389ff88760a",
+    "hash": "5f3cbfc1ff8c3e3a1418471fa100cb80",
+    "content-hash": "7e681a30116d5e52084eba552595936e",
     "packages": [
         {
             "name": "braintree/braintree_php",
@@ -51,7 +52,7 @@
                 }
             ],
             "description": "Braintree PHP Client Library",
-            "time": "2017-02-16T19:59:04+00:00"
+            "time": "2017-02-16 19:59:04"
         },
         {
             "name": "colinmollenhour/cache-backend-file",
@@ -87,7 +88,7 @@
             ],
             "description": "The stock Zend_Cache_Backend_File backend has extremely poor performance for cleaning by tags making it become unusable as the number of cached items increases. This backend makes many changes resulting in a huge performance boost, especially for tag cleaning.",
             "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_File",
-            "time": "2016-05-02T16:24:47+00:00"
+            "time": "2016-05-02 16:24:47"
         },
         {
             "name": "colinmollenhour/cache-backend-redis",
@@ -123,7 +124,7 @@
             ],
             "description": "Zend_Cache backend using Redis with full support for tags.",
             "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis",
-            "time": "2017-03-25T04:54:24+00:00"
+            "time": "2017-03-25 04:54:24"
         },
         {
             "name": "colinmollenhour/credis",
@@ -162,7 +163,7 @@
             ],
             "description": "Credis is a lightweight interface to the Redis key-value store which wraps the phpredis library when available for better performance.",
             "homepage": "https://github.com/colinmollenhour/credis",
-            "time": "2015-11-28T01:20:04+00:00"
+            "time": "2015-11-28 01:20:04"
         },
         {
             "name": "colinmollenhour/php-redis-session-abstract",
@@ -199,7 +200,7 @@
             ],
             "description": "A Redis-based session handler with optimistic locking",
             "homepage": "https://github.com/colinmollenhour/php-redis-session-abstract",
-            "time": "2017-04-19T14:21:43+00:00"
+            "time": "2017-04-19 14:21:43"
         },
         {
             "name": "composer/ca-bundle",
@@ -258,7 +259,7 @@
                 "ssl",
                 "tls"
             ],
-            "time": "2017-03-06T11:59:08+00:00"
+            "time": "2017-03-06 11:59:08"
         },
         {
             "name": "composer/composer",
@@ -335,7 +336,7 @@
                 "dependency",
                 "package"
             ],
-            "time": "2017-03-10T08:29:45+00:00"
+            "time": "2017-03-10 08:29:45"
         },
         {
             "name": "composer/semver",
@@ -397,7 +398,7 @@
                 "validation",
                 "versioning"
             ],
-            "time": "2016-08-30T16:08:34+00:00"
+            "time": "2016-08-30 16:08:34"
         },
         {
             "name": "composer/spdx-licenses",
@@ -458,7 +459,7 @@
                 "spdx",
                 "validator"
             ],
-            "time": "2017-04-03T19:08:52+00:00"
+            "time": "2017-04-03 19:08:52"
         },
         {
             "name": "container-interop/container-interop",
@@ -489,7 +490,7 @@
             ],
             "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
             "homepage": "https://github.com/container-interop/container-interop",
-            "time": "2017-02-14T19:40:03+00:00"
+            "time": "2017-02-14 19:40:03"
         },
         {
             "name": "justinrainbow/json-schema",
@@ -556,7 +557,7 @@
                 "json",
                 "schema"
             ],
-            "time": "2017-05-16T21:06:09+00:00"
+            "time": "2017-05-16 21:06:09"
         },
         {
             "name": "league/climate",
@@ -605,7 +606,7 @@
                 "php",
                 "terminal"
             ],
-            "time": "2015-01-18T14:31:58+00:00"
+            "time": "2015-01-18 14:31:58"
         },
         {
             "name": "magento/composer",
@@ -641,7 +642,7 @@
                 "AFL-3.0"
             ],
             "description": "Magento composer library helps to instantiate Composer application and run composer commands.",
-            "time": "2017-04-24T09:57:02+00:00"
+            "time": "2017-04-24 09:57:02"
         },
         {
             "name": "magento/magento-composer-installer",
@@ -720,7 +721,7 @@
                 "composer-installer",
                 "magento"
             ],
-            "time": "2016-10-06T16:05:07+00:00"
+            "time": "2016-10-06 16:05:07"
         },
         {
             "name": "magento/zendframework1",
@@ -767,7 +768,7 @@
                 "ZF1",
                 "framework"
             ],
-            "time": "2017-06-21T14:56:23+00:00"
+            "time": "2017-06-21 14:56:23"
         },
         {
             "name": "monolog/monolog",
@@ -845,7 +846,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2017-06-19T01:22:40+00:00"
+            "time": "2017-06-19 01:22:40"
         },
         {
             "name": "oyejorge/less.php",
@@ -907,7 +908,7 @@
                 "php",
                 "stylesheet"
             ],
-            "time": "2017-03-28T22:19:25+00:00"
+            "time": "2017-03-28 22:19:25"
         },
         {
             "name": "paragonie/random_compat",
@@ -955,31 +956,35 @@
                 "pseudorandom",
                 "random"
             ],
-            "time": "2017-03-13T16:27:32+00:00"
+            "time": "2017-03-13 16:27:32"
         },
         {
             "name": "pelago/emogrifier",
-            "version": "v0.1.1",
+            "version": "V1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jjriv/emogrifier.git",
-                "reference": "ed72bcd6a3c7014862ff86d026193667a172fedf"
+                "reference": "a1db453bb504597d821efcc04b21c79a6021e00c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jjriv/emogrifier/zipball/ed72bcd6a3c7014862ff86d026193667a172fedf",
-                "reference": "ed72bcd6a3c7014862ff86d026193667a172fedf",
+                "url": "https://api.github.com/repos/jjriv/emogrifier/zipball/a1db453bb504597d821efcc04b21c79a6021e00c",
+                "reference": "a1db453bb504597d821efcc04b21c79a6021e00c",
                 "shasum": ""
             },
             "require": {
-                "ext-mbstring": "*",
-                "php": ">=5.4.0"
+                "php": ">=5.4.0,<=7.1.99"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.6.0",
-                "squizlabs/php_codesniffer": "~2.3.0"
+                "phpunit/phpunit": "4.8.27",
+                "squizlabs/php_codesniffer": "2.6.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Pelago\\": "Classes/"
@@ -1011,7 +1016,7 @@
             ],
             "description": "Converts CSS styles into inline style attributes in your HTML code",
             "homepage": "http://www.pelagodesign.com/sidecar/emogrifier/",
-            "time": "2015-05-15T11:37:51+00:00"
+            "time": "2017-03-02 12:51:48"
         },
         {
             "name": "phpseclib/phpseclib",
@@ -1103,7 +1108,7 @@
                 "x.509",
                 "x509"
             ],
-            "time": "2017-06-05T06:31:10+00:00"
+            "time": "2017-06-05 06:31:10"
         },
         {
             "name": "psr/container",
@@ -1152,7 +1157,7 @@
                 "container-interop",
                 "psr"
             ],
-            "time": "2017-02-14T16:28:37+00:00"
+            "time": "2017-02-14 16:28:37"
         },
         {
             "name": "psr/log",
@@ -1199,7 +1204,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2016-10-10T12:19:37+00:00"
+            "time": "2016-10-10 12:19:37"
         },
         {
             "name": "ramsey/uuid",
@@ -1281,7 +1286,7 @@
                 "identifier",
                 "uuid"
             ],
-            "time": "2017-03-26T20:37:53+00:00"
+            "time": "2017-03-26 20:37:53"
         },
         {
             "name": "seld/cli-prompt",
@@ -1329,7 +1334,7 @@
                 "input",
                 "prompt"
             ],
-            "time": "2017-03-18T11:32:45+00:00"
+            "time": "2017-03-18 11:32:45"
         },
         {
             "name": "seld/jsonlint",
@@ -1378,7 +1383,7 @@
                 "parser",
                 "validator"
             ],
-            "time": "2017-06-18T15:11:04+00:00"
+            "time": "2017-06-18 15:11:04"
         },
         {
             "name": "seld/phar-utils",
@@ -1422,7 +1427,7 @@
             "keywords": [
                 "phra"
             ],
-            "time": "2015-10-13T18:44:15+00:00"
+            "time": "2015-10-13 18:44:15"
         },
         {
             "name": "sjparkinson/static-review",
@@ -1475,7 +1480,7 @@
                 }
             ],
             "description": "An extendable framework for version control hooks.",
-            "time": "2014-09-22T08:40:36+00:00"
+            "time": "2014-09-22 08:40:36"
         },
         {
             "name": "symfony/console",
@@ -1536,7 +1541,7 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-29T21:26:04+00:00"
+            "time": "2017-07-29 21:26:04"
         },
         {
             "name": "symfony/debug",
@@ -1593,7 +1598,7 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2016-07-30T07:22:48+00:00"
+            "time": "2016-07-30 07:22:48"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -1653,7 +1658,7 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2017-06-02T07:47:27+00:00"
+            "time": "2017-06-02 07:47:27"
         },
         {
             "name": "symfony/filesystem",
@@ -1702,7 +1707,7 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-11T07:17:58+00:00"
+            "time": "2017-07-11 07:17:58"
         },
         {
             "name": "symfony/finder",
@@ -1751,7 +1756,7 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2017-06-01T21:01:25+00:00"
+            "time": "2017-06-01 21:01:25"
         },
         {
             "name": "symfony/polyfill-mbstring",
@@ -1810,7 +1815,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-09T14:24:12+00:00"
+            "time": "2017-06-09 14:24:12"
         },
         {
             "name": "symfony/process",
@@ -1859,7 +1864,7 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-03T08:04:30+00:00"
+            "time": "2017-07-03 08:04:30"
         },
         {
             "name": "tedivm/jshrink",
@@ -1905,7 +1910,7 @@
                 "javascript",
                 "minifier"
             ],
-            "time": "2015-07-04T07:35:09+00:00"
+            "time": "2015-07-04 07:35:09"
         },
         {
             "name": "tubalmartin/cssmin",
@@ -1958,7 +1963,7 @@
                 "minify",
                 "yui"
             ],
-            "time": "2017-05-16T13:45:26+00:00"
+            "time": "2017-05-16 13:45:26"
         },
         {
             "name": "zendframework/zend-captcha",
@@ -2015,7 +2020,7 @@
                 "captcha",
                 "zf2"
             ],
-            "time": "2017-02-23T08:09:44+00:00"
+            "time": "2017-02-23 08:09:44"
         },
         {
             "name": "zendframework/zend-code",
@@ -2068,7 +2073,7 @@
                 "code",
                 "zf2"
             ],
-            "time": "2016-10-24T13:23:32+00:00"
+            "time": "2016-10-24 13:23:32"
         },
         {
             "name": "zendframework/zend-config",
@@ -2124,7 +2129,7 @@
                 "config",
                 "zf2"
             ],
-            "time": "2016-02-04T23:01:10+00:00"
+            "time": "2016-02-04 23:01:10"
         },
         {
             "name": "zendframework/zend-console",
@@ -2176,7 +2181,7 @@
                 "console",
                 "zf2"
             ],
-            "time": "2016-02-09T17:15:12+00:00"
+            "time": "2016-02-09 17:15:12"
         },
         {
             "name": "zendframework/zend-crypt",
@@ -2226,7 +2231,7 @@
                 "crypt",
                 "zf2"
             ],
-            "time": "2016-02-03T23:46:30+00:00"
+            "time": "2016-02-03 23:46:30"
         },
         {
             "name": "zendframework/zend-db",
@@ -2283,7 +2288,7 @@
                 "db",
                 "zf2"
             ],
-            "time": "2016-08-09T19:28:55+00:00"
+            "time": "2016-08-09 19:28:55"
         },
         {
             "name": "zendframework/zend-di",
@@ -2330,7 +2335,7 @@
                 "di",
                 "zf2"
             ],
-            "time": "2016-04-25T20:58:11+00:00"
+            "time": "2016-04-25 20:58:11"
         },
         {
             "name": "zendframework/zend-escaper",
@@ -2374,7 +2379,7 @@
                 "escaper",
                 "zf2"
             ],
-            "time": "2016-06-30T19:48:38+00:00"
+            "time": "2016-06-30 19:48:38"
         },
         {
             "name": "zendframework/zend-eventmanager",
@@ -2421,7 +2426,7 @@
                 "eventmanager",
                 "zf2"
             ],
-            "time": "2016-02-18T20:49:05+00:00"
+            "time": "2016-02-18 20:49:05"
         },
         {
             "name": "zendframework/zend-filter",
@@ -2481,7 +2486,7 @@
                 "filter",
                 "zf2"
             ],
-            "time": "2017-05-17T20:56:17+00:00"
+            "time": "2017-05-17 20:56:17"
         },
         {
             "name": "zendframework/zend-form",
@@ -2558,7 +2563,7 @@
                 "form",
                 "zf2"
             ],
-            "time": "2017-05-18T14:59:53+00:00"
+            "time": "2017-05-18 14:59:53"
         },
         {
             "name": "zendframework/zend-http",
@@ -2608,7 +2613,7 @@
                 "http",
                 "zf2"
             ],
-            "time": "2017-01-31T14:41:02+00:00"
+            "time": "2017-01-31 14:41:02"
         },
         {
             "name": "zendframework/zend-hydrator",
@@ -2666,7 +2671,7 @@
                 "hydrator",
                 "zf2"
             ],
-            "time": "2016-02-18T22:38:26+00:00"
+            "time": "2016-02-18 22:38:26"
         },
         {
             "name": "zendframework/zend-i18n",
@@ -2733,7 +2738,7 @@
                 "i18n",
                 "zf2"
             ],
-            "time": "2017-05-17T17:00:12+00:00"
+            "time": "2017-05-17 17:00:12"
         },
         {
             "name": "zendframework/zend-inputfilter",
@@ -2788,7 +2793,7 @@
                 "inputfilter",
                 "zf2"
             ],
-            "time": "2017-05-18T14:20:56+00:00"
+            "time": "2017-05-18 14:20:56"
         },
         {
             "name": "zendframework/zend-json",
@@ -2843,7 +2848,7 @@
                 "json",
                 "zf2"
             ],
-            "time": "2016-02-04T21:20:26+00:00"
+            "time": "2016-02-04 21:20:26"
         },
         {
             "name": "zendframework/zend-loader",
@@ -2887,7 +2892,7 @@
                 "loader",
                 "zf2"
             ],
-            "time": "2015-06-03T14:05:47+00:00"
+            "time": "2015-06-03 14:05:47"
         },
         {
             "name": "zendframework/zend-log",
@@ -2958,7 +2963,7 @@
                 "logging",
                 "zf2"
             ],
-            "time": "2017-05-17T16:03:26+00:00"
+            "time": "2017-05-17 16:03:26"
         },
         {
             "name": "zendframework/zend-mail",
@@ -3020,7 +3025,7 @@
                 "mail",
                 "zf2"
             ],
-            "time": "2017-06-08T20:03:58+00:00"
+            "time": "2017-06-08 20:03:58"
         },
         {
             "name": "zendframework/zend-math",
@@ -3070,7 +3075,7 @@
                 "math",
                 "zf2"
             ],
-            "time": "2016-04-07T16:29:53+00:00"
+            "time": "2016-04-07 16:29:53"
         },
         {
             "name": "zendframework/zend-mime",
@@ -3119,7 +3124,7 @@
                 "mime",
                 "zf2"
             ],
-            "time": "2017-01-16T16:43:38+00:00"
+            "time": "2017-01-16 16:43:38"
         },
         {
             "name": "zendframework/zend-modulemanager",
@@ -3177,7 +3182,7 @@
                 "modulemanager",
                 "zf2"
             ],
-            "time": "2017-07-11T19:39:57+00:00"
+            "time": "2017-07-11 19:39:57"
         },
         {
             "name": "zendframework/zend-mvc",
@@ -3264,7 +3269,7 @@
                 "mvc",
                 "zf2"
             ],
-            "time": "2016-02-23T15:24:59+00:00"
+            "time": "2016-02-23 15:24:59"
         },
         {
             "name": "zendframework/zend-serializer",
@@ -3321,7 +3326,7 @@
                 "serializer",
                 "zf2"
             ],
-            "time": "2016-06-21T17:01:55+00:00"
+            "time": "2016-06-21 17:01:55"
         },
         {
             "name": "zendframework/zend-server",
@@ -3367,7 +3372,7 @@
                 "server",
                 "zf2"
             ],
-            "time": "2016-06-20T22:27:55+00:00"
+            "time": "2016-06-20 22:27:55"
         },
         {
             "name": "zendframework/zend-servicemanager",
@@ -3419,7 +3424,7 @@
                 "servicemanager",
                 "zf2"
             ],
-            "time": "2016-12-19T19:14:29+00:00"
+            "time": "2016-12-19 19:14:29"
         },
         {
             "name": "zendframework/zend-session",
@@ -3485,7 +3490,7 @@
                 "session",
                 "zf2"
             ],
-            "time": "2017-06-19T21:31:39+00:00"
+            "time": "2017-06-19 21:31:39"
         },
         {
             "name": "zendframework/zend-soap",
@@ -3537,7 +3542,7 @@
                 "soap",
                 "zf2"
             ],
-            "time": "2016-04-21T16:06:27+00:00"
+            "time": "2016-04-21 16:06:27"
         },
         {
             "name": "zendframework/zend-stdlib",
@@ -3596,7 +3601,7 @@
                 "stdlib",
                 "zf2"
             ],
-            "time": "2016-04-12T21:17:31+00:00"
+            "time": "2016-04-12 21:17:31"
         },
         {
             "name": "zendframework/zend-text",
@@ -3643,7 +3648,7 @@
                 "text",
                 "zf2"
             ],
-            "time": "2016-02-08T19:03:52+00:00"
+            "time": "2016-02-08 19:03:52"
         },
         {
             "name": "zendframework/zend-uri",
@@ -3690,7 +3695,7 @@
                 "uri",
                 "zf2"
             ],
-            "time": "2016-02-17T22:38:51+00:00"
+            "time": "2016-02-17 22:38:51"
         },
         {
             "name": "zendframework/zend-validator",
@@ -3761,7 +3766,7 @@
                 "validator",
                 "zf2"
             ],
-            "time": "2017-07-20T16:44:59+00:00"
+            "time": "2017-07-20 16:44:59"
         },
         {
             "name": "zendframework/zend-view",
@@ -3848,7 +3853,7 @@
                 "view",
                 "zf2"
             ],
-            "time": "2017-03-21T15:05:56+00:00"
+            "time": "2017-03-21 15:05:56"
         }
     ],
     "packages-dev": [
@@ -3904,7 +3909,7 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2015-06-14T21:17:01+00:00"
+            "time": "2015-06-14 21:17:01"
         },
         {
             "name": "friendsofphp/php-cs-fixer",
@@ -3974,7 +3979,7 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
-            "time": "2017-03-31T12:59:38+00:00"
+            "time": "2017-03-31 12:59:38"
         },
         {
             "name": "ircmaxell/password-compat",
@@ -4016,7 +4021,7 @@
                 "hashing",
                 "password"
             ],
-            "time": "2014-11-20T16:49:30+00:00"
+            "time": "2014-11-20 16:49:30"
         },
         {
             "name": "lusitanian/oauth",
@@ -4083,7 +4088,7 @@
                 "oauth",
                 "security"
             ],
-            "time": "2016-07-12T22:15:40+00:00"
+            "time": "2016-07-12 22:15:40"
         },
         {
             "name": "myclabs/deep-copy",
@@ -4125,7 +4130,7 @@
                 "object",
                 "object graph"
             ],
-            "time": "2017-04-12T18:52:22+00:00"
+            "time": "2017-04-12 18:52:22"
         },
         {
             "name": "pdepend/pdepend",
@@ -4165,7 +4170,7 @@
                 "BSD-3-Clause"
             ],
             "description": "Official version of pdepend to be handled with Composer",
-            "time": "2017-01-19T14:23:36+00:00"
+            "time": "2017-01-19 14:23:36"
         },
         {
             "name": "phar-io/manifest",
@@ -4220,7 +4225,7 @@
                 }
             ],
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
-            "time": "2017-03-05T18:14:27+00:00"
+            "time": "2017-03-05 18:14:27"
         },
         {
             "name": "phar-io/version",
@@ -4267,7 +4272,7 @@
                 }
             ],
             "description": "Library for handling version information and constraints",
-            "time": "2017-03-05T17:38:23+00:00"
+            "time": "2017-03-05 17:38:23"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -4321,7 +4326,7 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2015-12-27T11:43:31+00:00"
+            "time": "2015-12-27 11:43:31"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
@@ -4366,7 +4371,7 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2017-08-08T06:39:58+00:00"
+            "time": "2017-08-08 06:39:58"
         },
         {
             "name": "phpdocumentor/type-resolver",
@@ -4413,7 +4418,7 @@
                     "email": "me@mikevanriel.com"
                 }
             ],
-            "time": "2017-06-03T08:32:36+00:00"
+            "time": "2017-06-03 08:32:36"
         },
         {
             "name": "phpmd/phpmd",
@@ -4479,7 +4484,7 @@
                 "phpmd",
                 "pmd"
             ],
-            "time": "2017-01-20T14:41:10+00:00"
+            "time": "2017-01-20 14:41:10"
         },
         {
             "name": "phpspec/prophecy",
@@ -4542,7 +4547,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2017-03-02T20:05:34+00:00"
+            "time": "2017-03-02 20:05:34"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -4606,7 +4611,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-08-03T12:40:43+00:00"
+            "time": "2017-08-03 12:40:43"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -4653,7 +4658,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2016-10-03T07:40:28+00:00"
+            "time": "2016-10-03 07:40:28"
         },
         {
             "name": "phpunit/php-text-template",
@@ -4694,7 +4699,7 @@
             "keywords": [
                 "template"
             ],
-            "time": "2015-06-21T13:50:34+00:00"
+            "time": "2015-06-21 13:50:34"
         },
         {
             "name": "phpunit/php-timer",
@@ -4743,7 +4748,7 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2017-02-26T11:10:40+00:00"
+            "time": "2017-02-26 11:10:40"
         },
         {
             "name": "phpunit/php-token-stream",
@@ -4792,7 +4797,7 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2017-08-03T14:17:41+00:00"
+            "time": "2017-08-03 14:17:41"
         },
         {
             "name": "phpunit/phpunit",
@@ -4876,7 +4881,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-08-03T13:59:28+00:00"
+            "time": "2017-08-03 13:59:28"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -4935,7 +4940,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2017-08-03T14:08:16+00:00"
+            "time": "2017-08-03 14:08:16"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
@@ -4980,7 +4985,7 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2017-03-04T06:30:41+00:00"
+            "time": "2017-03-04 06:30:41"
         },
         {
             "name": "sebastian/comparator",
@@ -5044,7 +5049,7 @@
                 "compare",
                 "equality"
             ],
-            "time": "2017-03-03T06:26:08+00:00"
+            "time": "2017-03-03 06:26:08"
         },
         {
             "name": "sebastian/diff",
@@ -5096,7 +5101,7 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2017-05-22T07:24:03+00:00"
+            "time": "2017-05-22 07:24:03"
         },
         {
             "name": "sebastian/environment",
@@ -5146,7 +5151,7 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2017-07-01T08:51:00+00:00"
+            "time": "2017-07-01 08:51:00"
         },
         {
             "name": "sebastian/exporter",
@@ -5213,7 +5218,7 @@
                 "export",
                 "exporter"
             ],
-            "time": "2017-04-03T13:19:02+00:00"
+            "time": "2017-04-03 13:19:02"
         },
         {
             "name": "sebastian/finder-facade",
@@ -5252,7 +5257,7 @@
             ],
             "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
             "homepage": "https://github.com/sebastianbergmann/finder-facade",
-            "time": "2016-02-17T07:02:23+00:00"
+            "time": "2016-02-17 07:02:23"
         },
         {
             "name": "sebastian/global-state",
@@ -5303,7 +5308,7 @@
             "keywords": [
                 "global state"
             ],
-            "time": "2017-04-27T15:39:26+00:00"
+            "time": "2017-04-27 15:39:26"
         },
         {
             "name": "sebastian/object-enumerator",
@@ -5350,7 +5355,7 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2017-08-03T12:35:26+00:00"
+            "time": "2017-08-03 12:35:26"
         },
         {
             "name": "sebastian/object-reflector",
@@ -5395,7 +5400,7 @@
             ],
             "description": "Allows reflection of object attributes, including inherited and non-public ones",
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-            "time": "2017-03-29T09:07:27+00:00"
+            "time": "2017-03-29 09:07:27"
         },
         {
             "name": "sebastian/phpcpd",
@@ -5446,7 +5451,7 @@
             ],
             "description": "Copy/Paste Detector (CPD) for PHP code.",
             "homepage": "https://github.com/sebastianbergmann/phpcpd",
-            "time": "2016-04-17T19:32:49+00:00"
+            "time": "2016-04-17 19:32:49"
         },
         {
             "name": "sebastian/recursion-context",
@@ -5499,7 +5504,7 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2017-03-03T06:23:57+00:00"
+            "time": "2017-03-03 06:23:57"
         },
         {
             "name": "sebastian/resource-operations",
@@ -5541,7 +5546,7 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2015-07-28T20:34:47+00:00"
+            "time": "2015-07-28 20:34:47"
         },
         {
             "name": "sebastian/version",
@@ -5584,7 +5589,7 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2016-10-03T07:35:21+00:00"
+            "time": "2016-10-03 07:35:21"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -5635,7 +5640,7 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2017-06-14T01:23:49+00:00"
+            "time": "2017-06-14 01:23:49"
         },
         {
             "name": "symfony/config",
@@ -5697,7 +5702,7 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-19T07:37:29+00:00"
+            "time": "2017-07-19 07:37:29"
         },
         {
             "name": "symfony/dependency-injection",
@@ -5767,7 +5772,7 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-28T15:27:31+00:00"
+            "time": "2017-07-28 15:27:31"
         },
         {
             "name": "symfony/polyfill-php54",
@@ -5825,7 +5830,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-09T08:25:21+00:00"
+            "time": "2017-06-09 08:25:21"
         },
         {
             "name": "symfony/polyfill-php55",
@@ -5881,7 +5886,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-09T08:25:21+00:00"
+            "time": "2017-06-09 08:25:21"
         },
         {
             "name": "symfony/polyfill-php70",
@@ -5940,7 +5945,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-09T14:24:12+00:00"
+            "time": "2017-06-09 14:24:12"
         },
         {
             "name": "symfony/polyfill-php72",
@@ -5995,7 +6000,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-09T08:25:21+00:00"
+            "time": "2017-06-09 08:25:21"
         },
         {
             "name": "symfony/polyfill-xml",
@@ -6043,7 +6048,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-09T08:25:21+00:00"
+            "time": "2017-06-09 08:25:21"
         },
         {
             "name": "symfony/stopwatch",
@@ -6092,7 +6097,7 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "time": "2017-04-12T14:14:56+00:00"
+            "time": "2017-04-12 14:14:56"
         },
         {
             "name": "theseer/fdomdocument",
@@ -6132,7 +6137,7 @@
             ],
             "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.",
             "homepage": "https://github.com/theseer/fDOMDocument",
-            "time": "2017-06-30T11:53:12+00:00"
+            "time": "2017-06-30 11:53:12"
         },
         {
             "name": "theseer/tokenizer",
@@ -6172,7 +6177,7 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "time": "2017-04-07T12:08:54+00:00"
+            "time": "2017-04-07 12:08:54"
         },
         {
             "name": "webmozart/assert",
@@ -6222,7 +6227,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2016-11-23T20:04:58+00:00"
+            "time": "2016-11-23 20:04:58"
         }
     ],
     "aliases": [],

From dfb83aa9bb05ac533bd8a1d859da94c75b01ce3f Mon Sep 17 00:00:00 2001
From: Tommy Wiebell <twiebell@magento.com>
Date: Wed, 23 Aug 2017 11:36:43 -0500
Subject: [PATCH 31/85] MAGETWO-71749: Impossible get Tracking information 
 when  2nd Shipping label was created for DHL

- Enforce that tracking popup is not cached, so tracking updates are displayed
- Fix bug where shipment blocks had duplicate identifiers
---
 .../view/frontend/layout/shipping_tracking_popup.xml     | 2 +-
 .../view/frontend/templates/tracking/popup.phtml         | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Shipping/view/frontend/layout/shipping_tracking_popup.xml b/app/code/Magento/Shipping/view/frontend/layout/shipping_tracking_popup.xml
index 3f3f0f9b98800..1f5b0ae4630ad 100644
--- a/app/code/Magento/Shipping/view/frontend/layout/shipping_tracking_popup.xml
+++ b/app/code/Magento/Shipping/view/frontend/layout/shipping_tracking_popup.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="empty" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Shipping\Block\Tracking\Popup" name="shipping.tracking.popup" template="Magento_Shipping::tracking/popup.phtml"/>
+            <block class="Magento\Shipping\Block\Tracking\Popup" name="shipping.tracking.popup" template="Magento_Shipping::tracking/popup.phtml" cacheable="false" />
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
index 5e985f076746c..eb888595c7f97 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
@@ -22,23 +22,24 @@ $results = $block->getTrackingInfo();
                 <?php foreach ($result as $counter => $track): ?>
                     <div class="table-wrapper">
                         <?php
-                            $block->addChild('shipping.tracking.details.' . $counter, Template::class, [
+                            $shipmentBlockIdentifier = $shipId . '.' . $counter;
+                            $block->addChild('shipping.tracking.details.' . $shipmentBlockIdentifier, Template::class, [
                                 'track' => $track,
                                 'template' => 'Magento_Shipping::tracking/details.phtml',
                                 'storeSupportEmail' => $block->getStoreSupportEmail()
                             ]
                         );
                         ?>
-                        <?= /* @noEscape */ $block->getChildHtml('shipping.tracking.details.' . $counter) ?>
+                        <?= /* @noEscape */ $block->getChildHtml('shipping.tracking.details.' . $shipmentBlockIdentifier) ?>
                     </div>
                     <?php if (is_object($track) && !empty($track->getProgressdetail())): ?>
                         <?php
-                            $block->addChild('shipping.tracking.progress.' . $counter, Template::class, [
+                            $block->addChild('shipping.tracking.progress.' . $shipmentBlockIdentifier, Template::class, [
                                 'track' => $track,
                                 'template' => 'Magento_Shipping::tracking/progress.phtml'
                             ]);
                         ?>
-                        <?= /* @noEscape */ $block->getChildHtml('shipping.tracking.progress.' . $counter) ?>
+                        <?= /* @noEscape */ $block->getChildHtml('shipping.tracking.progress.' . $shipmentBlockIdentifier) ?>
                     <?php endif; ?>
                 <?php endforeach; ?>
             <?php else: ?>

From 795b6b803048fc15ddd0ceff6151743b12d67d28 Mon Sep 17 00:00:00 2001
From: Maksym Aposov <maxim.aposov@gmail.com>
Date: Wed, 23 Aug 2017 22:48:49 +0300
Subject: [PATCH 32/85] Static versioning and styles minification break email
 fonts styles #8241  - fix unit test

---
 app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
index 5eaa65b495133..a8e0acf59befb 100644
--- a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
@@ -359,7 +359,7 @@ public function applyInlineCssDataProvider()
                 '<html><head><style type="text/css">div { color: #111; }</style></head><p></p></html>',
                 'p { color: #000 }',
                 [
-                    '<head><style type="text/css">div { color: #111; }</style></head>',
+                    '<style type="text/css">div { color: #111; }</style>',
                     '<p style="color: #000;"></p>',
                 ],
             ],

From 6ec532d3534d446e15179fe01218ef54f13b2c0a Mon Sep 17 00:00:00 2001
From: Dan Mooney <dmooney@magento.com>
Date: Wed, 23 Aug 2017 16:32:23 -0500
Subject: [PATCH 33/85] MAGETWO-71562: Search by attribute is not working with
 Elasticsearch

---
 .../Model/Indexer/Fulltext/Plugin/Attribute.php           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Attribute.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Attribute.php
index d148ad8c3e536..83ad7acca84dc 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Attribute.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Attribute.php
@@ -56,10 +56,10 @@ public function beforeSave(
     ) {
         $this->saveIsNew = $attribute->isObjectNew();
         $this->saveNeedInvalidation = (
-                $attribute->dataHasChangedFor('is_searchable')
-                || $attribute->dataHasChangedFor('is_filterable')
-                || $attribute->dataHasChangedFor('is_visible_in_advanced_search')
-            ) && ! $this->saveIsNew;
+            $attribute->dataHasChangedFor('is_searchable')
+            || $attribute->dataHasChangedFor('is_filterable')
+            || $attribute->dataHasChangedFor('is_visible_in_advanced_search')
+        );
     }
 
     /**

From 8733f8c3daa059d27358893fdf7c8a93281eced5 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Wed, 23 Aug 2017 17:12:30 -0500
Subject: [PATCH 34/85] MAGETWO-64085: Static versioning and styles
 minification break email fonts styles #8241

- add integration test
---
 .../PreProcessor/Adapter/CssInlinerTest.php   | 103 ++++++++++
 .../Css/_files/css/test-css-no-spaces.css     |   1 +
 .../Css/_files/css/test-css-with-spaces.css   |   1 +
 .../Framework/Css/_files/css/test-input.html  | 182 ++++++++++++++++++
 .../Css/PreProcessor/Adapter/CssInliner.php   |   3 +-
 5 files changed, 288 insertions(+), 2 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Framework/Css/_files/css/test-css-no-spaces.css
 create mode 100644 dev/tests/integration/testsuite/Magento/Framework/Css/_files/css/test-css-with-spaces.css
 create mode 100644 dev/tests/integration/testsuite/Magento/Framework/Css/_files/css/test-input.html

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php
new file mode 100644
index 0000000000000..95ed79d4e7207
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Css\PreProcessor\Adapter;
+
+class CssInlinerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Css\PreProcessor\Adapter\CssInliner
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        $this->model = $this->objectManager->create(\Magento\Framework\Css\PreProcessor\Adapter\CssInliner::class);
+    }
+
+    /**
+     * @param string $htmlFilePath
+     * @param string $cssFilePath
+     * @param string $cssExpected
+     * @dataProvider getFilesDataProvider
+     */
+    public function testGetFiles($htmlFilePath, $cssFilePath, $cssExpected)
+    {
+        $html = file_get_contents($htmlFilePath);
+        $css = file_get_contents($cssFilePath);
+        $this->model->setCss($css);
+        $this->model->setHtml($html);
+        $result = $this->model->process();
+        $this->assertContains($cssExpected, $result);
+    }
+
+    /**
+     * @return array
+     */
+    public function getFilesDataProvider()
+    {
+        $fixtureDir = dirname(dirname(__DIR__));
+        return [
+            'noSpacesCss'=>[
+                'resultHtml' => $fixtureDir . "/_files/css/test-input.html",
+                'cssWithoutSpaces' => $fixtureDir . "/_files/css/test-css-no-spaces.css",
+                'vertical-align: top; padding: 10px 10px 10px 0; width: 50%;'
+            ],
+            'withSpacesCss'=>[
+                'resultHtml' => $fixtureDir . "/_files/css/test-input.html",
+                'cssWithSpaces' => $fixtureDir . "/_files/css/test-css-with-spaces.css",
+                'vertical-align: top; padding: 10px 10px 10px 0; width: 50%;'
+            ],
+        ];
+    }
+
+
+
+    /**
+     * @param string $htmlFilePath
+     * @param string $cssFilePath
+     * @param string $cssExpected
+     * @dataProvider getFilesDataProviderEmogrifier
+     */
+    public function testGetFilesEmogrifier($htmlFilePath, $cssFilePath, $cssExpected)
+    {
+        $emogrifier = new \Pelago\Emogrifier;
+
+        $html = file_get_contents($htmlFilePath);
+        $css = file_get_contents($cssFilePath);
+        $emogrifier->setCss($css);
+        $emogrifier->setHtml($html);
+        $result = $emogrifier->emogrify();
+        /**
+         * Tests a bug in the library where there's no spaces to CSS string before passing to Emogrifier
+         * to fix known parsing issue with library.
+         * This test should will fail when this bug is fixed in the library and we should fix the adapter.
+         * https://github.com/jjriv/emogrifier/issues/370
+         */
+        $this->assertNotContains($cssExpected, $result);
+    }
+
+    /**
+     * @return array
+     */
+    public function getFilesDataProviderEmogrifier()
+    {
+        $fixtureDir = dirname(dirname(__DIR__));
+        return [
+            'noSpacesCss'=>[
+                'resultHtml' => $fixtureDir . "/_files/css/test-input.html",
+                'cssWithoutSpaces' => $fixtureDir . "/_files/css/test-css-no-spaces.css",
+                'vertical-align: top; padding: 10px 10px 10px 0; width: 50%;'
+            ]
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/_files/css/test-css-no-spaces.css b/dev/tests/integration/testsuite/Magento/Framework/Css/_files/css/test-css-no-spaces.css
new file mode 100644
index 0000000000000..7e6cb317ef654
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Css/_files/css/test-css-no-spaces.css
@@ -0,0 +1 @@
+body{margin:0;padding:0}img{border:0;height:auto;line-height:100%;outline:none;text-decoration:none}table{border-collapse:collapse}table td{vertical-align:top}html{font-size:62.5%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;font-size-adjust:100%}body{color:#333;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-style:normal;font-weight:400;line-height:1.42857143;font-size:14px}p{margin-top:0;margin-bottom:10px}abbr[title]{border-bottom:1px dotted #d1d1d1;cursor:help}b,strong{font-weight:700}em,i{font-style:italic}mark{background:#f0f0f0;color:#000}small,.small{font-size:12px}hr{border:0;border-top:1px solid #d1d1d1;margin-bottom:20px;margin-top:20px}sub,sup{font-size:71.42857143000001%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}dfn{font-style:italic}h1{font-weight:300;line-height:1.1;font-size:26px;margin-top:0;margin-bottom:20px}h2{font-weight:300;line-height:1.1;font-size:26px;margin-top:25px;margin-bottom:20px}h3{font-weight:300;line-height:1.1;font-size:18px;margin-top:15px;margin-bottom:10px}h4{font-weight:700;line-height:1.1;font-size:14px;margin-top:20px;margin-bottom:20px}h5{font-weight:700;line-height:1.1;font-size:12px;margin-top:20px;margin-bottom:20px}h6{font-weight:700;line-height:1.1;font-size:10px;margin-top:20px;margin-bottom:20px}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small{color:#333;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-style:normal;font-weight:400;line-height:1}a,.alink{color:#1979c3;text-decoration:none}a:visited,.alink:visited{color:#1979c3;text-decoration:none}a:hover,.alink:hover{color:#006bb4;text-decoration:underline}a:active,.alink:active{color:#ff5501;text-decoration:underline}ul,ol{margin-top:0;margin-bottom:25px}ul>li,ol>li{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}dl{margin-bottom:20px;margin-top:0}dt{font-weight:700;margin-bottom:5px;margin-top:0}dd{margin-bottom:10px;margin-top:0;margin-left:0}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,'Courier New',monospace}code{background:#f0f0f0;color:#111;padding:2px 4px;font-size:12px;white-space:nowrap}kbd{background:#f0f0f0;color:#111;padding:2px 4px;font-size:12px}pre{background:#f0f0f0;border:1px solid #d1d1d1;color:#111;line-height:1.42857143;margin:0 0 10px;padding:10px;font-size:12px;display:block;word-wrap:break-word}pre code{background-color:transparent;border-radius:0;color:inherit;font-size:inherit;padding:0;white-space:pre-wrap}blockquote{border-left:0 solid #d1d1d1;margin:0 0 20px 40px;padding:0;color:#333;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-style:italic;font-weight:400;line-height:1.42857143;font-size:14px}blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0}blockquote footer,blockquote small,blockquote .small{color:#333;line-height:1.42857143;font-size:10px;display:block}blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}blockquote cite{font-style:normal}blockquote:before,blockquote:after{content:''}q{quotes:none}q:before,q:after{content:'';content:none}cite{font-style:normal}body{font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:normal;text-align:left}th,td{font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif}a{color:#1979c3;text-decoration:none}html,body{background-color:#fff}.wrapper{margin:0 auto}.wrapper-inner{padding-bottom:30px;width:100%}.main{margin:0 auto;text-align:left;width:600px}.header{padding:10px 10px 0}.main-content{background-color:#fff;padding:10px}.footer{padding:0 10px 10px}.button>tr>td{padding-bottom:10px}.button .inner-wrapper td{-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;border-radius:3px;background-color:#1979c3}.button .inner-wrapper td a{-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;border-radius:3px;border:1px solid #1979c3;color:#fff;display:inline-block;font-size:14px;padding:7px 15px;text-decoration:none}.message-info,.message-gift{width:100%}.message-info td,.message-gift td{background-color:#fdf0d5;border:1px solid false;color:#333;margin:0;padding:10px}.message-info td a,.message-gift td a{color:#1979c3}.message-info td h1,.message-gift td h1,.message-info td h2,.message-gift td h2,.message-info td h3,.message-gift td h3,.message-info td h4,.message-gift td h4,.message-info td h5,.message-gift td h5,.message-info td h6,.message-gift td h6{margin-top:0}.message-details{margin-bottom:10px}.message-details b{font-weight:bold}.message-details td{padding-bottom:5px}.message-details td b{margin-right:10px}.email-items .bundle-option-label>td{padding:0 10px 0 30px}.email-items .bundle-option-value>td{padding:0 10px 10px}.email-items .bundle-option-value>td.item-info{padding:0 10px 10px 40px}.email-items tr.bundle-option-value+tr>td.item-extra{padding-top:10px}.email-summary h1{margin-bottom:5px}.order-details{width:100%}.order-details tr>.address-details,.order-details tr>.method-info{padding:10px 10px 10px 0;width:50%}.order-details tr>.address-details h3,.order-details tr>.method-info h3{margin-top:0}.order-details tr+.method-info>td{padding:0 0 10px}.order-details .payment-method{margin-bottom:10px}.order-details .payment-method .title{font-weight:400}.order-details .payment-method .data.table>caption{display:none}.order-details .payment-method .data.table th{padding-right:10px}.shipment-track{width:100%;border-collapse:collapse;border-spacing:0;max-width:100%}.shipment-track th{text-align:left}.shipment-track>tbody>tr>th,.shipment-track>tfoot>tr>th,.shipment-track>tbody>tr>td,.shipment-track>tfoot>tr>td{vertical-align:top}.shipment-track>thead>tr>th,.shipment-track>thead>tr>td{vertical-align:bottom}.shipment-track>thead>tr>th,.shipment-track>tbody>tr>th,.shipment-track>tfoot>tr>th,.shipment-track>thead>tr>td,.shipment-track>tbody>tr>td,.shipment-track>tfoot>tr>td{padding:0 10px}.shipment-track thead>tr>th,.shipment-track tbody>tr>th,.shipment-track thead>tr>td,.shipment-track tbody>tr>td{background-color:#f2f2f2;padding:10px;width:50%}.shipment-track thead>tr+tr th,.shipment-track tbody>tr+tr th,.shipment-track thead>tr+tr td,.shipment-track tbody>tr+tr td{padding-top:0}.email-items{width:100%;border-collapse:collapse;border-spacing:0;max-width:100%;border:1px solid #d1d1d1}.email-items th{text-align:left}.email-items>tbody>tr>th,.email-items>tfoot>tr>th,.email-items>tbody>tr>td,.email-items>tfoot>tr>td{vertical-align:top}.email-items>thead>tr>th,.email-items>thead>tr>td{vertical-align:bottom}.email-items>thead>tr>th,.email-items>tbody>tr>th,.email-items>tfoot>tr>th,.email-items>thead>tr>td,.email-items>tbody>tr>td,.email-items>tfoot>tr>td{padding:0 10px}.email-items thead>tr>th,.email-items tfoot>tr>th,.email-items thead>tr>td,.email-items tfoot>tr>td{background-color:#f2f2f2}.email-items>thead>tr>th,.email-items>tbody>tr>th{padding:10px}.email-items>thead>tr>td,.email-items>tbody>tr>td{padding:10px}.email-items>thead>tr>td.message-gift,.email-items>tbody>tr>td.message-gift{border-top:none;padding-top:0}.email-items>tbody>tr>th,.email-items>tfoot>tr>th,.email-items>tbody>tr>td,.email-items>tfoot>tr>td{border-top:1px solid #d1d1d1}.email-items>tbody>tr+tr>th,.email-items>tfoot>tr+tr>th,.email-items>tbody>tr+tr>td,.email-items>tfoot>tr+tr>td{border-top:0}.email-items p{margin-bottom:0}.email-items .product-name{font-weight:700;margin-bottom:5px}.email-items .has-extra .sku{margin-bottom:10px}.email-items .item-info dl{margin-bottom:0;padding-left:20px}.email-items .item-info dl dt,.email-items .item-info dl dd{margin-bottom:0;padding-bottom:0}.email-items .item-info dl dd{padding-left:10px}.email-items .item-qty{text-align:center}.email-items .item-price{text-align:right}.email-items .item-extra{padding-top:0}.email-items .order-totals>tr>th{font-weight:400}.email-items .order-totals>tr>th,.email-items .order-totals>tr>td{padding:10px;text-align:right}.email-items .order-totals>tr+tr th,.email-items .order-totals>tr+tr td{padding-top:0}.email-items .order-totals .price{white-space:nowrap}
\ No newline at end of file
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/_files/css/test-css-with-spaces.css b/dev/tests/integration/testsuite/Magento/Framework/Css/_files/css/test-css-with-spaces.css
new file mode 100644
index 0000000000000..388bbe89bb16e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Css/_files/css/test-css-with-spaces.css
@@ -0,0 +1 @@
+body { margin:0;padding:0 } img { border:0;height:auto;line-height:100%;outline:none;text-decoration:none } table { border-collapse:collapse } table td { vertical-align:top } html { font-size:62.5%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;font-size-adjust:100% } body { color:#333;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-style:normal;font-weight:400;line-height:1.42857143;font-size:14px } p { margin-top:0;margin-bottom:10px } abbr[title] { border-bottom:1px dotted #d1d1d1;cursor:help } b,strong { font-weight:700 } em,i { font-style:italic } mark { background:#f0f0f0;color:#000 } small,.small { font-size:12px } hr { border:0;border-top:1px solid #d1d1d1;margin-bottom:20px;margin-top:20px } sub,sup { font-size:71.42857143000001%;line-height:0;position:relative;vertical-align:baseline } sup { top:-.5em } sub { bottom:-.25em } dfn { font-style:italic } h1 { font-weight:300;line-height:1.1;font-size:26px;margin-top:0;margin-bottom:20px } h2 { font-weight:300;line-height:1.1;font-size:26px;margin-top:25px;margin-bottom:20px } h3 { font-weight:300;line-height:1.1;font-size:18px;margin-top:15px;margin-bottom:10px } h4 { font-weight:700;line-height:1.1;font-size:14px;margin-top:20px;margin-bottom:20px } h5 { font-weight:700;line-height:1.1;font-size:12px;margin-top:20px;margin-bottom:20px } h6 { font-weight:700;line-height:1.1;font-size:10px;margin-top:20px;margin-bottom:20px } h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small { color:#333;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-style:normal;font-weight:400;line-height:1 } a,.alink { color:#1979c3;text-decoration:none } a:visited,.alink:visited { color:#1979c3;text-decoration:none } a:hover,.alink:hover { color:#006bb4;text-decoration:underline } a:active,.alink:active { color:#ff5501;text-decoration:underline } ul,ol { margin-top:0;margin-bottom:25px } ul > li,ol > li { margin-top:0;margin-bottom:10px } ul ul,ol ul,ul ol,ol ol { margin-bottom:0 } dl { margin-bottom:20px;margin-top:0 } dt { font-weight:700;margin-bottom:5px;margin-top:0 } dd { margin-bottom:10px;margin-top:0;margin-left:0 } code,kbd,pre,samp { font-family:Menlo,Monaco,Consolas,'Courier New',monospace } code { background:#f0f0f0;color:#111;padding:2px 4px;font-size:12px;white-space:nowrap } kbd { background:#f0f0f0;color:#111;padding:2px 4px;font-size:12px } pre { background:#f0f0f0;border:1px solid #d1d1d1;color:#111;line-height:1.42857143;margin:0 0 10px;padding:10px;font-size:12px;display:block;word-wrap:break-word } pre code { background-color:transparent;border-radius:0;color:inherit;font-size:inherit;padding:0;white-space:pre-wrap } blockquote { border-left:0 solid #d1d1d1;margin:0 0 20px 40px;padding:0;color:#333;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-style:italic;font-weight:400;line-height:1.42857143;font-size:14px } blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child { margin-bottom:0 } blockquote footer,blockquote small,blockquote .small { color:#333;line-height:1.42857143;font-size:10px;display:block } blockquote footer:before,blockquote small:before,blockquote .small:before { content:'\2014 \00A0' } blockquote cite { font-style:normal } blockquote:before,blockquote:after { content:'' } q { quotes:none } q:before,q:after { content:'';content:none } cite { font-style:normal } body { font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:normal;text-align:left } th,td { font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif } a { color:#1979c3;text-decoration:none } html,body { background-color:#fff } .wrapper { margin:0 auto } .wrapper-inner { padding-bottom:30px;width:100% } .main { margin:0 auto;text-align:left;width:600px } .header { padding:10px 10px 0 } .main-content { background-color:#fff;padding:10px } .footer { padding:0 10px 10px } .button > tr > td { padding-bottom:10px } .button .inner-wrapper td { -webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;border-radius:3px;background-color:#1979c3 } .button .inner-wrapper td a { -webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;border-radius:3px;border:1px solid #1979c3;color:#fff;display:inline-block;font-size:14px;padding:7px 15px;text-decoration:none } .message-info,.message-gift { width:100% } .message-info td,.message-gift td { background-color:#fdf0d5;border:1px solid false;color:#333;margin:0;padding:10px } .message-info td a,.message-gift td a { color:#1979c3 } .message-info td h1,.message-gift td h1,.message-info td h2,.message-gift td h2,.message-info td h3,.message-gift td h3,.message-info td h4,.message-gift td h4,.message-info td h5,.message-gift td h5,.message-info td h6,.message-gift td h6 { margin-top:0 } .message-details { margin-bottom:10px } .message-details b { font-weight:bold } .message-details td { padding-bottom:5px } .message-details td b { margin-right:10px } .email-items .bundle-option-label > td { padding:0 10px 0 30px } .email-items .bundle-option-value > td { padding:0 10px 10px } .email-items .bundle-option-value > td.item-info { padding:0 10px 10px 40px } .email-items tr.bundle-option-value+tr > td.item-extra { padding-top:10px } .email-summary h1 { margin-bottom:5px } .order-details { width:100% } .order-details tr > .address-details,.order-details tr > .method-info { padding:10px 10px 10px 0;width:50% } .order-details tr > .address-details h3,.order-details tr > .method-info h3 { margin-top:0 } .order-details tr+.method-info > td { padding:0 0 10px } .order-details .payment-method { margin-bottom:10px } .order-details .payment-method .title { font-weight:400 } .order-details .payment-method .data.table > caption { display:none } .order-details .payment-method .data.table th { padding-right:10px } .shipment-track { width:100%;border-collapse:collapse;border-spacing:0;max-width:100% } .shipment-track th { text-align:left } .shipment-track > tbody > tr > th,.shipment-track > tfoot > tr > th,.shipment-track > tbody > tr > td,.shipment-track > tfoot > tr > td { vertical-align:top } .shipment-track > thead > tr > th,.shipment-track > thead > tr > td { vertical-align:bottom } .shipment-track > thead > tr > th,.shipment-track > tbody > tr > th,.shipment-track > tfoot > tr > th,.shipment-track > thead > tr > td,.shipment-track > tbody > tr > td,.shipment-track > tfoot > tr > td { padding:0 10px } .shipment-track thead > tr > th,.shipment-track tbody > tr > th,.shipment-track thead > tr > td,.shipment-track tbody > tr > td { background-color:#f2f2f2;padding:10px;width:50% } .shipment-track thead > tr+tr th,.shipment-track tbody > tr+tr th,.shipment-track thead > tr+tr td,.shipment-track tbody > tr+tr td { padding-top:0 } .email-items { width:100%;border-collapse:collapse;border-spacing:0;max-width:100%;border:1px solid #d1d1d1 } .email-items th { text-align:left } .email-items > tbody > tr > th,.email-items > tfoot > tr > th,.email-items > tbody > tr > td,.email-items > tfoot > tr > td { vertical-align:top } .email-items > thead > tr > th,.email-items > thead > tr > td { vertical-align:bottom } .email-items > thead > tr > th,.email-items > tbody > tr > th,.email-items > tfoot > tr > th,.email-items > thead > tr > td,.email-items > tbody > tr > td,.email-items > tfoot > tr > td { padding:0 10px } .email-items thead > tr > th,.email-items tfoot > tr > th,.email-items thead > tr > td,.email-items tfoot > tr > td { background-color:#f2f2f2 } .email-items > thead > tr > th,.email-items > tbody > tr > th { padding:10px } .email-items > thead > tr > td,.email-items > tbody > tr > td { padding:10px } .email-items > thead > tr > td.message-gift,.email-items > tbody > tr > td.message-gift { border-top:none;padding-top:0 } .email-items > tbody > tr > th,.email-items > tfoot > tr > th,.email-items > tbody > tr > td,.email-items > tfoot > tr > td { border-top:1px solid #d1d1d1 } .email-items > tbody > tr+tr > th,.email-items > tfoot > tr+tr > th,.email-items > tbody > tr+tr > td,.email-items > tfoot > tr+tr > td { border-top:0 } .email-items p { margin-bottom:0 } .email-items .product-name { font-weight:700;margin-bottom:5px } .email-items .has-extra .sku { margin-bottom:10px } .email-items .item-info dl { margin-bottom:0;padding-left:20px } .email-items .item-info dl dt,.email-items .item-info dl dd { margin-bottom:0;padding-bottom:0 } .email-items .item-info dl dd { padding-left:10px } .email-items .item-qty { text-align:center } .email-items .item-price { text-align:right } .email-items .item-extra { padding-top:0 } .email-items .order-totals > tr > th { font-weight:400 } .email-items .order-totals > tr > th,.email-items .order-totals > tr > td { padding:10px;text-align:right } .email-items .order-totals > tr+tr th,.email-items .order-totals > tr+tr td { padding-top:0 } .email-items .order-totals .price { white-space:nowrap }
\ No newline at end of file
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/_files/css/test-input.html b/dev/tests/integration/testsuite/Magento/Framework/Css/_files/css/test-input.html
new file mode 100644
index 0000000000000..d5b6f35421ac6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Css/_files/css/test-input.html
@@ -0,0 +1,182 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="initial-scale=1.0, width=device-width" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <style type="text/css">
+
+
+        html{font-size:62.5%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;font-size-adjust:100%}body{color:#333;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-style:normal;font-weight:400;line-height:1.42857143;font-size:14px}p{margin-top:0;margin-bottom:10px}abbr[title]{border-bottom:1px dotted #d1d1d1;cursor:help}b,strong{font-weight:700}em,i{font-style:italic}mark{background:#f0f0f0;color:#000}small,.small{font-size:12px}hr{border:0;border-top:1px solid #d1d1d1;margin-bottom:20px;margin-top:20px}sub,sup{font-size:71.42857143000001%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}dfn{font-style:italic}h1{font-weight:300;line-height:1.1;font-size:26px;margin-top:0;margin-bottom:20px}h2{font-weight:300;line-height:1.1;font-size:26px;margin-top:25px;margin-bottom:20px}h3{font-weight:300;line-height:1.1;font-size:18px;margin-top:15px;margin-bottom:10px}h4{font-weight:700;line-height:1.1;font-size:14px;margin-top:20px;margin-bottom:20px}h5{font-weight:700;line-height:1.1;font-size:12px;margin-top:20px;margin-bottom:20px}h6{font-weight:700;line-height:1.1;font-size:10px;margin-top:20px;margin-bottom:20px}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small{color:#333;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-style:normal;font-weight:400;line-height:1}a,.alink{color:#1979c3;text-decoration:none}a:visited,.alink:visited{color:#1979c3;text-decoration:none}a:hover,.alink:hover{color:#006bb4;text-decoration:underline}a:active,.alink:active{color:#ff5501;text-decoration:underline}ul,ol{margin-top:0;margin-bottom:25px}ul>li,ol>li{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}dl{margin-bottom:20px;margin-top:0}dt{font-weight:700;margin-bottom:5px;margin-top:0}dd{margin-bottom:10px;margin-top:0;margin-left:0}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,'Courier New',monospace}code{background:#f0f0f0;color:#111;padding:2px 4px;font-size:12px;white-space:nowrap}kbd{background:#f0f0f0;color:#111;padding:2px 4px;font-size:12px}pre{background:#f0f0f0;border:1px solid #d1d1d1;color:#111;line-height:1.42857143;margin:0 0 10px;padding:10px;font-size:12px;display:block;word-wrap:break-word}pre code{background-color:transparent;border-radius:0;color:inherit;font-size:inherit;padding:0;white-space:pre-wrap}blockquote{border-left:0 solid #d1d1d1;margin:0 0 20px 40px;padding:0;color:#333;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-style:italic;font-weight:400;line-height:1.42857143;font-size:14px}blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0}blockquote footer,blockquote small,blockquote .small{color:#333;line-height:1.42857143;font-size:10px;display:block}blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}blockquote cite{font-style:normal}blockquote:before,blockquote:after{content:''}q{quotes:none}q:before,q:after{content:'';content:none}cite{font-style:normal}.shipment-track th{text-align:left}.shipment-track>tbody>tr>th,.shipment-track>tfoot>tr>th,.shipment-track>tbody>tr>td,.shipment-track>tfoot>tr>td{vertical-align:top}.shipment-track>thead>tr>th,.shipment-track>thead>tr>td{vertical-align:bottom}.shipment-track>thead>tr>th,.shipment-track>tbody>tr>th,.shipment-track>tfoot>tr>th,.shipment-track>thead>tr>td,.shipment-track>tbody>tr>td,.shipment-track>tfoot>tr>td{padding:0 10px}.email-items th{text-align:left}.email-items>tbody>tr>th,.email-items>tfoot>tr>th,.email-items>tbody>tr>td,.email-items>tfoot>tr>td{vertical-align:top}.email-items>thead>tr>th,.email-items>thead>tr>td{vertical-align:bottom}.email-items>thead>tr>th,.email-items>tbody>tr>th,.email-items>tfoot>tr>th,.email-items>thead>tr>td,.email-items>tbody>tr>td,.email-items>tfoot>tr>td{padding:0 10px}@media only screen and (max-width:479px){.email-summary h1{font-size:24px !important}.order-details .address-details,.order-details .method-info{display:block;padding:10px 0 !important;width:auto !important}.order-details .address-details h3,.order-details .method-info h3{margin-bottom:5px !important;margin-top:0 !important}.button .inner-wrapper{width:100% !important}.button .inner-wrapper td a{font-size:16px}}@media only screen and (max-width:639px){html,body{background-color:#fff;width:100% !important}.main{max-width:100% !important;min-width:240px;width:auto !important}.rma-items td,.rma-items th{font-size:12px !important;padding:5px !important}}body,table,td,a{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}img{-ms-interpolation-mode:bicubic}table,td{mso-table-lspace:0pt;mso-table-rspace:0pt}a:visited{color:#1979c3 !important;text-decoration:none !important}a:hover{color:#006bb4 !important;text-decoration:underline !important}a:active{color:#ff5501 !important;text-decoration:underline !important}.no-link a,.address-details a{color:#333 !important;cursor:default !important;text-decoration:none !important}.button .inner-wrapper td:hover{background-color:#006bb4 !important}.button .inner-wrapper a:active,.button .inner-wrapper td:active{background-color:#006bb4 !important}.button a:active,.button a:hover,.button a:visited{border:1px solid #006bb4;color:#fff !important;text-decoration:none !important}.email-items{overflow-x:auto;overflow-y:hidden;width:100%;-ms-overflow-style:-ms-autohiding-scrollbar;-webkit-overflow-scrolling:touch}
+    </style>
+</head>
+<body>
+
+
+<!-- Begin wrapper table -->
+<table class="wrapper" width="100%">
+    <tr>
+        <td class="wrapper-inner" align="center">
+            <table class="main" align="center">
+                <tr>
+                    <td class="header">
+                        <a class="logo" href="http://magento2.vagrant236/">
+                            <img
+
+                                    width="180"
+
+
+
+                                    height="52"
+
+
+                                    src="http://magento2.vagrant236/pub/static/version1502812784/frontend/Magento/blank/en_US/Magento_Email/logo_email.png"
+                                    alt="Main Website Store"
+                                    border="0"
+                            />
+                        </a>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="main-content">
+                        <!-- Begin Content -->
+
+                        <table>
+                            <tr class="email-intro">
+                                <td>
+                                    <p class="greeting">Anthoula Wojczak,</p>
+                                    <p>
+                                        Thank you for your order from Main Website Store.
+                                        Once your package ships we will send an email with a link to track your order.
+                                        If you have questions about your order, you can email us at <a href="mailto:support@example.com">support@example.com</a>.
+
+                                    </p>
+                                </td>
+                            </tr>
+                            <tr class="email-summary">
+                                <td>
+                                    <h1>Your Order <span class="no-link">#000000001</span></h1>
+                                    <p>Placed on <span class="no-link">Aug 14, 2017, 4:51:00 PM</span></p>
+                                </td>
+                            </tr>
+                            <tr class="email-information">
+                                <td>
+
+                                    <table class="order-details">
+                                        <tr>
+                                            <td class="address-details">
+                                                <h3>Billing Info</h3>
+                                                <p>Anthoula Wojczak<br />
+
+                                                    7700 Parmer Ave<br />
+
+
+
+                                                    Austin,  Texas, 78729<br />
+                                                    United States<br />
+                                                    T: <a href="tel:555-555-5555">555-555-5555</a>
+
+                                                </p>
+                                            </td>
+
+                                            <td class="address-details">
+                                                <h3>Shipping Info</h3>
+                                                <p>Anthoula Wojczak<br />
+
+                                                    7700 Parmer Ave<br />
+
+
+
+                                                    Austin,  Texas, 78729<br />
+                                                    United States<br />
+                                                    T: <a href="tel:555-555-5555">555-555-5555</a>
+
+                                                </p>
+                                            </td>
+
+                                        </tr>
+                                        <tr>
+                                            <td class="method-info">
+                                                <h3>Payment Method</h3>
+                                                <dl class="payment-method checkmemo">
+                                                    <dt class="title">Check / Money order</dt>
+                                                </dl>
+
+                                            </td>
+
+                                            <td class="method-info">
+                                                <h3>Shipping Method</h3>
+                                                <p>Flat Rate - Fixed</p>
+
+                                            </td>
+
+                                        </tr>
+                                    </table>
+                                    <table class="email-items">
+                                        <thead>
+                                        <tr>
+                                            <th class="item-info">
+                                                Items                </th>
+                                            <th class="item-qty">
+                                                Qty                </th>
+                                            <th class="item-price">
+                                                Price                </th>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        <tr>
+                                            <td class="item-info">
+                                                <p class="product-name">bomb af tee shirt</p>
+                                                <p class="sku">SKU: bomb af tee shirt</p>
+                                            </td>
+                                            <td class="item-qty">1</td>
+                                            <td class="item-price">
+
+                                                <span class="price">$150.00</span>
+
+
+                                            </td>
+                                        </tr>
+                                        </tbody>
+                                        <tfoot class="order-totals">
+                                        <tr class="subtotal">
+                                            <th colspan="2" scope="row">
+                                                Subtotal                    </th>
+                                            <td  data-th="Subtotal">
+                                                <span class="price">$150.00</span>                    </td>
+                                        </tr>
+                                        <tr class="shipping">
+                                            <th colspan="2" scope="row">
+                                                Shipping &amp; Handling                    </th>
+                                            <td  data-th="Shipping &amp; Handling">
+                                                <span class="price">$5.00</span>                    </td>
+                                        </tr>
+                                        <tr class="grand_total">
+                                            <th colspan="2" scope="row">
+                                                <strong>Grand Total</strong>
+                                            </th>
+                                            <td  data-th="Grand Total">
+                                                <strong><span class="price">$155.00</span></strong>
+                                            </td>
+                                        </tr>
+                                        </tfoot>
+                                    </table>
+
+                                </td>
+                            </tr>
+                        </table>
+
+                        <!-- End Content -->
+                    </td>
+                </tr>
+                <tr>
+                    <td class="footer">
+                        <p class="closing">Thank you, Main Website Store!</p>
+                    </td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+</table>
+<!-- End wrapper table -->
+</body>
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
index 6dd32d8b13568..a8ebc79b9b7fc 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
@@ -75,5 +75,4 @@ public function process()
     {
         return $this->emogrifier->emogrify();
     }
-
-}
\ No newline at end of file
+}

From ff986bddaaf861b3948204f2e414397426bcce6d Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Thu, 24 Aug 2017 14:09:25 -0500
Subject: [PATCH 35/85] MAGETWO-64085: [GitHub] Static versioning and styles
 minification break email fonts styles #8241

- fix adapter dependency not add collaborator in constructor to 3rd party libraries
---
 .../Framework/Css/PreProcessor/Adapter/CssInliner.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
index a8ebc79b9b7fc..486152e510c78 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
@@ -4,8 +4,12 @@
  * See COPYING.txt for license details.
  */
 namespace Magento\Framework\Css\PreProcessor\Adapter;
+
 use Pelago\Emogrifier;
 
+/**
+ * Adapter for Emogrifier 3rd party library
+ */
 class CssInliner
 {
     /**
@@ -13,12 +17,9 @@ class CssInliner
      */
     private $emogrifier;
 
-    /**
-     * @param Emogrifier $emogrifier
-     */
-    public function __construct(Emogrifier $emogrifier)
+    public function __construct()
     {
-        $this->emogrifier = $emogrifier;
+        $this->emogrifier = new Emogrifier;
     }
 
     /**

From 066836e7caa49cedcd4d67bc4df67c518a79a18d Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Thu, 24 Aug 2017 15:25:37 -0500
Subject: [PATCH 36/85] MAGETWO-71708: [Staging] Cannot create staging update
 for product with unique attribute in set

---
 .../Eav/Model/Entity/AbstractEntity.php       | 18 +++++---
 .../Magento/Catalog/Model/ProductTest.php     | 41 +++++++++++++++++++
 2 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
index 525efdb60bb1f..d1105333a0f4d 100644
--- a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
+++ b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
@@ -767,7 +767,7 @@ public function getEntityIdField()
      */
     public function getValueEntityIdField()
     {
-        return $this->getEntityIdField();
+        return $this->getLinkField();
     }
 
     /**
@@ -885,13 +885,15 @@ public function checkAttributeUniqueValue(AbstractAttribute $attribute, $object)
     {
         $connection = $this->getConnection();
         $select = $connection->select();
+
+        $entityIdField = $this->getEntityIdField();
         if ($attribute->getBackend()->getType() === 'static') {
             $value = $object->getData($attribute->getAttributeCode());
             $bind = ['value' => trim($value)];
 
             $select->from(
                 $this->getEntityTable(),
-                $this->getEntityIdField()
+                $entityIdField
             )->where(
                 $attribute->getAttributeCode() . ' = :value'
             );
@@ -904,9 +906,12 @@ public function checkAttributeUniqueValue(AbstractAttribute $attribute, $object)
                 'attribute_id' => $attribute->getId(),
                 'value' => trim($value),
             ];
+
+            $backend = $attribute->getBackend();
+            $entityIdField = $backend->getEntityIdField();
             $select->from(
-                $attribute->getBackend()->getTable(),
-                $object->getResource()->getLinkField()
+                $backend->getTable(),
+                $entityIdField
             )->where(
                 'attribute_id = :attribute_id'
             )->where(
@@ -921,9 +926,10 @@ public function checkAttributeUniqueValue(AbstractAttribute $attribute, $object)
 
         $data = $connection->fetchCol($select, $bind);
 
-        if ($object->getId()) {
+        $objectId = $object->getData($entityIdField);
+        if ($objectId) {
             if (isset($data[0])) {
-                return $data[0] == $object->getId();
+                return $data[0] == $objectId;
             }
             return true;
         }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
index a7beb104e39f0..99a1e9309f6e9 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
@@ -487,6 +487,47 @@ public function testValidateUniqueInputAttributeValue()
         );
     }
 
+    /**
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Catalog/_files/products_with_unique_input_attribute.php
+     */
+    public function testValidateUniqueInputAttributeOnTheSameProduct()
+    {
+        /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
+        $attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
+            ->loadByCode(\Magento\Catalog\Model\Product::ENTITY, 'unique_input_attribute');
+        $this->_model = $this->_model->loadByAttribute(
+            'sku',
+            'simple product with unique input attribute'
+        );
+        $this->_model->setTypeId(
+            'simple'
+        )->setAttributeSetId(
+            4
+        )->setName(
+            'Simple Product with non-unique value'
+        )->setSku(
+            'some product SKU'
+        )->setPrice(
+            10
+        )->setMetaTitle(
+            'meta title'
+        )->setData(
+            $attribute->getAttributeCode(),
+            'unique value'
+        )->setVisibility(
+            \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH
+        )->setStatus(
+            \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
+        )->setCollectExceptionMessages(
+            true
+        );
+
+        $validationResult = $this->_model->validate();
+        $this->assertTrue($validationResult);
+    }
+
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_simple_with_custom_options.php
      * @magentoAppIsolation enabled

From 234899d5e060e9cc5002fbab61cc6ec8cad09700 Mon Sep 17 00:00:00 2001
From: Tommy Wiebell <twiebell@magento.com>
Date: Thu, 24 Aug 2017 16:15:51 -0500
Subject: [PATCH 37/85] MAGETWO-71013: Export missing configurable variations
 when exporting more than one item

- Clean up formatting, unused variables, and documentation
- Add optional dependencies to support running new Import/Replace w/ pagination
---
 .../AbstractProductExportImportTestCase.php   | 54 ++++++++++++++-----
 .../_files/product_export_data.php            |  2 -
 .../Model/ConfigurableTest.php                | 23 ++------
 3 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php
index 0d256e1ed0663..efbc8c36409af 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php
@@ -6,7 +6,6 @@
 namespace Magento\CatalogImportExport\Model;
 
 use Magento\Framework\App\Bootstrap;
-use Magento\Framework\App\Config;
 use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
@@ -16,11 +15,6 @@
  */
 abstract class AbstractProductExportImportTestCase extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @var \Magento\CatalogImportExport\Model\Export\Product
-     */
-    protected $model;
-
     /**
      * @var \Magento\Framework\ObjectManagerInterface
      */
@@ -61,8 +55,6 @@ abstract class AbstractProductExportImportTestCase extends \PHPUnit\Framework\Te
 
     protected function setUp()
     {
-        parent::setUp();
-
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $this->fileSystem = $this->objectManager->get(\Magento\Framework\Filesystem::class);
         $this->productResource = $this->objectManager->create(
@@ -262,9 +254,33 @@ public function testImportReplace($fixtures, $skus, $skippedAttributes = [])
     }
 
     /**
+     * @magentoAppArea adminhtml
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     *
+     * @param array $fixtures
+     * @param string[] $skus
+     * @param string[] $skippedAttributes
+     * @dataProvider importReplaceDataProvider
+     */
+    public function testImportReplaceWithPagination($fixtures, $skus, $skippedAttributes = [])
+    {
+        $this->fixtures = $fixtures;
+        $this->executeFixtures($fixtures, $skus);
+        $this->modifyData($skus);
+        $skippedAttributes = array_merge(self::$skippedAttributes, $skippedAttributes);
+        $this->executeImportReplaceTest($skus, $skippedAttributes, true);
+    }
+
+    /**
+     * @param string[] $skus
+     * @param string[] $skippedAttributes
+     * @param bool $usePagination
+     *
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    protected function executeImportReplaceTest($skus, $skippedAttributes)
+    protected function executeImportReplaceTest($skus, $skippedAttributes, $usePagination = false)
     {
         $replacedAttributes = [
             'row_id',
@@ -285,7 +301,18 @@ protected function executeImportReplaceTest($skus, $skippedAttributes)
             $index++;
         }
 
-        $csvfile = $this->exportProducts();
+        $exportProduct = $this->objectManager->create(\Magento\CatalogImportExport\Model\Export\Product::class);
+        if ($usePagination) {
+            /** @var \ReflectionProperty $itemsPerPageProperty */
+            $itemsPerPageProperty = $this->objectManager->create(\ReflectionProperty::class, [
+                'class' => \Magento\CatalogImportExport\Model\Export\Product::class,
+                'name' => '_itemsPerPage'
+            ]);
+            $itemsPerPageProperty->setAccessible(true);
+            $itemsPerPageProperty->setValue($exportProduct, 1);
+        }
+
+        $csvfile = $this->exportProducts($exportProduct);
         $this->importProducts($csvfile, \Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE);
 
         while ($index > 0) {
@@ -326,13 +353,16 @@ protected function executeImportReplaceTest($skus, $skippedAttributes)
     /**
      * Export products in the system
      *
+     * @param \Magento\CatalogImportExport\Model\Export\Product|null $exportProduct
      * @return string Return exported file name
      */
-    private function exportProducts()
+    private function exportProducts(\Magento\CatalogImportExport\Model\Export\Product $exportProduct = null)
     {
         $csvfile = uniqid('importexport_') . '.csv';
 
-        $exportProduct = $this->objectManager->create(\Magento\CatalogImportExport\Model\Export\Product::class);
+        $exportProduct = $exportProduct ?: $this->objectManager->create(
+            \Magento\CatalogImportExport\Model\Export\Product::class
+        );
         $exportProduct->setWriter(
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
                 \Magento\ImportExport\Model\Export\Adapter\Csv::class,
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data.php
index 3b946bef1bdc8..5157874172579 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data.php
@@ -79,8 +79,6 @@
     \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
 )->setWebsiteIds(
     [1]
-)->setCateroryIds(
-    []
 )->setStockData(
     ['qty' => 100, 'is_in_stock' => 1]
 )->setCanSaveCustomOptions(
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/ConfigurableTest.php
index 2a2b4cb223118..5184a37563317 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/ConfigurableTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/ConfigurableTest.php
@@ -39,10 +39,10 @@ public function exportImportDataProvider()
      */
     protected function assertEqualsSpecificAttributes($expectedProduct, $actualProduct)
     {
-        /** @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable $prooductType */
-        $prooductType = $expectedProduct->getTypeInstance();
-        $expectedAssociatedProducts = $prooductType->getUsedProductCollection($expectedProduct);
-        $actualAssociatedProducts = iterator_to_array($prooductType->getUsedProductCollection($actualProduct));
+        /** @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable $productType */
+        $productType = $expectedProduct->getTypeInstance();
+        $expectedAssociatedProducts = $productType->getUsedProductCollection($expectedProduct);
+        $actualAssociatedProducts = iterator_to_array($productType->getUsedProductCollection($actualProduct));
 
         $expectedAssociatedProductSkus = [];
         $actualAssociatedProductSkus = [];
@@ -103,19 +103,4 @@ public function importReplaceDataProvider()
         }
         return $data;
     }
-
-    /**
-     * @magentoAppArea adminhtml
-     * @magentoDbIsolation enabled
-     * @magentoAppIsolation enabled
-     *
-     * @param array $fixtures
-     * @param string[] $skus
-     * @param string[] $skippedAttributes
-     * @dataProvider importReplaceDataProvider
-     */
-    public function testImportReplace($fixtures, $skus, $skippedAttributes = [])
-    {
-        parent::testImportReplace($fixtures, $skus, $skippedAttributes);
-    }
 }

From e8e230c41bb976db869670ea6b9a8a7988974f88 Mon Sep 17 00:00:00 2001
From: Tommy Wiebell <twiebell@magento.com>
Date: Thu, 24 Aug 2017 17:36:46 -0500
Subject: [PATCH 38/85] MAGETWO-71013: Export missing configurable variations
 when exporting more than one item

- Make sure Downloadable and Gift Card import tests are skipped until MAGETWO-38240 is completed
---
 .../Model/DownloadableTest.php                  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/DownloadableImportExport/Model/DownloadableTest.php b/dev/tests/integration/testsuite/Magento/DownloadableImportExport/Model/DownloadableTest.php
index 668ad7068b4a7..c80cd13a1683b 100644
--- a/dev/tests/integration/testsuite/Magento/DownloadableImportExport/Model/DownloadableTest.php
+++ b/dev/tests/integration/testsuite/Magento/DownloadableImportExport/Model/DownloadableTest.php
@@ -81,6 +81,23 @@ public function testImportReplace($fixtures, $skus, $skippedAttributes = [], $ro
         $this->markTestSkipped('Uncomment after MAGETWO-38240 resolved');
     }
 
+    /**
+     * @magentoAppArea adminhtml
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     *
+     * @param array $fixtures
+     * @param string[] $skus
+     * @param string[] $skippedAttributes
+     * @dataProvider importReplaceDataProvider
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function testImportReplaceWithPagination($fixtures, $skus, $skippedAttributes = [])
+    {
+        $this->markTestSkipped('Uncomment after MAGETWO-38240 resolved');
+    }
+
     /**
      * @param \Magento\Catalog\Model\Product $expectedProduct
      * @param \Magento\Catalog\Model\Product $actualProduct

From 48da96db39b9f704f05e825309eb2b114149cd6b Mon Sep 17 00:00:00 2001
From: Michael Yu <hyu@magento.com>
Date: Thu, 24 Aug 2017 22:50:33 -0500
Subject: [PATCH 39/85] MAGETWO-71415 [The system grids] Mass actions process
 only 20 elements from all selected - Utilize built in function on
 dataProvider to produce the same outcome.

---
 .../Adminhtml/Index/AbstractMassAction.php    |  2 +-
 .../Ui/Component/MassAction/Filter.php        | 26 ++++++++-----------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php
index 3263f1e799029..ebab2a42a02ec 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php
@@ -61,7 +61,7 @@ public function __construct(Context $context, Filter $filter, CollectionFactory
     public function execute()
     {
         try {
-            $collection = $this->filter->getCollection($this->collectionFactory->create(), false);
+            $collection = $this->filter->getCollection($this->collectionFactory->create());
             return $this->massAction($collection);
         } catch (\Exception $e) {
             $this->messageManager->addError($e->getMessage());
diff --git a/app/code/Magento/Ui/Component/MassAction/Filter.php b/app/code/Magento/Ui/Component/MassAction/Filter.php
index a3ae32c6840d0..6b089233c210a 100644
--- a/app/code/Magento/Ui/Component/MassAction/Filter.php
+++ b/app/code/Magento/Ui/Component/MassAction/Filter.php
@@ -82,11 +82,10 @@ public function getComponent()
      * Adds filters to collection using DataProvider filter results
      *
      * @param AbstractDb $collection
-     * @param bool $limit for limiting maximum amount of query results
      * @return AbstractDb
      * @throws LocalizedException
      */
-    public function getCollection(AbstractDb $collection, $limit = true)
+    public function getCollection(AbstractDb $collection)
     {
         $selected = $this->request->getParam(static::SELECTED_PARAM);
         $excluded = $this->request->getParam(static::EXCLUDED_PARAM);
@@ -100,7 +99,7 @@ public function getCollection(AbstractDb $collection, $limit = true)
             }
         }
         /** @var \Magento\Customer\Model\ResourceModel\Customer\Collection $collection */
-        $idsArray = $this->getFilterIds($limit);
+        $idsArray = $this->getFilterIds();
         if (!empty($idsArray)) {
             $collection->addFieldToFilter(
                 $collection->getIdFieldName(),
@@ -213,10 +212,10 @@ private function getDataProvider()
 
     /**
      * Get filter ids as array
-     * @param bool $limit
+     *
      * @return int[]
      */
-    private function getFilterIds($limit = true)
+    private function getFilterIds()
     {
         $idsArray = [];
         $this->applySelectionOnTargetProvider();
@@ -224,16 +223,13 @@ private function getFilterIds($limit = true)
             // Use collection's getAllIds for optimization purposes.
             $idsArray = $this->getDataProvider()->getAllIds();
         } else {
-            $searchResult = $this->getDataProvider()->getSearchResult();
-            if ($limit) {
-                // Use compatible search api getItems when searchResult is not a collection.
-                foreach ($searchResult->getItems() as $item) {
-                    /** @var $item \Magento\Framework\Api\Search\DocumentInterface */
-                    $idsArray[] = $item->getId();
-                }
-            } else {
-                //Grab all selected even if they are not on the current page.
-                $idsArray = $searchResult->getAllIds();
+            $dataProvider = $this->getDataProvider();
+            $dataProvider->setLimit(0, false);
+            $searchResult = $dataProvider->getSearchResult();
+            // Use compatible search api getItems when searchResult is not a collection.
+            foreach ($searchResult->getItems() as $item) {
+                /** @var $item \Magento\Framework\Api\Search\DocumentInterface */
+                $idsArray[] = $item->getId();
             }
         }
         return  $idsArray;

From 4015fc8a6211c12c8b775bdce45428da13ecc21f Mon Sep 17 00:00:00 2001
From: rossbrandon <rbrandon@magento.com>
Date: Fri, 25 Aug 2017 10:41:19 -0500
Subject: [PATCH 40/85] MAGETWO-71826: @api annotation is missing for
 Magento\Framework\Convert\DataObject

@author changed to @api annotation on Magento\Framework\Convert\DataObject
---
 lib/internal/Magento/Framework/Convert/DataObject.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Convert/DataObject.php b/lib/internal/Magento/Framework/Convert/DataObject.php
index 2df415a94e015..ec0cd73e98bb8 100644
--- a/lib/internal/Magento/Framework/Convert/DataObject.php
+++ b/lib/internal/Magento/Framework/Convert/DataObject.php
@@ -7,7 +7,7 @@
 /**
  * Default converter for \Magento\Framework\DataObjects to arrays
  *
- * @author     Magento Extensibility Team <DL-X-Extensibility-Team@corp.ebay.com>
+ * @api
  */
 namespace Magento\Framework\Convert;
 

From 0788e64d226c813270f597dda05d1c38f39082b0 Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Fri, 25 Aug 2017 16:07:29 -0500
Subject: [PATCH 41/85] MAGETWO-71708: [Staging] Cannot create staging update
 for product with unique attribute in set

---
 app/code/Magento/Eav/Model/Entity/AbstractEntity.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
index d1105333a0f4d..51351490061fc 100644
--- a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
+++ b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
@@ -887,7 +887,8 @@ public function checkAttributeUniqueValue(AbstractAttribute $attribute, $object)
         $select = $connection->select();
 
         $entityIdField = $this->getEntityIdField();
-        if ($attribute->getBackend()->getType() === 'static') {
+        $attributeBackend = $attribute->getBackend();
+        if ($attributeBackend->getType() === 'static') {
             $value = $object->getData($attribute->getAttributeCode());
             $bind = ['value' => trim($value)];
 
@@ -899,7 +900,7 @@ public function checkAttributeUniqueValue(AbstractAttribute $attribute, $object)
             );
         } else {
             $value = $object->getData($attribute->getAttributeCode());
-            if ($attribute->getBackend()->getType() == 'datetime') {
+            if ($attributeBackend->getType() == 'datetime') {
                 $value = (new \DateTime($value))->format('Y-m-d H:i:s');
             }
             $bind = [
@@ -907,10 +908,9 @@ public function checkAttributeUniqueValue(AbstractAttribute $attribute, $object)
                 'value' => trim($value),
             ];
 
-            $backend = $attribute->getBackend();
-            $entityIdField = $backend->getEntityIdField();
+            $entityIdField = $attributeBackend->getEntityIdField();
             $select->from(
-                $backend->getTable(),
+                $attributeBackend->getTable(),
                 $entityIdField
             )->where(
                 'attribute_id = :attribute_id'

From 627019b9bce4eef627eedd66ad44d64c6d351cbc Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Fri, 25 Aug 2017 16:29:12 -0500
Subject: [PATCH 42/85] MAGETWO-64085: Static versioning and styles
 minification break email fonts styles #8241

- fix code
---
 .../Magento/Email/Model/Template/Filter.php   | 20 +++++++++++++-----
 .../Magento/Widget/Model/Template/Filter.php  |  6 +++---
 .../Css/PreProcessor/Adapter/CssInliner.php   | 21 ++++++++-----------
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index 14b6e014c65c4..3d479d20e4f51 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -148,10 +148,16 @@ class Filter extends \Magento\Framework\Filter\Template
      */
     protected $urlModel;
 
+    /**
+     * @var \Pelago\Emogrifier
+     * @deprecated
+     */
+    protected $emogrifier;
+
     /**
      * @var \Magento\Framework\Css\PreProcessor\Adapter\CssInliner
      */
-    protected $cssInliner;
+    private $cssInliner;
 
     /**
      * @var \Magento\Email\Model\Source\Variables
@@ -180,9 +186,10 @@ class Filter extends \Magento\Framework\Filter\Template
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\UrlInterface $urlModel
-     * @param \Magento\Framework\Css\PreProcessor\Adapter\CssInliner $cssInliner
+     * @param \Pelago\Emogrifier $emogrifier
      * @param \Magento\Email\Model\Source\Variables $configVariables
      * @param array $variables
+     * @param \Magento\Framework\Css\PreProcessor\Adapter\CssInliner|null $cssInliner
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -198,9 +205,10 @@ public function __construct(
         \Magento\Framework\View\LayoutFactory $layoutFactory,
         \Magento\Framework\App\State $appState,
         \Magento\Framework\UrlInterface $urlModel,
-        \Magento\Framework\Css\PreProcessor\Adapter\CssInliner $cssInliner,
+        \Pelago\Emogrifier $emogrifier,
         \Magento\Email\Model\Source\Variables $configVariables,
-        $variables = []
+        $variables = [],
+        \Magento\Framework\Css\PreProcessor\Adapter\CssInliner $cssInliner = null
     ) {
         $this->_escaper = $escaper;
         $this->_assetRepo = $assetRepo;
@@ -213,7 +221,9 @@ public function __construct(
         $this->_layoutFactory = $layoutFactory;
         $this->_appState = $appState;
         $this->urlModel = $urlModel;
-        $this->cssInliner = $cssInliner;
+        $this->emogrifier = $emogrifier;
+        $this->cssInliner = $cssInliner ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Css\PreProcessor\Adapter\CssInliner::class);
         $this->configVariables = $configVariables;
         parent::__construct($string, $variables);
     }
diff --git a/app/code/Magento/Widget/Model/Template/Filter.php b/app/code/Magento/Widget/Model/Template/Filter.php
index 88a0b707a0b6a..273a4aaf1fa37 100644
--- a/app/code/Magento/Widget/Model/Template/Filter.php
+++ b/app/code/Magento/Widget/Model/Template/Filter.php
@@ -33,7 +33,7 @@ class Filter extends \Magento\Cms\Model\Template\Filter
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\UrlInterface $urlModel
-     * @param \Magento\Framework\Css\PreProcessor\Adapter\CssInliner $cssInliner
+     * @param \Pelago\Emogrifier $emogrifier
      * @param \Magento\Email\Model\Source\Variables $configVariables
      * @param \Magento\Widget\Model\ResourceModel\Widget $widgetResource
      * @param \Magento\Widget\Model\Widget $widget
@@ -51,7 +51,7 @@ public function __construct(
         \Magento\Framework\View\LayoutFactory $layoutFactory,
         \Magento\Framework\App\State $appState,
         \Magento\Framework\UrlInterface $urlModel,
-        \Magento\Framework\Css\PreProcessor\Adapter\CssInliner $cssInliner,
+        \Pelago\Emogrifier $emogrifier,
         \Magento\Email\Model\Source\Variables $configVariables,
         \Magento\Widget\Model\ResourceModel\Widget $widgetResource,
         \Magento\Widget\Model\Widget $widget
@@ -70,7 +70,7 @@ public function __construct(
             $layoutFactory,
             $appState,
             $urlModel,
-            $cssInliner,
+            $emogrifier,
             $configVariables
         );
     }
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
index 486152e510c78..91d8d45b2556c 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
@@ -19,14 +19,14 @@ class CssInliner
 
     public function __construct()
     {
-        $this->emogrifier = new Emogrifier;
+        $this->emogrifier = new Emogrifier();
     }
 
     /**
-     * Sets the HTML to emogrify.
-     *
-     * @param string $html the HTML to emogrify, must be UTF-8-encoded
+     * Sets the HTML to be used with the css.
+     * This method should be used with setCss.
      *
+     * @param string $html
      * @return void
      */
     public function setHtml($html)
@@ -35,10 +35,10 @@ public function setHtml($html)
     }
 
     /**
-     * Sets the CSS to merge with the HTML.
-     *
-     * @param string $css the CSS to merge, must be UTF-8-encoded
+     * Sets the CSS to be merged with the HTML.
+     * This method should be used with setHtml.
      *
+     * @param string $css
      * @return void
      */
     public function setCss($css)
@@ -63,13 +63,10 @@ public function disableStyleBlocksParsing()
     }
 
     /**
-     * Applies $this->css to $this->html and returns the HTML with the CSS
-     * applied.
-     *
-     * This method places the CSS inline.
+     * Processes the html by placing the css inline.
+     * You must set first the css by using setCss and html by using setHtml.
      *
      * @return string
-     *
      * @throws \BadMethodCallException
      */
     public function process()

From 333471ed44defb5e28be9fe212feaf3163ba3315 Mon Sep 17 00:00:00 2001
From: Sergii Kovalenko <skovalenko@magento.com>
Date: Mon, 28 Aug 2017 11:51:52 +0300
Subject: [PATCH 43/85] MAGETWO-71841: Caching issue with tier prices

---
 .../Block/Product/View/Type/Configurable.php  |  12 +-
 .../Product/View/Type/ConfigurableTest.php    | 118 +++++++++++++++++-
 2 files changed, 128 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
index ec0bf3cd451d6..9273695ad3598 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
@@ -9,6 +9,7 @@
 
 use Magento\ConfigurableProduct\Model\ConfigurableAttributeData;
 use Magento\Customer\Helper\Session\CurrentCustomer;
+use Magento\Customer\Model\Session;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Locale\Format;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
@@ -67,6 +68,11 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
      */
     private $localeFormat;
 
+    /**
+     * @var Session
+     */
+    private $customerSession;
+
     /**
      * @param \Magento\Catalog\Block\Product\Context $context
      * @param \Magento\Framework\Stdlib\ArrayUtils $arrayUtils
@@ -78,6 +84,7 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
      * @param ConfigurableAttributeData $configurableAttributeData
      * @param array $data
      * @param Format|null $localeFormat
+     * @param Session|null $customerSession
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -90,7 +97,8 @@ public function __construct(
         PriceCurrencyInterface $priceCurrency,
         ConfigurableAttributeData $configurableAttributeData,
         array $data = [],
-        Format $localeFormat = null
+        Format $localeFormat = null,
+        Session $customerSession = null
     ) {
         $this->priceCurrency = $priceCurrency;
         $this->helper = $helper;
@@ -99,6 +107,7 @@ public function __construct(
         $this->currentCustomer = $currentCustomer;
         $this->configurableAttributeData = $configurableAttributeData;
         $this->localeFormat = $localeFormat ?: ObjectManager::getInstance()->get(Format::class);
+        $this->customerSession = $customerSession ?: ObjectManager::getInstance()->get(Session::class);
 
         parent::__construct(
             $context,
@@ -117,6 +126,7 @@ public function getCacheKeyInfo()
     {
         $parentData = parent::getCacheKeyInfo();
         $parentData[] = $this->priceCurrency->getCurrencySymbol();
+        $parentData[] = $this->customerSession->getCustomerGroupId();
         return $parentData;
     }
 
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php
index 293ed9ecb8a38..1908d897be6da 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\ConfigurableProduct\Test\Unit\Block\Product\View\Type;
 
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\State;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -65,6 +68,11 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
      */
     private $storeManager;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerSession;
+
     protected function setUp()
     {
         $this->mockContextObject();
@@ -92,6 +100,28 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $appState = $this->getMockBuilder(State::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->context->expects($this->once())
+            ->method('getAppState')
+            ->willReturn($appState);
+        $appState->expects($this->any())
+            ->method('getAreaCode')
+            ->willReturn('frontend');
+        $urlBuilder = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->context->expects($this->once())
+            ->method('getUrlBuilder')
+            ->willReturn($urlBuilder);
+        $fileResolverMock = $this
+            ->getMockBuilder(\Magento\Framework\View\Element\Template\File\Resolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->context->expects($this->once())
+            ->method('getResolver')
+            ->willReturn($fileResolverMock);
         $this->configurableAttributeData = $this->getMockBuilder(
             \Magento\ConfigurableProduct\Model\ConfigurableAttributeData::class
         )
@@ -102,6 +132,10 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->customerSession = $this->getMockBuilder(Session::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->block = new \Magento\ConfigurableProduct\Block\Product\View\Type\Configurable(
             $this->context,
             $this->arrayUtils,
@@ -112,10 +146,92 @@ protected function setUp()
             $this->priceCurrency,
             $this->configurableAttributeData,
             [],
-            $this->localeFormat
+            $this->localeFormat,
+            $this->customerSession
         );
     }
 
+    /**
+     * Provide cache key info
+     *
+     * @return array
+     */
+    public function cacheKeyProvider() : array
+    {
+        return [
+            'without_currency_and_customer_group' => [
+                [
+                    0 => 'BLOCK_TPL',
+                    1 => 'default',
+                    2 => null,
+                    'base_url' => null,
+                    'template' => null,
+                    3 => null,
+                    4 => null,
+                ],
+                null,
+                null,
+            ],
+            'with_customer_group' => [
+                [
+                    0 => 'BLOCK_TPL',
+                    1 => 'default',
+                    2 => null,
+                    'base_url' => null,
+                    'template' => null,
+                    3 => null,
+                    4 => 1,
+                ],
+                null,
+                1,
+            ],
+            'with_price_currency' => [
+                [
+                    0 => 'BLOCK_TPL',
+                    1 => 'default',
+                    2 => null,
+                    'base_url' => null,
+                    'template' => null,
+                    3 => '$',
+                    4 => null,
+                ],
+                '$',
+                null,
+            ]
+        ];
+    }
+
+    /**
+     * Test cache Tags
+     * @dataProvider cacheKeyProvider
+     * @param array $expected
+     * @param string|null $priceCurrency
+     * @param string|null $customerGroupId
+     */
+    public function testGetCacheKeyInfo(array $expected, string $priceCurrency = null, string $customerGroupId = null)
+    {
+        $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+            ->setMethods([
+                'getCurrentCurrency',
+            ])
+            ->getMockForAbstractClass();
+        $storeMock->expects($this->any())
+            ->method('getCode')
+            ->willReturn('default');
+
+        $this->storeManager->expects($this->any())
+            ->method('getStore')
+            ->willReturn($storeMock);
+        $this->priceCurrency->expects($this->once())
+            ->method('getCurrencySymbol')
+            ->willReturn($priceCurrency);
+        $this->customerSession->expects($this->once())
+            ->method('getCustomerGroupId')
+            ->willReturn($customerGroupId);
+        $actual = $this->block->getCacheKeyInfo();
+        $this->assertEquals($expected, $actual);
+    }
+
     /**
      * Check that getJsonConfig() method returns expected value
      */

From 6df5857cfe27637263e751781899a35944f3662e Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@magento.com>
Date: Mon, 28 Aug 2017 12:45:57 +0300
Subject: [PATCH 44/85] MAGETWO-70603: Impossible add gift options on order
 level if use secure url

---
 .../Magento/GiftMessage/Model/GiftMessageConfigProvider.php  | 4 +---
 .../Test/Unit/Model/GiftMessageConfigProviderTest.php        | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php b/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php
index bd64856def172..c7f145eaddbb4 100644
--- a/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php
+++ b/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php
@@ -119,9 +119,7 @@ public function getConfig()
         $configuration['isCustomerLoggedIn'] = $this->isCustomerLoggedIn();
         $configuration['formKey'] = $this->formKey->getFormKey();
         $store = $this->storeManager->getStore();
-        $configuration['baseUrl'] = $store->isFrontUrlSecure()
-                ? $store->getBaseUrl(UrlInterface::URL_TYPE_LINK, true)
-                : $store->getBaseUrl(UrlInterface::URL_TYPE_LINK, false);
+        $configuration['baseUrl'] = $store->getBaseUrl(UrlInterface::URL_TYPE_LINK);
         return $configuration;
     }
 
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageConfigProviderTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageConfigProviderTest.php
index d0afbb018f298..999120710bf7f 100644
--- a/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageConfigProviderTest.php
+++ b/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageConfigProviderTest.php
@@ -104,7 +104,7 @@ public function testGetConfig()
         $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
         $storeMock = $this->createPartialMock(
             \Magento\Store\Model\Store::class,
-            ['isFrontUrlSecure', 'getBaseUrl', 'getCode']
+            ['getBaseUrl', 'getCode']
         );
         $quoteMock = $this->createPartialMock(
             \Magento\Quote\Model\Quote::class,
@@ -142,8 +142,7 @@ public function testGetConfig()
             ->willReturn($isCustomerLoggedIn);
         $this->formKeyMock->expects($this->once())->method('getFormKey')->willReturn($formKey);
         $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($storeMock);
-        $storeMock->expects($this->once())->method('isFrontUrlSecure')->willReturn($isFrontUrlSecure);
-        $storeMock->expects($this->once())->method('getBaseUrl')->with(UrlInterface::URL_TYPE_LINK, $isFrontUrlSecure)
+        $storeMock->expects($this->once())->method('getBaseUrl')->with(UrlInterface::URL_TYPE_LINK)
             ->willReturn($baseUrl);
 
         $expectedResult = [

From d3db46bea393396cc20ffb8c946cd2c1d09cb7b0 Mon Sep 17 00:00:00 2001
From: Sergii Kovalenko <skovalenko@magento.com>
Date: Mon, 28 Aug 2017 16:27:44 +0300
Subject: [PATCH 45/85] MAGETWO-71841: Caching issue with tier prices

---
 .../ConfigurableProduct/Block/Product/View/Type/Configurable.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
index 9273695ad3598..edd18cd7ffbc7 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
@@ -32,6 +32,7 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
     /**
      * Current customer
      *
+     * @deprecated, as unused property
      * @var CurrentCustomer
      */
     protected $currentCustomer;

From 3f2295fc131d879b853e521fee3b989f234196a3 Mon Sep 17 00:00:00 2001
From: Alexander Menk <alex.menk@gmail.com>
Date: Tue, 29 Aug 2017 14:57:04 +0200
Subject: [PATCH 46/85] Allow browser back/forward button to shipping step

- Set visibility (before just everything disappeared when going back to the shipping step)
- The comment was misleading
---
 .../Magento/Checkout/view/frontend/web/js/view/shipping.js   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
index 8a8c32042c5e8..65ce1fbee2948 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
@@ -126,11 +126,8 @@ define([
             return this;
         },
 
-        /**
-         * Load data from server for shipping step
-         */
         navigate: function () {
-            //load data from server for shipping step
+            this.isVisible(true);
         },
 
         /**

From 7b5d42a0516721ec158e9ec20e28738844b159b5 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Tue, 29 Aug 2017 10:07:25 -0500
Subject: [PATCH 47/85] MAGETWO-64085: Static versioning and styles
 minification break email fonts styles #8241

- fix unit test
---
 .../Email/Test/Unit/Model/Template/FilterTest.php     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
index 5eaa65b495133..039f79c588884 100644
--- a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
@@ -87,6 +87,12 @@ class FilterTest extends \PHPUnit\Framework\TestCase
      */
     private $emogrifier;
 
+    /**
+     * @var \Magento\Framework\Css\PreProcessor\Adapter\CssInliner
+     */
+    private $cssInliner;
+
+
     protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -140,6 +146,10 @@ protected function setUp()
         $this->configVariables = $this->getMockBuilder(\Magento\Email\Model\Source\Variables::class)
             ->disableOriginalConstructor()
             ->getMock();
+
+        $this->cssInliner = $this->objectManager->getObject(
+            \Magento\Framework\Css\PreProcessor\Adapter\CssInliner::class
+        );
     }
 
     /**
@@ -164,6 +174,7 @@ protected function getModel($mockedMethods = null)
                 $this->emogrifier,
                 $this->configVariables,
                 [],
+                $this->cssInliner,
             ])
             ->setMethods($mockedMethods)
             ->getMock();

From 4dbeed55db51f5fc21f1b1d8e12f44f0429563cb Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Tue, 29 Aug 2017 10:19:06 -0500
Subject: [PATCH 48/85] MAGETWO-64085: Static versioning and styles
 minification break email fonts styles #8241

- fix unit test
---
 .../Framework/Css/PreProcessor/Adapter/CssInlinerTest.php     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php
index 95ed79d4e7207..f1468f718df61 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Framework\Css\PreProcessor\Adapter;
@@ -60,8 +60,6 @@ public function getFilesDataProvider()
         ];
     }
 
-
-
     /**
      * @param string $htmlFilePath
      * @param string $cssFilePath

From 10e896db83215e1fc71ef1e6b1d6fff2a33633de Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Tue, 29 Aug 2017 10:35:21 -0500
Subject: [PATCH 49/85] MAGETWO-64085: Static versioning and styles
 minification break email fonts styles #8241

- fix unit test
---
 app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
index 039f79c588884..8bfa2fc7d64cc 100644
--- a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
@@ -92,7 +92,6 @@ class FilterTest extends \PHPUnit\Framework\TestCase
      */
     private $cssInliner;
 
-
     protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);

From d4e302aa8e803e94e504514b68eb49b005d7a52b Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Tue, 29 Aug 2017 11:22:27 -0500
Subject: [PATCH 50/85] MAGETWO-64085: Static versioning and styles
 minification break email fonts styles #8241

- fix unit test
---
 .../Framework/Css/PreProcessor/Adapter/CssInliner.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
index 91d8d45b2556c..342283c312293 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
@@ -8,7 +8,7 @@
 use Pelago\Emogrifier;
 
 /**
- * Adapter for Emogrifier 3rd party library
+ * This class will inline the css of an html to each tag to be used for applications such as a styled email.
  */
 class CssInliner
 {
@@ -23,8 +23,7 @@ public function __construct()
     }
 
     /**
-     * Sets the HTML to be used with the css.
-     * This method should be used with setCss.
+     * Sets the HTML to be used with the css. This method should be used with setCss.
      *
      * @param string $html
      * @return void
@@ -35,8 +34,7 @@ public function setHtml($html)
     }
 
     /**
-     * Sets the CSS to be merged with the HTML.
-     * This method should be used with setHtml.
+     * Sets the CSS to be merged with the HTML. This method should be used with setHtml.
      *
      * @param string $css
      * @return void
@@ -63,8 +61,7 @@ public function disableStyleBlocksParsing()
     }
 
     /**
-     * Processes the html by placing the css inline.
-     * You must set first the css by using setCss and html by using setHtml.
+     * Processes the html by placing the css inline. Set first the css by using setCss and html by using setHtml.
      *
      * @return string
      * @throws \BadMethodCallException

From b27fd75d646353625764fa150bf16acc77caf8c1 Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@magento.com>
Date: Thu, 31 Aug 2017 09:34:35 +0300
Subject: [PATCH 51/85] MAGETWO-70603: Impossible add gift options on order
 level if use secure url

---
 .../Test/Unit/Model/GiftMessageConfigProviderTest.php            | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageConfigProviderTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageConfigProviderTest.php
index 999120710bf7f..a5580606134b4 100644
--- a/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageConfigProviderTest.php
+++ b/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageConfigProviderTest.php
@@ -98,7 +98,6 @@ public function testGetConfig()
         $storeCode = 4;
         $messageDataMock = ['from' => 'John Doe', 'to' => 'Jane Doe'];
         $formKey = 'ABCDEFGHIJKLMNOP';
-        $isFrontUrlSecure = true;
         $baseUrl = 'https://magento.com/';
         $quoteItemMock = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
         $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);

From 093e742c209530c03c5d9e9abf91c20c40013244 Mon Sep 17 00:00:00 2001
From: nowszy <kontakt@pnowak.pl>
Date: Fri, 1 Sep 2017 14:43:35 +0200
Subject: [PATCH 52/85] #10738

Fix for translated attribute label comparisson. Refs #10738
---
 .../view/frontend/templates/product/view/attribute.phtml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml
index 2f62315830308..9bfc67a6c794f 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml
@@ -34,7 +34,7 @@ if ($_attributeType && $_attributeType == 'text') {
 
 <?php if ($_attributeValue): ?>
 <div class="product attribute <?= /* @escapeNotVerified */ $_className ?>">
-    <?php if ($_attributeLabel != 'none'): ?><strong class="type"><?= /* @escapeNotVerified */ $_attributeLabel ?></strong><?php endif; ?>
+    <?php if ($_attributeLabel != __('none')): ?><strong class="type"><?= /* @escapeNotVerified */ $_attributeLabel ?></strong><?php endif; ?>
     <div class="value" <?= /* @escapeNotVerified */ $_attributeAddAttribute ?>><?= /* @escapeNotVerified */ $_attributeValue ?></div>
 </div>
 <?php endif; ?>

From d59a428dbdb75074c74a4543dc78f55afdd3dac3 Mon Sep 17 00:00:00 2001
From: jissereitsma <jisse@yireo.com>
Date: Sun, 3 Sep 2017 10:24:55 +0200
Subject: [PATCH 53/85] Fix minor type "consturctor" > "constructor"

---
 app/code/Magento/Ui/view/base/web/js/lib/core/class.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/lib/core/class.js b/app/code/Magento/Ui/view/base/web/js/lib/core/class.js
index aae3ca31bf803..d835fa82ad62b 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/core/class.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/core/class.js
@@ -27,12 +27,12 @@ define([
      * Creates constructor function which allows
      * initialization without usage of a 'new' operator.
      *
-     * @param {Object} protoProps - Prototypal propeties of a new consturctor.
-     * @param {Function} consturctor
-     * @returns {Function} Created consturctor.
+     * @param {Object} protoProps - Prototypal propeties of a new constructor.
+     * @param {Function} constructor
+     * @returns {Function} Created constructor.
      */
-    function createConstructor(protoProps, consturctor) {
-        var UiClass = consturctor;
+    function createConstructor(protoProps, constructor) {
+        var UiClass = constructor;
 
         if (!UiClass) {
 

From ba33ebcc27577034e7d97ab5afcab3ed27b1b47b Mon Sep 17 00:00:00 2001
From: Rakesh  Jesadiya <jesadiya.rakesh@gmail.com>
Date: Sun, 3 Sep 2017 23:16:10 +0530
Subject: [PATCH 54/85] Remove unnecessary comment.

---
 app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php b/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
index 05699f0cce5ab..c561913dee4d3 100644
--- a/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
+++ b/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
@@ -206,7 +206,6 @@ public function getProductAttributeValue($product, $attribute)
             ['select', 'boolean', 'multiselect']
         )
         ) {
-            //$value = $attribute->getSource()->getOptionText($product->getData($attribute->getAttributeCode()));
             $value = $attribute->getFrontend()->getValue($product);
         } else {
             $value = $product->getData($attribute->getAttributeCode());

From a3fe63722cd0074f08df6e0b2cf99e8f10174c5b Mon Sep 17 00:00:00 2001
From: Reindert <reindert@myparcel.nl>
Date: Mon, 4 Sep 2017 09:09:08 +0200
Subject: [PATCH 55/85] phpDocumentor Return tag must be an int

Because count() gives an int, hasShipment returns an int. Now i can't do this:
```if ($view->getOrder()->hasShipments() === true) {```
---
 app/code/Magento/Sales/Model/Order.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index 50497e8d47ba1..b2e39c40ec3f4 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -1780,7 +1780,7 @@ public function hasInvoices()
     /**
      * Check order shipments availability
      *
-     * @return bool
+     * @return int
      */
     public function hasShipments()
     {

From 85f49bfb16f974cc69ed9750427f4bf151e366c9 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@magento.com>
Date: Mon, 4 Sep 2017 11:35:34 +0300
Subject: [PATCH 56/85] MAGETWO-72258: Fix minor type "consturctor" >
 "constructor" magento/magento2#10755

---
 app/code/Magento/Ui/view/base/web/js/lib/core/class.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/lib/core/class.js b/app/code/Magento/Ui/view/base/web/js/lib/core/class.js
index d835fa82ad62b..adc3d524a0cb0 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/core/class.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/core/class.js
@@ -61,7 +61,7 @@ define([
     Class = createConstructor({
 
         /**
-         * Entry point to the initialization of consturctors' instance.
+         * Entry point to the initialization of constructor's instance.
          *
          * @param {Object} [options={}]
          * @returns {Class} Chainable.

From c785afb560c0aec1264470562675ce020c0a627c Mon Sep 17 00:00:00 2001
From: Reindert <reindert@myparcel.nl>
Date: Mon, 4 Sep 2017 10:42:45 +0200
Subject: [PATCH 57/85] Set (bool) before function

---
 app/code/Magento/Sales/Model/Order.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index b2e39c40ec3f4..d3b8edbed2eea 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -1774,17 +1774,17 @@ public function getTracksCollection()
      */
     public function hasInvoices()
     {
-        return $this->getInvoiceCollection()->count();
+        return (bool)$this->getInvoiceCollection()->count();
     }
 
     /**
      * Check order shipments availability
      *
-     * @return int
+     * @return bool
      */
     public function hasShipments()
     {
-        return $this->getShipmentsCollection()->count();
+        return (bool)$this->getShipmentsCollection()->count();
     }
 
     /**
@@ -1794,7 +1794,7 @@ public function hasShipments()
      */
     public function hasCreditmemos()
     {
-        return $this->getCreditmemosCollection()->count();
+        return (bool)$this->getCreditmemosCollection()->count();
     }
 
     /**

From b10dced5a0db849118b8088eb7dea64c790e0fc2 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@magento.com>
Date: Mon, 4 Sep 2017 14:26:25 +0300
Subject: [PATCH 58/85] MAGETWO-71896: Static versioning and styles
 minification break email fonts styles #8241 #10638

---
 composer.lock | 229 +++++++++++++++++++++++++-------------------------
 1 file changed, 114 insertions(+), 115 deletions(-)

diff --git a/composer.lock b/composer.lock
index c2d91b17dca5a..2abd4fb1646c7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,6 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "5f3cbfc1ff8c3e3a1418471fa100cb80",
     "content-hash": "7e681a30116d5e52084eba552595936e",
     "packages": [
         {
@@ -52,7 +51,7 @@
                 }
             ],
             "description": "Braintree PHP Client Library",
-            "time": "2017-02-16 19:59:04"
+            "time": "2017-02-16T19:59:04+00:00"
         },
         {
             "name": "colinmollenhour/cache-backend-file",
@@ -88,7 +87,7 @@
             ],
             "description": "The stock Zend_Cache_Backend_File backend has extremely poor performance for cleaning by tags making it become unusable as the number of cached items increases. This backend makes many changes resulting in a huge performance boost, especially for tag cleaning.",
             "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_File",
-            "time": "2016-05-02 16:24:47"
+            "time": "2016-05-02T16:24:47+00:00"
         },
         {
             "name": "colinmollenhour/cache-backend-redis",
@@ -124,7 +123,7 @@
             ],
             "description": "Zend_Cache backend using Redis with full support for tags.",
             "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis",
-            "time": "2017-03-25 04:54:24"
+            "time": "2017-03-25T04:54:24+00:00"
         },
         {
             "name": "colinmollenhour/credis",
@@ -163,7 +162,7 @@
             ],
             "description": "Credis is a lightweight interface to the Redis key-value store which wraps the phpredis library when available for better performance.",
             "homepage": "https://github.com/colinmollenhour/credis",
-            "time": "2015-11-28 01:20:04"
+            "time": "2015-11-28T01:20:04+00:00"
         },
         {
             "name": "colinmollenhour/php-redis-session-abstract",
@@ -200,7 +199,7 @@
             ],
             "description": "A Redis-based session handler with optimistic locking",
             "homepage": "https://github.com/colinmollenhour/php-redis-session-abstract",
-            "time": "2017-04-19 14:21:43"
+            "time": "2017-04-19T14:21:43+00:00"
         },
         {
             "name": "composer/ca-bundle",
@@ -259,7 +258,7 @@
                 "ssl",
                 "tls"
             ],
-            "time": "2017-03-06 11:59:08"
+            "time": "2017-03-06T11:59:08+00:00"
         },
         {
             "name": "composer/composer",
@@ -336,7 +335,7 @@
                 "dependency",
                 "package"
             ],
-            "time": "2017-03-10 08:29:45"
+            "time": "2017-03-10T08:29:45+00:00"
         },
         {
             "name": "composer/semver",
@@ -398,7 +397,7 @@
                 "validation",
                 "versioning"
             ],
-            "time": "2016-08-30 16:08:34"
+            "time": "2016-08-30T16:08:34+00:00"
         },
         {
             "name": "composer/spdx-licenses",
@@ -459,7 +458,7 @@
                 "spdx",
                 "validator"
             ],
-            "time": "2017-04-03 19:08:52"
+            "time": "2017-04-03T19:08:52+00:00"
         },
         {
             "name": "container-interop/container-interop",
@@ -490,7 +489,7 @@
             ],
             "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
             "homepage": "https://github.com/container-interop/container-interop",
-            "time": "2017-02-14 19:40:03"
+            "time": "2017-02-14T19:40:03+00:00"
         },
         {
             "name": "justinrainbow/json-schema",
@@ -557,7 +556,7 @@
                 "json",
                 "schema"
             ],
-            "time": "2017-05-16 21:06:09"
+            "time": "2017-05-16T21:06:09+00:00"
         },
         {
             "name": "league/climate",
@@ -606,7 +605,7 @@
                 "php",
                 "terminal"
             ],
-            "time": "2015-01-18 14:31:58"
+            "time": "2015-01-18T14:31:58+00:00"
         },
         {
             "name": "magento/composer",
@@ -642,7 +641,7 @@
                 "AFL-3.0"
             ],
             "description": "Magento composer library helps to instantiate Composer application and run composer commands.",
-            "time": "2017-04-24 09:57:02"
+            "time": "2017-04-24T09:57:02+00:00"
         },
         {
             "name": "magento/magento-composer-installer",
@@ -721,7 +720,7 @@
                 "composer-installer",
                 "magento"
             ],
-            "time": "2016-10-06 16:05:07"
+            "time": "2016-10-06T16:05:07+00:00"
         },
         {
             "name": "magento/zendframework1",
@@ -768,7 +767,7 @@
                 "ZF1",
                 "framework"
             ],
-            "time": "2017-06-21 14:56:23"
+            "time": "2017-06-21T14:56:23+00:00"
         },
         {
             "name": "monolog/monolog",
@@ -846,7 +845,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2017-06-19 01:22:40"
+            "time": "2017-06-19T01:22:40+00:00"
         },
         {
             "name": "oyejorge/less.php",
@@ -908,7 +907,7 @@
                 "php",
                 "stylesheet"
             ],
-            "time": "2017-03-28 22:19:25"
+            "time": "2017-03-28T22:19:25+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -956,7 +955,7 @@
                 "pseudorandom",
                 "random"
             ],
-            "time": "2017-03-13 16:27:32"
+            "time": "2017-03-13T16:27:32+00:00"
         },
         {
             "name": "pelago/emogrifier",
@@ -1016,7 +1015,7 @@
             ],
             "description": "Converts CSS styles into inline style attributes in your HTML code",
             "homepage": "http://www.pelagodesign.com/sidecar/emogrifier/",
-            "time": "2017-03-02 12:51:48"
+            "time": "2017-03-02T12:51:48+00:00"
         },
         {
             "name": "phpseclib/phpseclib",
@@ -1108,7 +1107,7 @@
                 "x.509",
                 "x509"
             ],
-            "time": "2017-06-05 06:31:10"
+            "time": "2017-06-05T06:31:10+00:00"
         },
         {
             "name": "psr/container",
@@ -1157,7 +1156,7 @@
                 "container-interop",
                 "psr"
             ],
-            "time": "2017-02-14 16:28:37"
+            "time": "2017-02-14T16:28:37+00:00"
         },
         {
             "name": "psr/log",
@@ -1204,7 +1203,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2016-10-10 12:19:37"
+            "time": "2016-10-10T12:19:37+00:00"
         },
         {
             "name": "ramsey/uuid",
@@ -1286,7 +1285,7 @@
                 "identifier",
                 "uuid"
             ],
-            "time": "2017-03-26 20:37:53"
+            "time": "2017-03-26T20:37:53+00:00"
         },
         {
             "name": "seld/cli-prompt",
@@ -1334,7 +1333,7 @@
                 "input",
                 "prompt"
             ],
-            "time": "2017-03-18 11:32:45"
+            "time": "2017-03-18T11:32:45+00:00"
         },
         {
             "name": "seld/jsonlint",
@@ -1383,7 +1382,7 @@
                 "parser",
                 "validator"
             ],
-            "time": "2017-06-18 15:11:04"
+            "time": "2017-06-18T15:11:04+00:00"
         },
         {
             "name": "seld/phar-utils",
@@ -1427,7 +1426,7 @@
             "keywords": [
                 "phra"
             ],
-            "time": "2015-10-13 18:44:15"
+            "time": "2015-10-13T18:44:15+00:00"
         },
         {
             "name": "sjparkinson/static-review",
@@ -1480,7 +1479,7 @@
                 }
             ],
             "description": "An extendable framework for version control hooks.",
-            "time": "2014-09-22 08:40:36"
+            "time": "2014-09-22T08:40:36+00:00"
         },
         {
             "name": "symfony/console",
@@ -1541,7 +1540,7 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-29 21:26:04"
+            "time": "2017-07-29T21:26:04+00:00"
         },
         {
             "name": "symfony/debug",
@@ -1598,7 +1597,7 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2016-07-30 07:22:48"
+            "time": "2016-07-30T07:22:48+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -1658,7 +1657,7 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2017-06-02 07:47:27"
+            "time": "2017-06-02T07:47:27+00:00"
         },
         {
             "name": "symfony/filesystem",
@@ -1707,7 +1706,7 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-11 07:17:58"
+            "time": "2017-07-11T07:17:58+00:00"
         },
         {
             "name": "symfony/finder",
@@ -1756,7 +1755,7 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2017-06-01 21:01:25"
+            "time": "2017-06-01T21:01:25+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
@@ -1815,7 +1814,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-09 14:24:12"
+            "time": "2017-06-09T14:24:12+00:00"
         },
         {
             "name": "symfony/process",
@@ -1864,7 +1863,7 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-03 08:04:30"
+            "time": "2017-07-03T08:04:30+00:00"
         },
         {
             "name": "tedivm/jshrink",
@@ -1910,7 +1909,7 @@
                 "javascript",
                 "minifier"
             ],
-            "time": "2015-07-04 07:35:09"
+            "time": "2015-07-04T07:35:09+00:00"
         },
         {
             "name": "tubalmartin/cssmin",
@@ -1963,7 +1962,7 @@
                 "minify",
                 "yui"
             ],
-            "time": "2017-05-16 13:45:26"
+            "time": "2017-05-16T13:45:26+00:00"
         },
         {
             "name": "zendframework/zend-captcha",
@@ -2020,7 +2019,7 @@
                 "captcha",
                 "zf2"
             ],
-            "time": "2017-02-23 08:09:44"
+            "time": "2017-02-23T08:09:44+00:00"
         },
         {
             "name": "zendframework/zend-code",
@@ -2073,7 +2072,7 @@
                 "code",
                 "zf2"
             ],
-            "time": "2016-10-24 13:23:32"
+            "time": "2016-10-24T13:23:32+00:00"
         },
         {
             "name": "zendframework/zend-config",
@@ -2129,7 +2128,7 @@
                 "config",
                 "zf2"
             ],
-            "time": "2016-02-04 23:01:10"
+            "time": "2016-02-04T23:01:10+00:00"
         },
         {
             "name": "zendframework/zend-console",
@@ -2181,7 +2180,7 @@
                 "console",
                 "zf2"
             ],
-            "time": "2016-02-09 17:15:12"
+            "time": "2016-02-09T17:15:12+00:00"
         },
         {
             "name": "zendframework/zend-crypt",
@@ -2231,7 +2230,7 @@
                 "crypt",
                 "zf2"
             ],
-            "time": "2016-02-03 23:46:30"
+            "time": "2016-02-03T23:46:30+00:00"
         },
         {
             "name": "zendframework/zend-db",
@@ -2288,7 +2287,7 @@
                 "db",
                 "zf2"
             ],
-            "time": "2016-08-09 19:28:55"
+            "time": "2016-08-09T19:28:55+00:00"
         },
         {
             "name": "zendframework/zend-di",
@@ -2335,7 +2334,7 @@
                 "di",
                 "zf2"
             ],
-            "time": "2016-04-25 20:58:11"
+            "time": "2016-04-25T20:58:11+00:00"
         },
         {
             "name": "zendframework/zend-escaper",
@@ -2379,7 +2378,7 @@
                 "escaper",
                 "zf2"
             ],
-            "time": "2016-06-30 19:48:38"
+            "time": "2016-06-30T19:48:38+00:00"
         },
         {
             "name": "zendframework/zend-eventmanager",
@@ -2426,7 +2425,7 @@
                 "eventmanager",
                 "zf2"
             ],
-            "time": "2016-02-18 20:49:05"
+            "time": "2016-02-18T20:49:05+00:00"
         },
         {
             "name": "zendframework/zend-filter",
@@ -2486,7 +2485,7 @@
                 "filter",
                 "zf2"
             ],
-            "time": "2017-05-17 20:56:17"
+            "time": "2017-05-17T20:56:17+00:00"
         },
         {
             "name": "zendframework/zend-form",
@@ -2563,7 +2562,7 @@
                 "form",
                 "zf2"
             ],
-            "time": "2017-05-18 14:59:53"
+            "time": "2017-05-18T14:59:53+00:00"
         },
         {
             "name": "zendframework/zend-http",
@@ -2613,7 +2612,7 @@
                 "http",
                 "zf2"
             ],
-            "time": "2017-01-31 14:41:02"
+            "time": "2017-01-31T14:41:02+00:00"
         },
         {
             "name": "zendframework/zend-hydrator",
@@ -2671,7 +2670,7 @@
                 "hydrator",
                 "zf2"
             ],
-            "time": "2016-02-18 22:38:26"
+            "time": "2016-02-18T22:38:26+00:00"
         },
         {
             "name": "zendframework/zend-i18n",
@@ -2738,7 +2737,7 @@
                 "i18n",
                 "zf2"
             ],
-            "time": "2017-05-17 17:00:12"
+            "time": "2017-05-17T17:00:12+00:00"
         },
         {
             "name": "zendframework/zend-inputfilter",
@@ -2793,7 +2792,7 @@
                 "inputfilter",
                 "zf2"
             ],
-            "time": "2017-05-18 14:20:56"
+            "time": "2017-05-18T14:20:56+00:00"
         },
         {
             "name": "zendframework/zend-json",
@@ -2848,7 +2847,7 @@
                 "json",
                 "zf2"
             ],
-            "time": "2016-02-04 21:20:26"
+            "time": "2016-02-04T21:20:26+00:00"
         },
         {
             "name": "zendframework/zend-loader",
@@ -2892,7 +2891,7 @@
                 "loader",
                 "zf2"
             ],
-            "time": "2015-06-03 14:05:47"
+            "time": "2015-06-03T14:05:47+00:00"
         },
         {
             "name": "zendframework/zend-log",
@@ -2963,7 +2962,7 @@
                 "logging",
                 "zf2"
             ],
-            "time": "2017-05-17 16:03:26"
+            "time": "2017-05-17T16:03:26+00:00"
         },
         {
             "name": "zendframework/zend-mail",
@@ -3025,7 +3024,7 @@
                 "mail",
                 "zf2"
             ],
-            "time": "2017-06-08 20:03:58"
+            "time": "2017-06-08T20:03:58+00:00"
         },
         {
             "name": "zendframework/zend-math",
@@ -3075,7 +3074,7 @@
                 "math",
                 "zf2"
             ],
-            "time": "2016-04-07 16:29:53"
+            "time": "2016-04-07T16:29:53+00:00"
         },
         {
             "name": "zendframework/zend-mime",
@@ -3124,7 +3123,7 @@
                 "mime",
                 "zf2"
             ],
-            "time": "2017-01-16 16:43:38"
+            "time": "2017-01-16T16:43:38+00:00"
         },
         {
             "name": "zendframework/zend-modulemanager",
@@ -3182,7 +3181,7 @@
                 "modulemanager",
                 "zf2"
             ],
-            "time": "2017-07-11 19:39:57"
+            "time": "2017-07-11T19:39:57+00:00"
         },
         {
             "name": "zendframework/zend-mvc",
@@ -3269,7 +3268,7 @@
                 "mvc",
                 "zf2"
             ],
-            "time": "2016-02-23 15:24:59"
+            "time": "2016-02-23T15:24:59+00:00"
         },
         {
             "name": "zendframework/zend-serializer",
@@ -3326,7 +3325,7 @@
                 "serializer",
                 "zf2"
             ],
-            "time": "2016-06-21 17:01:55"
+            "time": "2016-06-21T17:01:55+00:00"
         },
         {
             "name": "zendframework/zend-server",
@@ -3372,7 +3371,7 @@
                 "server",
                 "zf2"
             ],
-            "time": "2016-06-20 22:27:55"
+            "time": "2016-06-20T22:27:55+00:00"
         },
         {
             "name": "zendframework/zend-servicemanager",
@@ -3424,7 +3423,7 @@
                 "servicemanager",
                 "zf2"
             ],
-            "time": "2016-12-19 19:14:29"
+            "time": "2016-12-19T19:14:29+00:00"
         },
         {
             "name": "zendframework/zend-session",
@@ -3490,7 +3489,7 @@
                 "session",
                 "zf2"
             ],
-            "time": "2017-06-19 21:31:39"
+            "time": "2017-06-19T21:31:39+00:00"
         },
         {
             "name": "zendframework/zend-soap",
@@ -3542,7 +3541,7 @@
                 "soap",
                 "zf2"
             ],
-            "time": "2016-04-21 16:06:27"
+            "time": "2016-04-21T16:06:27+00:00"
         },
         {
             "name": "zendframework/zend-stdlib",
@@ -3601,7 +3600,7 @@
                 "stdlib",
                 "zf2"
             ],
-            "time": "2016-04-12 21:17:31"
+            "time": "2016-04-12T21:17:31+00:00"
         },
         {
             "name": "zendframework/zend-text",
@@ -3648,7 +3647,7 @@
                 "text",
                 "zf2"
             ],
-            "time": "2016-02-08 19:03:52"
+            "time": "2016-02-08T19:03:52+00:00"
         },
         {
             "name": "zendframework/zend-uri",
@@ -3695,7 +3694,7 @@
                 "uri",
                 "zf2"
             ],
-            "time": "2016-02-17 22:38:51"
+            "time": "2016-02-17T22:38:51+00:00"
         },
         {
             "name": "zendframework/zend-validator",
@@ -3766,7 +3765,7 @@
                 "validator",
                 "zf2"
             ],
-            "time": "2017-07-20 16:44:59"
+            "time": "2017-07-20T16:44:59+00:00"
         },
         {
             "name": "zendframework/zend-view",
@@ -3853,7 +3852,7 @@
                 "view",
                 "zf2"
             ],
-            "time": "2017-03-21 15:05:56"
+            "time": "2017-03-21T15:05:56+00:00"
         }
     ],
     "packages-dev": [
@@ -3909,7 +3908,7 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2015-06-14 21:17:01"
+            "time": "2015-06-14T21:17:01+00:00"
         },
         {
             "name": "friendsofphp/php-cs-fixer",
@@ -3979,7 +3978,7 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
-            "time": "2017-03-31 12:59:38"
+            "time": "2017-03-31T12:59:38+00:00"
         },
         {
             "name": "ircmaxell/password-compat",
@@ -4021,7 +4020,7 @@
                 "hashing",
                 "password"
             ],
-            "time": "2014-11-20 16:49:30"
+            "time": "2014-11-20T16:49:30+00:00"
         },
         {
             "name": "lusitanian/oauth",
@@ -4088,7 +4087,7 @@
                 "oauth",
                 "security"
             ],
-            "time": "2016-07-12 22:15:40"
+            "time": "2016-07-12T22:15:40+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -4130,7 +4129,7 @@
                 "object",
                 "object graph"
             ],
-            "time": "2017-04-12 18:52:22"
+            "time": "2017-04-12T18:52:22+00:00"
         },
         {
             "name": "pdepend/pdepend",
@@ -4170,7 +4169,7 @@
                 "BSD-3-Clause"
             ],
             "description": "Official version of pdepend to be handled with Composer",
-            "time": "2017-01-19 14:23:36"
+            "time": "2017-01-19T14:23:36+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -4225,7 +4224,7 @@
                 }
             ],
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
-            "time": "2017-03-05 18:14:27"
+            "time": "2017-03-05T18:14:27+00:00"
         },
         {
             "name": "phar-io/version",
@@ -4272,7 +4271,7 @@
                 }
             ],
             "description": "Library for handling version information and constraints",
-            "time": "2017-03-05 17:38:23"
+            "time": "2017-03-05T17:38:23+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -4326,7 +4325,7 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2015-12-27 11:43:31"
+            "time": "2015-12-27T11:43:31+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
@@ -4371,7 +4370,7 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2017-08-08 06:39:58"
+            "time": "2017-08-08T06:39:58+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
@@ -4418,7 +4417,7 @@
                     "email": "me@mikevanriel.com"
                 }
             ],
-            "time": "2017-06-03 08:32:36"
+            "time": "2017-06-03T08:32:36+00:00"
         },
         {
             "name": "phpmd/phpmd",
@@ -4484,7 +4483,7 @@
                 "phpmd",
                 "pmd"
             ],
-            "time": "2017-01-20 14:41:10"
+            "time": "2017-01-20T14:41:10+00:00"
         },
         {
             "name": "phpspec/prophecy",
@@ -4547,7 +4546,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2017-03-02 20:05:34"
+            "time": "2017-03-02T20:05:34+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -4611,7 +4610,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-08-03 12:40:43"
+            "time": "2017-08-03T12:40:43+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -4658,7 +4657,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2016-10-03 07:40:28"
+            "time": "2016-10-03T07:40:28+00:00"
         },
         {
             "name": "phpunit/php-text-template",
@@ -4699,7 +4698,7 @@
             "keywords": [
                 "template"
             ],
-            "time": "2015-06-21 13:50:34"
+            "time": "2015-06-21T13:50:34+00:00"
         },
         {
             "name": "phpunit/php-timer",
@@ -4748,7 +4747,7 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2017-02-26 11:10:40"
+            "time": "2017-02-26T11:10:40+00:00"
         },
         {
             "name": "phpunit/php-token-stream",
@@ -4797,7 +4796,7 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2017-08-03 14:17:41"
+            "time": "2017-08-03T14:17:41+00:00"
         },
         {
             "name": "phpunit/phpunit",
@@ -4881,7 +4880,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-08-03 13:59:28"
+            "time": "2017-08-03T13:59:28+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -4940,7 +4939,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2017-08-03 14:08:16"
+            "time": "2017-08-03T14:08:16+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
@@ -4985,7 +4984,7 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2017-03-04 06:30:41"
+            "time": "2017-03-04T06:30:41+00:00"
         },
         {
             "name": "sebastian/comparator",
@@ -5049,7 +5048,7 @@
                 "compare",
                 "equality"
             ],
-            "time": "2017-03-03 06:26:08"
+            "time": "2017-03-03T06:26:08+00:00"
         },
         {
             "name": "sebastian/diff",
@@ -5101,7 +5100,7 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2017-05-22 07:24:03"
+            "time": "2017-05-22T07:24:03+00:00"
         },
         {
             "name": "sebastian/environment",
@@ -5151,7 +5150,7 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2017-07-01 08:51:00"
+            "time": "2017-07-01T08:51:00+00:00"
         },
         {
             "name": "sebastian/exporter",
@@ -5218,7 +5217,7 @@
                 "export",
                 "exporter"
             ],
-            "time": "2017-04-03 13:19:02"
+            "time": "2017-04-03T13:19:02+00:00"
         },
         {
             "name": "sebastian/finder-facade",
@@ -5257,7 +5256,7 @@
             ],
             "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
             "homepage": "https://github.com/sebastianbergmann/finder-facade",
-            "time": "2016-02-17 07:02:23"
+            "time": "2016-02-17T07:02:23+00:00"
         },
         {
             "name": "sebastian/global-state",
@@ -5308,7 +5307,7 @@
             "keywords": [
                 "global state"
             ],
-            "time": "2017-04-27 15:39:26"
+            "time": "2017-04-27T15:39:26+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
@@ -5355,7 +5354,7 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2017-08-03 12:35:26"
+            "time": "2017-08-03T12:35:26+00:00"
         },
         {
             "name": "sebastian/object-reflector",
@@ -5400,7 +5399,7 @@
             ],
             "description": "Allows reflection of object attributes, including inherited and non-public ones",
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-            "time": "2017-03-29 09:07:27"
+            "time": "2017-03-29T09:07:27+00:00"
         },
         {
             "name": "sebastian/phpcpd",
@@ -5451,7 +5450,7 @@
             ],
             "description": "Copy/Paste Detector (CPD) for PHP code.",
             "homepage": "https://github.com/sebastianbergmann/phpcpd",
-            "time": "2016-04-17 19:32:49"
+            "time": "2016-04-17T19:32:49+00:00"
         },
         {
             "name": "sebastian/recursion-context",
@@ -5504,7 +5503,7 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2017-03-03 06:23:57"
+            "time": "2017-03-03T06:23:57+00:00"
         },
         {
             "name": "sebastian/resource-operations",
@@ -5546,7 +5545,7 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2015-07-28 20:34:47"
+            "time": "2015-07-28T20:34:47+00:00"
         },
         {
             "name": "sebastian/version",
@@ -5589,7 +5588,7 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2016-10-03 07:35:21"
+            "time": "2016-10-03T07:35:21+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -5640,7 +5639,7 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2017-06-14 01:23:49"
+            "time": "2017-06-14T01:23:49+00:00"
         },
         {
             "name": "symfony/config",
@@ -5702,7 +5701,7 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-19 07:37:29"
+            "time": "2017-07-19T07:37:29+00:00"
         },
         {
             "name": "symfony/dependency-injection",
@@ -5772,7 +5771,7 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-28 15:27:31"
+            "time": "2017-07-28T15:27:31+00:00"
         },
         {
             "name": "symfony/polyfill-php54",
@@ -5830,7 +5829,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-09 08:25:21"
+            "time": "2017-06-09T08:25:21+00:00"
         },
         {
             "name": "symfony/polyfill-php55",
@@ -5886,7 +5885,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-09 08:25:21"
+            "time": "2017-06-09T08:25:21+00:00"
         },
         {
             "name": "symfony/polyfill-php70",
@@ -5945,7 +5944,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-09 14:24:12"
+            "time": "2017-06-09T14:24:12+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
@@ -6000,7 +5999,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-09 08:25:21"
+            "time": "2017-06-09T08:25:21+00:00"
         },
         {
             "name": "symfony/polyfill-xml",
@@ -6048,7 +6047,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-09 08:25:21"
+            "time": "2017-06-09T08:25:21+00:00"
         },
         {
             "name": "symfony/stopwatch",
@@ -6097,7 +6096,7 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "time": "2017-04-12 14:14:56"
+            "time": "2017-04-12T14:14:56+00:00"
         },
         {
             "name": "theseer/fdomdocument",
@@ -6137,7 +6136,7 @@
             ],
             "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.",
             "homepage": "https://github.com/theseer/fDOMDocument",
-            "time": "2017-06-30 11:53:12"
+            "time": "2017-06-30T11:53:12+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -6177,7 +6176,7 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "time": "2017-04-07 12:08:54"
+            "time": "2017-04-07T12:08:54+00:00"
         },
         {
             "name": "webmozart/assert",
@@ -6227,7 +6226,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2016-11-23 20:04:58"
+            "time": "2016-11-23T20:04:58+00:00"
         }
     ],
     "aliases": [],

From dfa6f8770805ce920f144109f9f0a39b97e10a24 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@magento.com>
Date: Mon, 4 Sep 2017 18:40:46 +0300
Subject: [PATCH 59/85] MAGETWO-71896: Static versioning and styles
 minification break email fonts styles #8241 #10638

---
 .../Css/PreProcessor/Adapter/CssInlinerTest.php          | 9 ++++-----
 .../Framework/Css/PreProcessor/Adapter/CssInliner.php    | 8 +-------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php
index f1468f718df61..9d71604a9f941 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/CssInlinerTest.php
@@ -75,13 +75,12 @@ public function testGetFilesEmogrifier($htmlFilePath, $cssFilePath, $cssExpected
         $emogrifier->setCss($css);
         $emogrifier->setHtml($html);
         $result = $emogrifier->emogrify();
+
         /**
-         * Tests a bug in the library where there's no spaces to CSS string before passing to Emogrifier
-         * to fix known parsing issue with library.
-         * This test should will fail when this bug is fixed in the library and we should fix the adapter.
-         * https://github.com/jjriv/emogrifier/issues/370
+         * This test was implemented for the issue which existed in the older version of Emogrifier.
+         * Test was updated, as the library got updated as well.
          */
-        $this->assertNotContains($cssExpected, $result);
+        $this->assertContains($cssExpected, $result);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
index 342283c312293..7164e68c709fb 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/Adapter/CssInliner.php
@@ -41,13 +41,7 @@ public function setHtml($html)
      */
     public function setCss($css)
     {
-        /**
-         * Adds space to CSS string before passing to Emogrifier to fix known parsing issue with library.
-         * https://github.com/jjriv/emogrifier/issues/370
-         */
-        $cssWithAddedSpaces = preg_replace('#([\{\}>])#i', ' $1 ', $css);
-
-        $this->emogrifier->setCss($cssWithAddedSpaces);
+        $this->emogrifier->setCss($css);
     }
 
     /**

From c4da890ed291ba5333a3871a4098d04ea58d255c Mon Sep 17 00:00:00 2001
From: Pieter Hoste <hoste.pieter@gmail.com>
Date: Mon, 4 Sep 2017 20:14:20 +0200
Subject: [PATCH 60/85] Always use https for Vimeo video's.

---
 .../view/adminhtml/web/js/get-video-information.js            | 4 ++--
 .../Magento/ProductVideo/view/frontend/web/js/load-player.js  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js b/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js
index ca920e8740978..13b0e43a84d81 100644
--- a/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js
+++ b/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js
@@ -302,7 +302,7 @@ define([
                     additionalParams += '&autoplay=1';
                 }
 
-                src = window.location.protocol + '//player.vimeo.com/video/' +
+                src = 'https://player.vimeo.com/video/' +
                     this._code + '?api=1&player_id=vimeo' +
                     this._code +
                     timestamp +
@@ -525,7 +525,7 @@ define([
                     );
                 } else if (type === 'vimeo') {
                     $.ajax({
-                        url: window.location.protocol + '//www.vimeo.com/api/v2/video/' + id + '.json',
+                        url: 'https://www.vimeo.com/api/v2/video/' + id + '.json',
                         dataType: 'jsonp',
                         data: {
                             format: 'json'
diff --git a/app/code/Magento/ProductVideo/view/frontend/web/js/load-player.js b/app/code/Magento/ProductVideo/view/frontend/web/js/load-player.js
index 5a9f6a3eca941..3519d538e523a 100644
--- a/app/code/Magento/ProductVideo/view/frontend/web/js/load-player.js
+++ b/app/code/Magento/ProductVideo/view/frontend/web/js/load-player.js
@@ -317,7 +317,7 @@ define(['jquery', 'jquery/ui'], function ($) {
             if (this._loop) {
                 additionalParams += '&loop=1';
             }
-            src = window.location.protocol + '//player.vimeo.com/video/' +
+            src = 'https://player.vimeo.com/video/' +
                 this._code + '?api=1&player_id=vimeo' +
                 this._code +
                 timestamp +

From 405482b4bade007e98ed8f689a9dabe3345a65d0 Mon Sep 17 00:00:00 2001
From: Evgeny Kalashnikov <kenbo@prola.ru>
Date: Tue, 5 Sep 2017 12:13:53 +0400
Subject: [PATCH 61/85] Code generate: support variadic parameter

---
 .../Magento/Framework/Code/Generator/ClassGenerator.php   | 1 +
 .../Magento/Framework/Code/Generator/EntityAbstract.php   | 3 ++-
 .../Framework/Interception/Code/Generator/Interceptor.php | 8 +++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Code/Generator/ClassGenerator.php b/lib/internal/Magento/Framework/Code/Generator/ClassGenerator.php
index 54748d74f06c0..bb1c2262132f4 100644
--- a/lib/internal/Magento/Framework/Code/Generator/ClassGenerator.php
+++ b/lib/internal/Magento/Framework/Code/Generator/ClassGenerator.php
@@ -59,6 +59,7 @@ class ClassGenerator extends \Zend\Code\Generator\ClassGenerator implements
         'type' => 'setType',
         'defaultValue' => 'setDefaultValue',
         'passedByReference' => 'setPassedByReference',
+        'variadic' => 'setVariadic',
     ];
 
     /**
diff --git a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
index baf2bba142741..d8491398a37d2 100644
--- a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
+++ b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
@@ -313,7 +313,8 @@ protected function _getMethodParameterInfo(\ReflectionParameter $parameter)
         $parameterInfo = [
             'name' => $parameter->getName(),
             'passedByReference' => $parameter->isPassedByReference(),
-            'type' => $parameter->getType()
+            'type' => $parameter->getType(),
+            'variadic' => $parameter->isVariadic()
         ];
 
         if ($parameter->isArray()) {
diff --git a/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php b/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php
index 608907abcc0e1..15d407baba2bb 100644
--- a/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php
+++ b/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php
@@ -130,7 +130,13 @@ protected function _getParameterList(array $parameters)
             ', ',
             array_map(
                 function ($item) {
-                    return "$" . $item['name'];
+                    $output = '';
+                    if ($item['variadic']) {
+                        $output .= '... ';
+                    }
+
+                    $output .="\${$item['name']}";
+                    return $output;
                 },
                 $parameters
             )

From 94fe76c02c05952823b603f1d2035ade8f5540bc Mon Sep 17 00:00:00 2001
From: Evgeny Kalashnikov <kenbo@prola.ru>
Date: Tue, 5 Sep 2017 14:34:50 +0400
Subject: [PATCH 62/85] Code generate: add test variadic parameter

---
 .../Code/Test/Unit/Generator/ClassGeneratorTest.php |  8 +++++++-
 .../Test/Unit/Code/Generator/_files/Interceptor.txt | 13 +++++++++++++
 .../Test/Unit/Code/Generator/_files/Sample.php      |  4 ++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/ClassGeneratorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/ClassGeneratorTest.php
index fabc4aede49de..0f7841134042c 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/ClassGeneratorTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/ClassGeneratorTest.php
@@ -20,6 +20,8 @@ class ClassGeneratorTest extends \PHPUnit\Framework\TestCase
 
     const FLAG_REFERENCE = 'passedByReference';
 
+    const FLAG_VARIADIC = 'variadic';
+
     /**#@-*/
 
     /**
@@ -38,6 +40,7 @@ class ClassGeneratorTest extends \PHPUnit\Framework\TestCase
         self::FLAG_FINAL => 'isFinal',
         self::FLAG_ABSTRACT => 'isAbstract',
         self::FLAG_REFERENCE => 'getPassedByReference',
+        self::FLAG_VARIADIC => 'getVariadic',
     ];
 
     /**
@@ -65,7 +68,7 @@ class ClassGeneratorTest extends \PHPUnit\Framework\TestCase
             'final' => true,
             'static' => true,
             'parameters' => [
-                ['name' => 'data', 'type' => 'array', 'defaultValue' => [], 'passedByReference' => true],
+                ['name' => 'data', 'type' => 'array', 'defaultValue' => [], 'passedByReference' => true, 'variadic' => false],
             ],
             'body' => 'return 1;',
             'docblock' => ['shortDescription' => 'test short description'],
@@ -205,6 +208,9 @@ public function testAddMethods()
                         $actualDefaultValue = $actualParameter->getDefaultValue();
                         $this->assertEquals($parameterData['defaultValue'], $actualDefaultValue->getValue());
                     }
+
+                    // assert variadic flag
+                    $this->_assertFlag(self::FLAG_VARIADIC, $parameterData, $actualParameter);
                 }
             }
 
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Interceptor.txt b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Interceptor.txt
index de315463a38da..896083ab4b720 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Interceptor.txt
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Interceptor.txt
@@ -50,4 +50,17 @@ class Interceptor extends \Magento\Framework\Interception\Code\Generator\Sample
             return $this->___callPlugins('getReference', func_get_args(), $pluginInfo);
         }
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function variadic(... $values)
+    {
+        $pluginInfo = $this->pluginList->getNext($this->subjectType, 'variadic');
+        if (!$pluginInfo) {
+            return parent::variadic(... $values);
+        } else {
+            return $this->___callPlugins('variadic', func_get_args(), $pluginInfo);
+        }
+    }
 }
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php
index 46d9bee5844a7..050cc71b883f6 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php
@@ -22,4 +22,8 @@ public function setValue($value)
     public function & getReference()
     {
     }
+
+    public function variadic(... $values)
+    {
+    }
 }

From f193998a7f9935619e1d377ea08653a34fb95df0 Mon Sep 17 00:00:00 2001
From: Evgeny Kalashnikov <kenbo@prola.ru>
Date: Tue, 5 Sep 2017 15:30:18 +0400
Subject: [PATCH 63/85] Code generate: fix

---
 .../Code/Test/Unit/Generator/ClassGeneratorTest.php       | 8 +++++++-
 .../Test/Unit/Code/Generator/_files/Sample.php            | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/ClassGeneratorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/ClassGeneratorTest.php
index 0f7841134042c..9e695a99b8fcc 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/ClassGeneratorTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/ClassGeneratorTest.php
@@ -68,7 +68,13 @@ class ClassGeneratorTest extends \PHPUnit\Framework\TestCase
             'final' => true,
             'static' => true,
             'parameters' => [
-                ['name' => 'data', 'type' => 'array', 'defaultValue' => [], 'passedByReference' => true, 'variadic' => false],
+                [
+                    'name' => 'data', 
+                    'type' => 'array', 
+                    'defaultValue' => [], 
+                    'passedByReference' => true, 
+                    'variadic' => false
+                ],
             ],
             'body' => 'return 1;',
             'docblock' => ['shortDescription' => 'test short description'],
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php
index 050cc71b883f6..dd0b4dc1ada17 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php
@@ -25,5 +25,6 @@ public function & getReference()
 
     public function variadic(... $values)
     {
+        $this->attribute = array_shift($values);
     }
 }

From bfe8135fcfaff4cb5f3b45528562eeaa502a11d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Tue, 5 Sep 2017 13:49:42 +0200
Subject: [PATCH 64/85] Enhancement: Configure preferred installation source in
 composer.json

---
 .travis.yml   | 2 +-
 composer.json | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9adce44fe6734..7c300af70dc4e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,7 @@ cache:
     - $HOME/node_modules
     - $HOME/yarn.lock
 before_install: ./dev/travis/before_install.sh
-install: composer install --no-interaction --prefer-dist
+install: composer install --no-interaction
 before_script: ./dev/travis/before_script.sh
 script:
   # Set arguments for variants of phpunit based tests; '|| true' prevents failing script when leading test fails
diff --git a/composer.json b/composer.json
index e8c5826a812f5..e93428a0edc0b 100644
--- a/composer.json
+++ b/composer.json
@@ -7,6 +7,9 @@
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "config": {
+        "preferred-install": "dist"
+    },
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
         "zendframework/zend-stdlib": "^2.7.7",

From 3896ae03a5bbeed6246d050580408df423b9cc11 Mon Sep 17 00:00:00 2001
From: Evgeny Kalashnikov <kenbo@prola.ru>
Date: Tue, 5 Sep 2017 16:30:43 +0400
Subject: [PATCH 65/85] Code generate: fix

---
 .../Code/Test/Unit/Generator/ClassGeneratorTest.php       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/ClassGeneratorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/ClassGeneratorTest.php
index 9e695a99b8fcc..79d94b4d25a3d 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/ClassGeneratorTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/ClassGeneratorTest.php
@@ -69,10 +69,10 @@ class ClassGeneratorTest extends \PHPUnit\Framework\TestCase
             'static' => true,
             'parameters' => [
                 [
-                    'name' => 'data', 
-                    'type' => 'array', 
-                    'defaultValue' => [], 
-                    'passedByReference' => true, 
+                    'name' => 'data',
+                    'type' => 'array',
+                    'defaultValue' => [],
+                    'passedByReference' => true,
                     'variadic' => false
                 ],
             ],

From cc72fdf447c0b5cc0e5e48c4e9f06faaae6665a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Tue, 5 Sep 2017 14:37:14 +0200
Subject: [PATCH 66/85] Fix: Move GitHub-specific documents into .github

---
 CODE_OF_CONDUCT.md => .github/CODE_OF_CONDUCT.md             | 0
 CONTRIBUTING.md => .github/CONTRIBUTING.md                   | 0
 ISSUE_TEMPLATE.md => .github/ISSUE_TEMPLATE.md               | 0
 PULL_REQUEST_TEMPLATE.md => .github/PULL_REQUEST_TEMPLATE.md | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename CODE_OF_CONDUCT.md => .github/CODE_OF_CONDUCT.md (100%)
 rename CONTRIBUTING.md => .github/CONTRIBUTING.md (100%)
 rename ISSUE_TEMPLATE.md => .github/ISSUE_TEMPLATE.md (100%)
 rename PULL_REQUEST_TEMPLATE.md => .github/PULL_REQUEST_TEMPLATE.md (100%)

diff --git a/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
similarity index 100%
rename from CODE_OF_CONDUCT.md
rename to .github/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to .github/CONTRIBUTING.md
diff --git a/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
similarity index 100%
rename from ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE.md
diff --git a/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from PULL_REQUEST_TEMPLATE.md
rename to .github/PULL_REQUEST_TEMPLATE.md

From 327c26d6d581634adff2d8fd289ea97644683066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Tue, 5 Sep 2017 16:33:17 +0200
Subject: [PATCH 67/85] Fix: Deny access to .github directory

---
 .github/.htaccess | 2 ++
 .htaccess         | 4 ----
 .htaccess.sample  | 4 ----
 3 files changed, 2 insertions(+), 8 deletions(-)
 create mode 100644 .github/.htaccess

diff --git a/.github/.htaccess b/.github/.htaccess
new file mode 100644
index 0000000000000..93169e4eb44ff
--- /dev/null
+++ b/.github/.htaccess
@@ -0,0 +1,2 @@
+Order deny,allow
+Deny from all
diff --git a/.htaccess b/.htaccess
index 90b9c16a5a8c0..3e6eb31938e46 100644
--- a/.htaccess
+++ b/.htaccess
@@ -234,10 +234,6 @@
         order allow,deny
         deny from all
     </Files>
-    <Files CONTRIBUTING.md>
-        order allow,deny
-        deny from all
-    </Files>
     <Files COPYING.txt>
         order allow,deny
         deny from all
diff --git a/.htaccess.sample b/.htaccess.sample
index 3b61bb672ec8a..e70eb9d022412 100644
--- a/.htaccess.sample
+++ b/.htaccess.sample
@@ -210,10 +210,6 @@
         order allow,deny
         deny from all
     </Files>
-    <Files CONTRIBUTING.md>
-        order allow,deny
-        deny from all
-    </Files>
     <Files COPYING.txt>
         order allow,deny
         deny from all

From feb50c7134d9e2a2cf98d9912101312226d426a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Wed, 6 Sep 2017 08:42:45 +0200
Subject: [PATCH 68/85] Fix: Use all columns when running tests

---
 dev/tests/api-functional/phpunit.xml.dist                   | 1 +
 dev/tests/functional/phpunit.xml.dist                       | 1 +
 dev/tests/integration/framework/tests/unit/phpunit.xml.dist | 1 +
 dev/tests/integration/phpunit.xml.dist                      | 1 +
 dev/tests/static/framework/tests/unit/phpunit.xml.dist      | 1 +
 dev/tests/static/phpunit-all.xml.dist                       | 1 +
 dev/tests/static/phpunit.xml.dist                           | 1 +
 dev/tests/unit/phpunit.xml.dist                             | 1 +
 8 files changed, 8 insertions(+)

diff --git a/dev/tests/api-functional/phpunit.xml.dist b/dev/tests/api-functional/phpunit.xml.dist
index 05a952af841e3..d5b3e16c8d9c4 100644
--- a/dev/tests/api-functional/phpunit.xml.dist
+++ b/dev/tests/api-functional/phpunit.xml.dist
@@ -10,6 +10,7 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
          colors="true"
+         columns="max"
          beStrictAboutTestsThatDoNotTestAnything="false"
          bootstrap="./framework/bootstrap.php"
 >
diff --git a/dev/tests/functional/phpunit.xml.dist b/dev/tests/functional/phpunit.xml.dist
index cc632b976feff..248768ff18e70 100644
--- a/dev/tests/functional/phpunit.xml.dist
+++ b/dev/tests/functional/phpunit.xml.dist
@@ -8,6 +8,7 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
          colors="true"
+         columns="max"
          bootstrap="bootstrap.php"
          backupGlobals="false"
          verbose="true"
diff --git a/dev/tests/integration/framework/tests/unit/phpunit.xml.dist b/dev/tests/integration/framework/tests/unit/phpunit.xml.dist
index 6152ce4d89495..b52ca37987cb7 100644
--- a/dev/tests/integration/framework/tests/unit/phpunit.xml.dist
+++ b/dev/tests/integration/framework/tests/unit/phpunit.xml.dist
@@ -8,6 +8,7 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
          colors="true"
+         columns="max"
          beStrictAboutTestsThatDoNotTestAnything="false"
          bootstrap="./framework/bootstrap.php"
 >
diff --git a/dev/tests/integration/phpunit.xml.dist b/dev/tests/integration/phpunit.xml.dist
index 35182e5a674ca..e4e6e33f66d2e 100644
--- a/dev/tests/integration/phpunit.xml.dist
+++ b/dev/tests/integration/phpunit.xml.dist
@@ -8,6 +8,7 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
          colors="true"
+         columns="max"
          beStrictAboutTestsThatDoNotTestAnything="false"
          bootstrap="./framework/bootstrap.php"
          stderr="true"
diff --git a/dev/tests/static/framework/tests/unit/phpunit.xml.dist b/dev/tests/static/framework/tests/unit/phpunit.xml.dist
index 546a437331e0a..57c13a6b3931b 100644
--- a/dev/tests/static/framework/tests/unit/phpunit.xml.dist
+++ b/dev/tests/static/framework/tests/unit/phpunit.xml.dist
@@ -8,6 +8,7 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
          colors="true"
+         columns="max"
          beStrictAboutTestsThatDoNotTestAnything="false"
          bootstrap="../../bootstrap.php"
 >
diff --git a/dev/tests/static/phpunit-all.xml.dist b/dev/tests/static/phpunit-all.xml.dist
index a77f536980c59..626e753c3c242 100644
--- a/dev/tests/static/phpunit-all.xml.dist
+++ b/dev/tests/static/phpunit-all.xml.dist
@@ -10,6 +10,7 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
          colors="true"
+         columns="max"
          bootstrap="./framework/bootstrap.php"
 >
     <testsuites>
diff --git a/dev/tests/static/phpunit.xml.dist b/dev/tests/static/phpunit.xml.dist
index 130d9dde390bb..5dd8565f550d6 100644
--- a/dev/tests/static/phpunit.xml.dist
+++ b/dev/tests/static/phpunit.xml.dist
@@ -10,6 +10,7 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
          colors="true"
+         columns="max"
          beStrictAboutTestsThatDoNotTestAnything="false"
          bootstrap="./framework/bootstrap.php"
 >
diff --git a/dev/tests/unit/phpunit.xml.dist b/dev/tests/unit/phpunit.xml.dist
index 1078c65b89f6a..0b738dc9cd872 100644
--- a/dev/tests/unit/phpunit.xml.dist
+++ b/dev/tests/unit/phpunit.xml.dist
@@ -8,6 +8,7 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.1/phpunit.xsd"
          colors="true"
+         columns="max"
          beStrictAboutTestsThatDoNotTestAnything="false"
          bootstrap="./framework/bootstrap.php"
         >

From e08a775a52c4102d79c2ba92ce9d3603fa0fc194 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@magento.com>
Date: Wed, 6 Sep 2017 16:43:26 +0300
Subject: [PATCH 69/85] MAGETWO-62464: Travis CI: GD2 imagettfbbox creates
 image with invalid size  - Temporarily Skipped
 Magento\Framework\Image\Adapter\InterfaceTest::testCreatePngFromString from
 execution on Travis CI.

---
 .../Magento/Framework/Image/Adapter/InterfaceTest.php         | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php b/dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php
index 9c89b906318ed..4a08763325a81 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php
@@ -547,9 +547,7 @@ public function cropDataProvider()
      */
     public function testCreatePngFromString($pixel1, $expectedColor1, $pixel2, $expectedColor2, $adapterType)
     {
-        if (!function_exists('imagettfbbox')
-            || (getenv('TRAVIS') && getenv('TRAVIS_PHP_VERSION') == '7.1')
-        ) {
+        if (!function_exists('imagettfbbox') || (getenv('TRAVIS'))) {
             $this->markTestSkipped('Workaround for problem with imagettfbbox() function on Travis');
         }
         $adapter = $this->_getAdapter($adapterType);

From 415eb03ee47f80e68c6c884134b4d2dbe02c1672 Mon Sep 17 00:00:00 2001
From: Evgeny Kalashnikov <kenbo@prola.ru>
Date: Thu, 7 Sep 2017 10:28:58 +0400
Subject: [PATCH 70/85] Code generate: add variadic type test

---
 .../Code/Generator/_files/Interceptor.txt     | 34 ++++++++++++++--
 .../Unit/Code/Generator/_files/Sample.php     | 16 +++++++-
 .../Code/Generator/_files/TInterceptor.txt    | 39 +++++++++++++++++++
 .../Unit/Code/Generator/_files/TSample.php    | 17 ++++++++
 4 files changed, 100 insertions(+), 6 deletions(-)

diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Interceptor.txt b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Interceptor.txt
index 896083ab4b720..fe9b4dad7022e 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Interceptor.txt
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Interceptor.txt
@@ -54,13 +54,39 @@ class Interceptor extends \Magento\Framework\Interception\Code\Generator\Sample
     /**
      * {@inheritdoc}
      */
-    public function variadic(... $values)
+    public function firstVariadicParameter(... $variadicValue)
     {
-        $pluginInfo = $this->pluginList->getNext($this->subjectType, 'variadic');
+        $pluginInfo = $this->pluginList->getNext($this->subjectType, 'firstVariadicParameter');
         if (!$pluginInfo) {
-            return parent::variadic(... $values);
+            return parent::firstVariadicParameter(... $variadicValue);
         } else {
-            return $this->___callPlugins('variadic', func_get_args(), $pluginInfo);
+            return $this->___callPlugins('firstVariadicParameter', func_get_args(), $pluginInfo);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function secondVariadicParameter($value, ... $variadicValue)
+    {
+        $pluginInfo = $this->pluginList->getNext($this->subjectType, 'secondVariadicParameter');
+        if (!$pluginInfo) {
+            return parent::secondVariadicParameter($value, ... $variadicValue);
+        } else {
+            return $this->___callPlugins('secondVariadicParameter', func_get_args(), $pluginInfo);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function byRefVariadic(&... $variadicValue)
+    {
+        $pluginInfo = $this->pluginList->getNext($this->subjectType, 'byRefVariadic');
+        if (!$pluginInfo) {
+            return parent::byRefVariadic(... $variadicValue);
+        } else {
+            return $this->___callPlugins('byRefVariadic', func_get_args(), $pluginInfo);
         }
     }
 }
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php
index dd0b4dc1ada17..a862228c07dfd 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php
@@ -8,6 +8,7 @@
 class Sample
 {
     private $attribute;
+    private $variadicAttribute;
 
     public function getValue()
     {
@@ -23,8 +24,19 @@ public function & getReference()
     {
     }
 
-    public function variadic(... $values)
+    public function firstVariadicParameter(...$variadicValue)
     {
-        $this->attribute = array_shift($values);
+        $this->variadicAttribute = $variadicValue;
+    }
+
+    public function secondVariadicParameter($value, ...$variadicValue)
+    {
+        $this->attribute = $value;
+        $this->variadicAttribute = $variadicValue;
+    }
+
+    public function byRefVariadic(& ...$variadicValue)
+    {
+        $this->variadicAttribute = $variadicValue;
     }
 }
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/TInterceptor.txt b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/TInterceptor.txt
index b8cf751150536..86e3a95f48a6a 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/TInterceptor.txt
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/TInterceptor.txt
@@ -37,4 +37,43 @@ class Interceptor extends \Magento\Framework\Interception\Code\Generator\TSample
             return $this->___callPlugins('setValue', func_get_args(), $pluginInfo);
         }
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function typeHintedFirstVariadicParameter(string ... $variadicValue)
+    {
+        $pluginInfo = $this->pluginList->getNext($this->subjectType, 'typeHintedFirstVariadicParameter');
+        if (!$pluginInfo) {
+            return parent::typeHintedFirstVariadicParameter(... $variadicValue);
+        } else {
+            return $this->___callPlugins('typeHintedFirstVariadicParameter', func_get_args(), $pluginInfo);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function typeHintedSecondVariadicParameter(string $value, string ... $variadicValue)
+    {
+        $pluginInfo = $this->pluginList->getNext($this->subjectType, 'typeHintedSecondVariadicParameter');
+        if (!$pluginInfo) {
+            return parent::typeHintedSecondVariadicParameter($value, ... $variadicValue);
+        } else {
+            return $this->___callPlugins('typeHintedSecondVariadicParameter', func_get_args(), $pluginInfo);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function byRefTypeHintedVariadic(string &... $variadicValue)
+    {
+        $pluginInfo = $this->pluginList->getNext($this->subjectType, 'byRefTypeHintedVariadic');
+        if (!$pluginInfo) {
+            return parent::byRefTypeHintedVariadic(... $variadicValue);
+        } else {
+            return $this->___callPlugins('byRefTypeHintedVariadic', func_get_args(), $pluginInfo);
+        }
+    }
 }
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/TSample.php b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/TSample.php
index f751424e59103..df8e8570fdfb5 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/TSample.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/TSample.php
@@ -8,6 +8,7 @@
 class TSample
 {
     private $value;
+    private $variadicValue;
 
     public function getValue() : string
     {
@@ -18,4 +19,20 @@ public function setValue(string $value)
     {
         $this->value = $value;
     }
+
+    public function typeHintedFirstVariadicParameter(string ...$variadicValue)
+    {
+        $this->variadicValue = $variadicValue;
+    }
+
+    public function typeHintedSecondVariadicParameter(string $value, string ...$variadicValue)
+    {
+        $this->value = $value;
+        $this->variadicValue = $variadicValue;
+    }
+
+    public function byRefTypeHintedVariadic(string & ...$variadicValue)
+    {
+        $this->variadicValue = $variadicValue;
+    }
 }

From de77f2e3895b965df53d4a8c47fb73b98786b249 Mon Sep 17 00:00:00 2001
From: Shanavas M <shanavas@disroot.org>
Date: Thu, 7 Sep 2017 09:34:38 +0300
Subject: [PATCH 71/85] Pull variable out of the loop

---
 app/code/Magento/GiftMessage/Setup/InstallData.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/GiftMessage/Setup/InstallData.php b/app/code/Magento/GiftMessage/Setup/InstallData.php
index 75a9ac46bb89f..cc181bce56dc1 100644
--- a/app/code/Magento/GiftMessage/Setup/InstallData.php
+++ b/app/code/Magento/GiftMessage/Setup/InstallData.php
@@ -67,9 +67,9 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
          */
         $options = ['type' => \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, 'visible' => false, 'required' => false];
         $entities = ['quote', 'quote_address', 'quote_item', 'quote_address_item'];
+        /** @var \Magento\Quote\Setup\QuoteSetup $quoteSetup */
+        $quoteSetup = $this->quoteSetupFactory->create(['setup' => $setup]);
         foreach ($entities as $entity) {
-            /** @var \Magento\Quote\Setup\QuoteSetup $quoteSetup */
-            $quoteSetup = $this->quoteSetupFactory->create(['setup' => $setup]);
             $quoteSetup->addAttribute($entity, 'gift_message_id', $options);
         }
 

From 72524c49436267da652f6c7176cf1a219e238a4b Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@magento.com>
Date: Thu, 7 Sep 2017 12:32:51 +0300
Subject: [PATCH 72/85] magento/magento2#10521: Set correct Content-Type header
 for ajax responses in the Magento_UI module

---
 .../Ui/Controller/Adminhtml/Index/Render.php  | 51 ++++++++--------
 .../Ui/Model/UiComponentTypeResolver.php      | 46 +++++++++++++++
 .../Model/UiComponentTypeResolverTest.php     | 58 +++++++++++++++++++
 app/code/Magento/Ui/etc/di.xml                |  9 +++
 4 files changed, 138 insertions(+), 26 deletions(-)
 create mode 100644 app/code/Magento/Ui/Model/UiComponentTypeResolver.php
 create mode 100644 app/code/Magento/Ui/Test/Unit/Model/UiComponentTypeResolverTest.php

diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
index 94a5ea3a71c2d..1477dde1d61f0 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
@@ -9,13 +9,32 @@
 use Magento\Ui\Controller\Adminhtml\AbstractAction;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponentInterface;
-use Magento\Framework\View\Element\UiComponent\ContentType;
+use Magento\Ui\Model\UiComponentTypeResolver;
 
 /**
  * Class Render
  */
 class Render extends AbstractAction
 {
+    /**
+     * @var \Magento\Ui\Model\UiComponentTypeResolver
+     */
+    private $contentTypeResolver;
+
+    /**
+     * @param Context $context
+     * @param UiComponentFactory $factory
+     * @param UiComponentTypeResolver $contentTypeResolver
+     */
+    public function __construct(
+        Context $context,
+        UiComponentFactory $factory,
+        UiComponentTypeResolver $contentTypeResolver
+    ) {
+        parent::__construct($context, $factory);
+        $this->contentTypeResolver = $contentTypeResolver;
+    }
+
     /**
      * Action for AJAX request
      *
@@ -28,10 +47,12 @@ public function execute()
             return;
         }
 
-        $component = $this->factory->create($this->_request->getParam('namespace'));
+        $component = $this->factory->create($this->getRequest()->getParam('namespace'));
         $this->prepareComponent($component);
-        $this->_response->appendBody((string) $component->render());
-        $this->setResponseContentTypeHeader($component);
+        $this->getResponse()->appendBody((string) $component->render());
+
+        $contentType = $this->contentTypeResolver->resolve($component->getContext());
+        $this->getResponse()->setHeader('Content-Type', $contentType, true);
     }
 
     /**
@@ -47,26 +68,4 @@ protected function prepareComponent(UiComponentInterface $component)
         }
         $component->prepare();
     }
-
-    /**
-     * Set the response 'Content-Type' header based on the component's render engine
-     *
-     * @param UiComponentInterface $component
-     * @return void
-     */
-    private function setResponseContentTypeHeader(UiComponentInterface $component)
-    {
-        $contentType = 'text/html';
-
-        if ($component->getContext()) {
-            $renderEngine = $component->getContext()->getRenderEngine();
-            if ($renderEngine instanceof ContentType\Json) {
-                $contentType = 'application/json';
-            } elseif ($renderEngine instanceof ContentType\Xml) {
-                $contentType = 'application/xml';
-            }
-        }
-
-        $this->_response->setHeader('Content-Type', $contentType, true);
-    }
 }
diff --git a/app/code/Magento/Ui/Model/UiComponentTypeResolver.php b/app/code/Magento/Ui/Model/UiComponentTypeResolver.php
new file mode 100644
index 0000000000000..da5eb1e80ed09
--- /dev/null
+++ b/app/code/Magento/Ui/Model/UiComponentTypeResolver.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Ui\Model;
+
+use Magento\Framework\View\Element\UiComponent\ContextInterface as UiComponentContext;
+
+/**
+ * Provides correct Content-Type header value for the Ui Component renderer based on the Accept Type of
+ * the Component Context. Additional types may be added to the type map via di.xml configuration for this resolver.
+ *
+ * This is a workaround for the lacking Content-Type processing in
+ * \Magento\Framework\View\Element\UiComponent\ContentType\ContentTypeInterface
+ */
+class UiComponentTypeResolver
+{
+    /**
+     * @var string
+     */
+    const DEFAULT_CONTENT_TYPE = 'text/html';
+
+    /**
+     * @var array
+     */
+    private $uiComponentTypeMap = [];
+
+    /**
+     * @param array $uiComponentTypeMap
+     */
+    public function __construct(array $uiComponentTypeMap)
+    {
+        $this->uiComponentTypeMap = $uiComponentTypeMap;
+    }
+
+    /**
+     * @param UiComponentContext $componentContext
+     * @return string
+     */
+    public function resolve(UiComponentContext $componentContext): string
+    {
+        $acceptType = $componentContext->getAcceptType();
+        return $this->uiComponentTypeMap[$acceptType] ?? static::DEFAULT_CONTENT_TYPE;
+    }
+}
diff --git a/app/code/Magento/Ui/Test/Unit/Model/UiComponentTypeResolverTest.php b/app/code/Magento/Ui/Test/Unit/Model/UiComponentTypeResolverTest.php
new file mode 100644
index 0000000000000..e9cbb318b3aef
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Unit/Model/UiComponentTypeResolverTest.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Ui\Test\Unit\Model;
+
+use Magento\Ui\Model\UiComponentTypeResolver;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+
+class UiComponentTypeResolverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var UiComponentTypeResolver
+     */
+    private $model;
+
+    /**
+     * @var array
+     */
+    private $contentTypeMap = [];
+
+    protected function setUp()
+    {
+        $this->contentTypeMap = [
+            'xml' => 'application/xml',
+            'json' => 'application/json',
+            'html' => 'text/html'
+        ];
+        $this->model = new UiComponentTypeResolver($this->contentTypeMap);
+    }
+
+    /**
+     * @param string $acceptType
+     * @param string $contentType
+     * @dataProvider resolveDataProvider
+     */
+    public function testResolve(string $acceptType, string $contentType)
+    {
+        $uiComponentContextMock = $this->createMock(ContextInterface::class);
+        $uiComponentContextMock->expects($this->atLeastOnce())->method('getAcceptType')->willReturn($acceptType);
+
+        $this->assertEquals($contentType, $this->model->resolve($uiComponentContextMock));
+    }
+
+    /**
+     * @return array
+     */
+    public function resolveDataProvider(): array
+    {
+        return [
+            ['json', 'application/json'],
+            ['xml', 'application/xml'],
+            ['html', 'text/html'],
+            ['undefined', UiComponentTypeResolver::DEFAULT_CONTENT_TYPE]
+        ];
+    }
+}
diff --git a/app/code/Magento/Ui/etc/di.xml b/app/code/Magento/Ui/etc/di.xml
index b3bc2b0a15260..338c8d467e76d 100644
--- a/app/code/Magento/Ui/etc/di.xml
+++ b/app/code/Magento/Ui/etc/di.xml
@@ -426,4 +426,13 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Ui\Model\UiComponentTypeResolver">
+        <arguments>
+            <argument name="uiComponentTypeMap" xsi:type="array">
+                <item name="html" xsi:type="string">text/html</item>
+                <item name="json" xsi:type="string">application/json</item>
+                <item name="xml" xsi:type="string">application/xml</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

From d47cc77d0129f0a44d2587ab5e71d242b01a3fc4 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@magento.com>
Date: Thu, 7 Sep 2017 13:01:50 +0300
Subject: [PATCH 73/85] magento/magento2#10521: Set correct Content-Type header
 for ajax responses in the Magento_UI module

---
 .../Controller/Adminhtml/Index/RenderTest.php | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php
index 47affbbde7437..0632c19ce112a 100644
--- a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php
@@ -5,7 +5,9 @@
  */
 namespace Magento\Ui\Test\Unit\Controller\Adminhtml\Index;
 
-use \Magento\Ui\Controller\Adminhtml\Index\Render;
+use Magento\Ui\Controller\Adminhtml\Index\Render;
+use Magento\Ui\Model\UiComponentTypeResolver;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
 
 /**
  * Class RenderTest
@@ -32,6 +34,11 @@ class RenderTest extends \PHPUnit\Framework\TestCase
      */
     protected $uiFactoryMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|UiComponentTypeResolver
+     */
+    private $uiComponentTypeResolverMock;
+
     protected function setUp()
     {
         $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
@@ -53,7 +60,11 @@ protected function setUp()
         $this->uiFactoryMock = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponentFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->render = new Render($contextMock, $this->uiFactoryMock);
+
+        $this->uiComponentTypeResolverMock = $this->getMockBuilder(UiComponentTypeResolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->render = new Render($contextMock, $this->uiFactoryMock, $this->uiComponentTypeResolverMock);
     }
 
     public function testExecuteAjaxRequest()
@@ -84,15 +95,22 @@ public function testExecuteAjaxRequest()
             true,
             ['render']
         );
+        $contextMock = $this->createMock(ContextInterface::class);
+
         $viewMock->expects($this->once())
             ->method('render')
             ->willReturn($renderedData);
         $viewMock->expects($this->once())
             ->method('getChildComponents')
             ->willReturn([]);
+        $viewMock->expects($this->atLeastOnce())->method('getContext')->willReturn($contextMock);
         $this->uiFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($viewMock);
+        $this->uiComponentTypeResolverMock->expects($this->once())->method('resolve')->with($contextMock)
+            ->willReturn('application/json');
+        $this->responseMock->expects($this->once())->method('setHeader')
+            ->with('Content-Type', 'application/json', true);
 
         $this->render->executeAjaxRequest();
     }

From b7cc1912906cc21d1e717a8a65f94198415054b9 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@magento.com>
Date: Thu, 7 Sep 2017 14:39:11 +0300
Subject: [PATCH 74/85] MAGETWO-72283: Code generate: support variadic
 parameter #10771

---
 .../Framework/Interception/Code/Generator/Interceptor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php b/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php
index 15d407baba2bb..04298011e792a 100644
--- a/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php
+++ b/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php
@@ -135,7 +135,7 @@ function ($item) {
                         $output .= '... ';
                     }
 
-                    $output .="\${$item['name']}";
+                    $output .= "\${$item['name']}";
                     return $output;
                 },
                 $parameters

From 91abdf819b8ef91855d1224be13e4046aede216f Mon Sep 17 00:00:00 2001
From: Ahmed Hamouda <GitHamo@users.noreply.github.com>
Date: Thu, 7 Sep 2017 13:45:43 +0200
Subject: [PATCH 75/85] Fix spelling mistake in AddressTest.php

Added the T to customer.
---
 app/code/Magento/Customer/Test/Unit/Model/AddressTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Test/Unit/Model/AddressTest.php b/app/code/Magento/Customer/Test/Unit/Model/AddressTest.php
index 9c01177375529..347abfc5bb850 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/AddressTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/AddressTest.php
@@ -82,7 +82,7 @@ public function testCustomerId()
 
     public function testCustomer()
     {
-        $this->address->unsetData('cusomer_id');
+        $this->address->unsetData('customer_id');
         $this->assertFalse($this->address->getCustomer());
 
         $this->address->setCustomerId(self::ORIG_CUSTOMER_ID);

From 25b0343b34d5dcc0d038e1ac424a66412ab26ec6 Mon Sep 17 00:00:00 2001
From: dmanners <dmanners87@gmail.com>
Date: Thu, 7 Sep 2017 12:10:36 +0000
Subject: [PATCH 76/85] Remove the usage of the DataObject for response
 management in the
 app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php

---
 .../Catalog/Controller/Adminhtml/Category/Validate.php       | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php
index 921fdb6198d4e..4eda49068ac3a 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php
@@ -36,11 +36,8 @@ public function __construct(
      */
     public function execute()
     {
-        $response = new \Magento\Framework\DataObject();
-        $response->setError(0);
-
         $resultJson = $this->resultJsonFactory->create();
-        $resultJson->setData($response);
+        $resultJson->setData(['error' => 0]);
         
         return $resultJson;
     }

From 6a7ee81e681f6d621cdfec4f0613d1952588b69d Mon Sep 17 00:00:00 2001
From: Vova Yatsyuk <vova.yatsyuk@gmail.com>
Date: Fri, 8 Sep 2017 12:17:24 +0300
Subject: [PATCH 77/85] Close PayPal popup window in case of rejected request

---
 .../payment/method-renderer/in-context/checkout-express.js    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
index aa17af9d9873c..ccc26a96e11f7 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
@@ -78,7 +78,9 @@ define(
                                     $('body').trigger('processStop');
                                     customerData.invalidate(['cart']);
                                 });
-                            }.bind(this));
+                            }.bind(this)).fail(function() {
+                                paypalExpressCheckout.checkout.closeFlow();
+                            });
                         }
                     }
                 }

From 18d31db305a0f18f3ea70ba9bad4951e09249073 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Fri, 8 Sep 2017 12:42:20 +0300
Subject: [PATCH 78/85] MAGETWO-72085: Allow browser back/forward button to
 shipping step #10698

---
 .../view/frontend/web/js/model/step-navigator.js         | 2 +-
 .../Checkout/view/frontend/web/js/view/shipping.js       | 9 +++++++--
 .../Magento/Checkout/frontend/js/view/shipping.test.js   | 7 ++++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/step-navigator.js b/app/code/Magento/Checkout/view/frontend/web/js/model/step-navigator.js
index 1063284ecf0e2..bfcd0d02585bb 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/step-navigator.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/step-navigator.js
@@ -47,7 +47,7 @@ define([
 
             steps.sort(this.sortItems).forEach(function (element) {
                 if (element.code == hashString || element.alias == hashString) { //eslint-disable-line eqeqeq
-                    element.navigate();
+                    element.navigate(element);
                 } else {
                     element.isVisible(false);
                 }
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
index 65ce1fbee2948..619de95e467f0 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
@@ -126,8 +126,13 @@ define([
             return this;
         },
 
-        navigate: function () {
-            this.isVisible(true);
+        /**
+         * Navigator change hash handler.
+         *
+         * @param {Object} step - navigation step
+         */
+        navigate: function (step) {
+            step && step.isVisible(true);
         },
 
         /**
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/shipping.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/shipping.test.js
index 7061c4d8fde42..be27e16a13786 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/shipping.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/shipping.test.js
@@ -80,7 +80,12 @@ define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
     describe('Magento_Checkout/js/view/shipping', function () {
         describe('"navigate" method', function () {
             it('Check for return value.', function () {
-                expect(obj.navigate()).toBeUndefined();
+                var step = {
+                    isVisible: ko.observable(false)
+                };
+
+                expect(obj.navigate(step)).toBeUndefined();
+                expect(step.isVisible()).toBe(true);
             });
         });
 

From 2b318c3187b7dd50a4a818bee16f0023418b44d9 Mon Sep 17 00:00:00 2001
From: Vova Yatsyuk <vova.yatsyuk@gmail.com>
Date: Fri, 8 Sep 2017 13:59:04 +0300
Subject: [PATCH 79/85] Fixed jscs error: Missing space before opening round
 brace

---
 .../view/payment/method-renderer/in-context/checkout-express.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
index ccc26a96e11f7..1ad59cc97a07f 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
@@ -78,7 +78,7 @@ define(
                                     $('body').trigger('processStop');
                                     customerData.invalidate(['cart']);
                                 });
-                            }.bind(this)).fail(function() {
+                            }.bind(this)).fail(function () {
                                 paypalExpressCheckout.checkout.closeFlow();
                             });
                         }

From 4e9e488cbcebfe33587abf8f91f89f1e99d8cc3f Mon Sep 17 00:00:00 2001
From: Rakesh  Jesadiya <jesadiya.rakesh@gmail.com>
Date: Sat, 9 Sep 2017 11:56:22 +0530
Subject: [PATCH 80/85] response condition order changes.

---
 .../Magento/Customer/view/frontend/web/js/action/login.js   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/view/frontend/web/js/action/login.js b/app/code/Magento/Customer/view/frontend/web/js/action/login.js
index 92c0ee0c3d3d6..a69bae5feb1fc 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/action/login.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/action/login.js
@@ -38,10 +38,10 @@ define([
                     });
                     customerData.invalidate(['customer']);
 
-                    if (redirectUrl) {
-                        window.location.href = redirectUrl;
-                    } else if (response.redirectUrl) {
+                   if (response.redirectUrl) {
                         window.location.href = response.redirectUrl;
+                    } else if (redirectUrl) {
+                        window.location.href = redirectUrl;
                     } else {
                         location.reload();
                     }

From 9c9b1eee66bbaad693387aa2a4392f6ae568cfa2 Mon Sep 17 00:00:00 2001
From: Rakesh  Jesadiya <jesadiya.rakesh@gmail.com>
Date: Sat, 9 Sep 2017 15:32:50 +0530
Subject: [PATCH 81/85] Update login.js

---
 app/code/Magento/Customer/view/frontend/web/js/action/login.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/view/frontend/web/js/action/login.js b/app/code/Magento/Customer/view/frontend/web/js/action/login.js
index a69bae5feb1fc..e87406decf115 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/action/login.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/action/login.js
@@ -37,8 +37,7 @@ define([
                         callback(loginData);
                     });
                     customerData.invalidate(['customer']);
-
-                   if (response.redirectUrl) {
+                    if (response.redirectUrl) {
                         window.location.href = response.redirectUrl;
                     } else if (redirectUrl) {
                         window.location.href = redirectUrl;

From d99def4f2ac355002e406ded351d396e60c69944 Mon Sep 17 00:00:00 2001
From: Michiel Gerritsen <michiel@controlaltdelete.nl>
Date: Mon, 11 Sep 2017 07:17:38 +0200
Subject: [PATCH 82/85] Enable livereload for watch:<theme> commands

---
 dev/tools/grunt/configs/watch.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev/tools/grunt/configs/watch.js b/dev/tools/grunt/configs/watch.js
index a9ce21e55e8eb..356d0b4b7b2d3 100644
--- a/dev/tools/grunt/configs/watch.js
+++ b/dev/tools/grunt/configs/watch.js
@@ -13,6 +13,9 @@ var themeOptions = {};
 
 _.each(themes, function(theme, name) {
     themeOptions[name] = {
+        'options': {
+            livereload: true
+        },
         'files': [
             '<%= combo.autopath(\''+name+'\', path.pub) %>/**/*.less'
         ],

From 2992c60b363a5431399821ed2a2cb50941c09556 Mon Sep 17 00:00:00 2001
From: Rakesh  Jesadiya <jesadiya.rakesh@gmail.com>
Date: Mon, 11 Sep 2017 14:52:43 +0530
Subject: [PATCH 83/85] Changes Update.

---
 app/code/Magento/Customer/view/frontend/web/js/action/login.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Customer/view/frontend/web/js/action/login.js b/app/code/Magento/Customer/view/frontend/web/js/action/login.js
index e87406decf115..0ac99ac35e333 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/action/login.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/action/login.js
@@ -37,6 +37,7 @@ define([
                         callback(loginData);
                     });
                     customerData.invalidate(['customer']);
+                    
                     if (response.redirectUrl) {
                         window.location.href = response.redirectUrl;
                     } else if (redirectUrl) {

From c813f51045bb9fe0804dd2b5fdf42be4c3856058 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@magento.com>
Date: Tue, 12 Sep 2017 16:59:31 +0300
Subject: [PATCH 84/85] magento/magento2#10826: response condition order
 changes.  - Updated coding style

---
 app/code/Magento/Customer/view/frontend/web/js/action/login.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/view/frontend/web/js/action/login.js b/app/code/Magento/Customer/view/frontend/web/js/action/login.js
index 0ac99ac35e333..8bf96cd76b1a8 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/action/login.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/action/login.js
@@ -37,7 +37,7 @@ define([
                         callback(loginData);
                     });
                     customerData.invalidate(['customer']);
-                    
+
                     if (response.redirectUrl) {
                         window.location.href = response.redirectUrl;
                     } else if (redirectUrl) {

From b7ad7b28dc89ce6f06131a726a54dbf34d946337 Mon Sep 17 00:00:00 2001
From: Andrii Lugovyi <alugovyi@magento.com>
Date: Fri, 8 Sep 2017 13:28:18 +0300
Subject: [PATCH 85/85] MAGETWO-72401: fix jenkins unittest

---
 dev/tests/unit/phpunit.xml.dist | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dev/tests/unit/phpunit.xml.dist b/dev/tests/unit/phpunit.xml.dist
index 0b738dc9cd872..d5c11405607d2 100644
--- a/dev/tests/unit/phpunit.xml.dist
+++ b/dev/tests/unit/phpunit.xml.dist
@@ -14,8 +14,6 @@
         >
     <testsuite name="Magento Unit Tests">
         <directory suffix="Test.php">../../../app/code/*/*/Test/Unit</directory>
-        <directory suffix="Test.php">../../../dev/tools/*/*/Test/Unit</directory>
-        <directory suffix="Test.php">../../../dev/tools/*/*/*/Test/Unit</directory>
         <directory suffix="Test.php">../../../lib/internal/*/*/Test/Unit</directory>
         <directory suffix="Test.php">../../../lib/internal/*/*/*/Test/Unit</directory>
         <directory suffix="Test.php">../../../setup/src/*/*/Test/Unit</directory>