Merge remote-tracking branch 'mainlinec/develop' into MAGETWO-51479

Conflicts:
	app/code/Magento/Ui/Component/Form/Element/AbstractOptionsField.php

Author: Bohdan Korablov

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php

@@ -985,14 +985,14 @@ private function invokeMethod($object, $method, $args = [])
     private function getAdvancedPricingMock($methods = [])
     {
         $metadataPoolMock = $this->getMock(
-            \Magento\Framework\Model\Entity\MetadataPool::class,
+            \Magento\Framework\EntityManager\MetadataPool::class,
             [],
             [],
             '',
             false
         );
         $metadataMock = $this->getMock(
-            \Magento\Framework\Model\Entity\EntityMetadata::class,
+            \Magento\Framework\EntityManager\EntityMetadata::class,
             [],
             [],
             '',

app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php

@@ -8,18 +8,12 @@
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Payment\Block\Transparent\Iframe;
-use Magento\Framework\Escaper;
 
 /**
  * Class Redirect
  */
 class Redirect extends \Magento\Authorizenet\Controller\Directpost\Payment
 {
-    /**
-     * @var Escaper
-     */
-    private $escaper;
-
     /**
      * Retrieve params and put javascript into iframe
      *
@@ -29,7 +23,7 @@ public function execute()
     {
         $helper = $this->dataFactory->create('frontend');
 
-        $redirectParams = $this->filterData($this->getRequest()->getParams());
+        $redirectParams = $this->getRequest()->getParams();
         $params = [];
         if (!empty($redirectParams['success'])
             && isset($redirectParams['x_invoice_num'])
@@ -38,9 +32,11 @@ public function execute()
             $this->_getDirectPostSession()->unsetData('quote_id');
             $params['redirect_parent'] = $helper->getSuccessOrderUrl([]);
         }
+
         if (!empty($redirectParams['error_msg'])) {
             $cancelOrder = empty($redirectParams['x_invoice_num']);
             $this->_returnCustomerQuote($cancelOrder, $redirectParams['error_msg']);
+            $params['error_msg'] = $redirectParams['error_msg'];
         }
 
         if (isset($redirectParams['controller_action_name'])
@@ -50,34 +46,8 @@ public function execute()
             unset($params['redirect_parent']);
         }
 
-        $this->_coreRegistry->register(Iframe::REGISTRY_KEY, array_merge($params, $redirectParams));
+        $this->_coreRegistry->register(Iframe::REGISTRY_KEY, $params);
         $this->_view->addPageLayoutHandles();
         $this->_view->loadLayout(false)->renderLayout();
     }
-
-    /**
-     * Escape xss in request data
-     * @param array $data
-     * @return array
-     */
-    private function filterData(array $data)
-    {
-        $self = $this;
-        array_walk($data, function (&$item) use ($self) {
-            $item = $self->getEscaper()->escapeXssInUrl($item);
-        });
-        return $data;
-    }
-
-    /**
-     * Get Escaper instance
-     * @return Escaper
-     */
-    private function getEscaper()
-    {
-        if (!$this->escaper) {
-            $this->escaper = ObjectManager::getInstance()->get(Escaper::class);
-        }
-        return $this->escaper;
-    }
 }

app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/RedirectTest.php

@@ -8,7 +8,6 @@
 use Magento\Authorizenet\Controller\Directpost\Payment\Redirect;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\ViewInterface;
-use Magento\Framework\Escaper;
 use Magento\Framework\Registry;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Payment\Block\Transparent\Iframe;
@@ -34,11 +33,6 @@ class RedirectTest extends \PHPUnit_Framework_TestCase
      */
     private $coreRegistry;
 
-    /**
-     * @var Escaper|MockObject
-     */
-    private $escaper;
-
     /**
      * @var Redirect
      */
@@ -57,21 +51,11 @@ protected function setUp()
             ->setMethods(['register'])
             ->getMock();
 
-        $this->escaper = static::getMockBuilder(Escaper::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['escapeXssInUrl'])
-            ->getMock();
-
         $this->controller = $objectManager->getObject(Redirect::class, [
             'request' => $this->request,
             'view' => $this->view,
             'coreRegistry' => $this->coreRegistry
         ]);
-
-        $refClass = new \ReflectionClass(Redirect::class);
-        $refProperty = $refClass->getProperty('escaper');
-        $refProperty->setAccessible(true);
-        $refProperty->setValue($this->controller, $this->escaper);
     }
 
     /**
@@ -87,14 +71,9 @@ public function testExecute()
             ->method('getParams')
             ->willReturn($params);
 
-        $this->escaper->expects(static::once())
-            ->method('escapeXssInUrl')
-            ->with($url)
-            ->willReturn($url);
-
         $this->coreRegistry->expects(static::once())
             ->method('register')
-            ->with(Iframe::REGISTRY_KEY, $params);
+            ->with(Iframe::REGISTRY_KEY, []);
 
         $this->view->expects(static::once())
             ->method('addPageLayoutHandles');

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php

@@ -82,8 +82,8 @@ protected function _toOptionHtml($action, \Magento\Framework\DataObject $row)
         $actionCaption = '';
         $this->_transformActionData($action, $actionCaption, $row);
 
-        $htmlAttibutes = ['value' => $this->escapeHtml($this->_jsonEncoder->encode($action))];
-        $actionAttributes->setData($htmlAttibutes);
+        $htmlAttributes = ['value' => $this->escapeHtml($this->_jsonEncoder->encode($action))];
+        $actionAttributes->setData($htmlAttributes);
         return '<option ' . $actionAttributes->serialize() . '>' . $actionCaption . '</option>';
     }
 

app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml

@@ -25,7 +25,7 @@
     <?php else: ?>
         <?php echo $block->getHintHtml() ?>
     <?php endif; ?>
-        <div class="tree-store-scope">
+        <div class="admin__fieldset tree-store-scope">
             <?php if ($_element->getComment()): ?>
             <p class="comment"><?php echo $block->escapeHtml($_element->getComment()) ?></p>
             <?php endif; ?>

app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/cells/action-delete.html

@@ -6,10 +6,10 @@
 -->
 <button class="action-delete"
         data-bind="
-            click: function(){ $parents[1].deleteRecord($parent.index, $parent.recordId); },
+            click: function(){ $parent.processingDeleteRecord($record().index, $record().recordId); },
             attr: {
-                title: $parents[1].deleteButtonLabel
+                title: $parent.deleteButtonLabel
             }
         ">
-    <span data-bind="text: $parents[1].deleteButtonLabel"></span>
+    <span data-bind="text: $parent.deleteButtonLabel"></span>
 </button>

app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html

@@ -34,36 +34,44 @@
     </label>
 
     <div class="admin__field-control" data-role="grid-wrapper">
+        <div class="admin__control-table-pagination" visible="!!$data.recordData().length">
+            <div class="admin__data-grid-pager">
+                <button class="action-previous" type="button" data-bind="attr: {title: $t('Previous Page')}, click: previousPage, disable: isFirst()"></button>
+                <input class="admin__control-text" type="number" data-bind="attr: {id: ++ko.uid}, value: currentPage">
+                <label class="admin__control-support-text" data-bind="attr: {for: ko.uid}, text: 'of ' + pages()"></label>
+                <button class="action-next" type="button" data-bind="attr: {title: $t('Next Page')}, click: nextPage, disable: isLast()"></button>
+            </div>
+        </div>
         <div class="admin__control-table-wrapper">
             <table class="admin__dynamic-rows data-grid" data-role="grid">
                 <thead if="element.columnsHeader">
                     <tr>
                         <th if="dndConfig.enabled"
                             class="data-grid-draggable-row-cell"/>
 
-                        <!-- ko foreach: {data: labels, as: 'item'}  -->
-                        <th class="data-grid-th"
-                            text="item.label"
-                            visible="item.visible"
-                            disabled="item.disabled"
-                            css="$parent.setClasses(item)">
+                        <th repeat="foreach: labels, item: '$label'"
+                            class="data-grid-th"
+                            text="$label().label"
+                            visible="$label().visible"
+                            disable="$label().disabled"
+                            css="setClasses($label())">
                         </th>
-                        <!-- /ko -->
                     </tr>
                 </thead>
 
                 <tbody data-bind="foreach: elems">
-                    <tr class="data-row"
-                        css="'_odd-row': $index() % 2">
-                        <td if="$parent.dndConfig.enabled"
+                    <tr repeat="foreach: elems, item: '$record'"
+                        class="data-row"
+                        css="'_odd-row': $index % 2">
+                        <td if="dndConfig.enabled"
                             class="data-grid-draggable-row-cell"
-                            template="name: $parent.dndConfig.template, data: $parent.dnd"/>
+                            template="name: dndConfig.template, data: dnd"/>
 
-                        <!-- ko foreach: { data: elems, as: 'elem'}  -->
+                        <!-- ko fastForEach: { data: $record().elems, as: 'elem'}  -->
                         <td if="elem.template"
                             visible="elem.visible"
-                            disabled="elem.disabled"
-                            css="$parents[1].setClasses(elem)"
+                            disable="elem.disabled"
+                            css="$parent.setClasses(elem)"
                             template="elem.template"
                             attr="'data-index': index"/>
                         <!-- /ko -->

app/code/Magento/Braintree/Controller/Payment/GetNonce.php

@@ -12,10 +12,8 @@
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Framework\Webapi\Exception;
-use Psr\Log\LoggerInterface;
-use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
-use Magento\CheckoutAgreements;
 use Magento\Theme;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class GetNonce

app/code/Magento/Braintree/composer.json

@@ -16,10 +16,12 @@
         "magento/module-catalog": "*",
         "magento/module-quote": "*",
         "magento/module-paypal": "*",
-        "magento/module-checkout-agreements": "*",
         "magento/module-theme": "*",
         "braintree/braintree_php": "3.7.0"
     },
+    "suggest": {
+        "magento/module-checkout-agreements": "100.0.*"
+    },
     "type": "magento2-module",
     "version": "100.0.2",
     "license": [

app/code/Magento/Braintree/etc/module.xml

@@ -15,7 +15,6 @@
             <module name="Magento_Catalog"/>
             <module name="Magento_Quote"/>
             <module name="Magento_Paypal"/>
-            <module name="Magento_CheckoutAgreements"/>
             <module name="Magento_Theme"/>
         </sequence>
     </module>