Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into develop

Author: Oleksandr Karpenko

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/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>

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js

@@ -10,8 +10,9 @@ define([
     'Magento_Checkout/js/view/payment/default',
     'Magento_Braintree/js/view/payment/adapter',
     'Magento_Checkout/js/model/quote',
-    'Magento_Checkout/js/model/full-screen-loader'
-], function ($, _, Component, Braintree, quote, fullScreenLoader) {
+    'Magento_Checkout/js/model/full-screen-loader',
+    'Magento_Checkout/js/model/payment/additional-validators'
+], function ($, _, Component, Braintree, quote, fullScreenLoader, additionalValidators) {
     'use strict';
 
     var checkout;
@@ -173,7 +174,9 @@ define([
          * Triggers when customer click "Continue to PayPal" button
          */
         payWithPayPal: function () {
-            checkout.paypal.initAuthFlow();
+            if (additionalValidators.validate()) {
+                checkout.paypal.initAuthFlow();
+            }
         },
 
         /**

app/code/Magento/Braintree/view/frontend/web/template/payment/form.html

@@ -131,6 +131,11 @@
             </fieldset>
             <input type="submit" id="braintree_submit"  style="display:none" />
         </form>
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
         <div class="actions-toolbar">
             <div class="primary">
                 <button class="action primary checkout"

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php

@@ -40,6 +40,8 @@ class Helper
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\Filter\Date
+     *
+     * @deprecated
      */
     protected $dateFilter;
 
@@ -68,6 +70,11 @@ class Helper
      */
     private $linkResolver;
 
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\Filter\DateTime
+     */
+    private $dateTimeFilter;
+
     /**
      * Helper constructor.
      * @param \Magento\Framework\App\RequestInterface $request
@@ -94,17 +101,17 @@ public function __construct(
     }
 
     /**
-     * Initialize product before saving
+     * Initialize product from data
      *
      * @param \Magento\Catalog\Model\Product $product
+     * @param array $productData
      * @return \Magento\Catalog\Model\Product
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function initialize(\Magento\Catalog\Model\Product $product)
+    public function initializeFromData(\Magento\Catalog\Model\Product $product, array $productData)
     {
-        $productData = (array)$this->request->getPost('product', []);
         unset($productData['custom_attributes']);
         unset($productData['extension_attributes']);
 
@@ -142,14 +149,20 @@ public function initialize(\Magento\Catalog\Model\Product $product)
         foreach ($attributes as $attrKey => $attribute) {
             if ($attribute->getBackend()->getType() == 'datetime') {
                 if (array_key_exists($attrKey, $productData) && $productData[$attrKey] != '') {
-                    $dateFieldFilters[$attrKey] = $this->dateFilter;
+                    $dateFieldFilters[$attrKey] = $this->getDateTimeFilter();
                 }
             }
         }
 
         $inputFilter = new \Zend_Filter_Input($dateFieldFilters, [], $productData);
         $productData = $inputFilter->getUnescaped();
 
+        if (isset($productData['options'])) {
+            $productOptions = $productData['options'];
+            unset($productData['options']);
+        } else {
+            $productOptions = [];
+        }
         $product->addData($productData);
 
         if ($wasLockedMedia) {
@@ -176,15 +189,20 @@ public function initialize(\Magento\Catalog\Model\Product $product)
         /**
          * Initialize product options
          */
-        if (isset($productData['options']) && !$product->getOptionsReadonly()) {
+        if ($productOptions && !$product->getOptionsReadonly()) {
             // mark custom options that should to fall back to default value
             $options = $this->mergeProductOptions(
-                $productData['options'],
+                $productOptions,
                 $this->request->getPost('options_use_default')
             );
             $customOptions = [];
             foreach ($options as $customOptionData) {
                 if (empty($customOptionData['is_delete'])) {
+                    if (isset($customOptionData['values'])) {
+                        $customOptionData['values'] = array_filter($customOptionData['values'], function ($valueData) {
+                            return empty($valueData['is_delete']);
+                        });
+                    }
                     $customOption = $this->getCustomOptionFactory()->create(['data' => $customOptionData]);
                     $customOption->setProductSku($product->getSku());
                     $customOption->setOptionId(null);
@@ -200,6 +218,18 @@ public function initialize(\Magento\Catalog\Model\Product $product)
 
         return $product;
     }
+    
+    /**
+     * Initialize product before saving
+     *
+     * @param \Magento\Catalog\Model\Product $product
+     * @return \Magento\Catalog\Model\Product
+     */
+    public function initialize(\Magento\Catalog\Model\Product $product)
+    {
+        $productData = $this->request->getPost('product', []);
+        return $this->initializeFromData($product, $productData);
+    }
 
     /**
      * Setting product links
@@ -340,4 +370,18 @@ private function getLinkResolver()
         }
         return $this->linkResolver;
     }
+
+    /**
+     * @return \Magento\Framework\Stdlib\DateTime\Filter\DateTime
+     *
+     * @deprecated
+     */
+    private function getDateTimeFilter()
+    {
+        if ($this->dateTimeFilter === null) {
+            $this->dateTimeFilter = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Magento\Framework\Stdlib\DateTime\Filter\DateTime::class);
+        }
+        return $this->dateTimeFilter;
+    }
 }

app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php

@@ -8,6 +8,7 @@
 
 use Magento\Backend\App\Action;
 use Magento\Catalog\Controller\Adminhtml\Product;
+use Magento\Framework\App\ObjectManager;
 
 class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product
 {
@@ -26,6 +27,11 @@ class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product
      */
     protected $resultForwardFactory;
 
+    /**
+     * @var Initialization\Helper
+     */
+    protected $initializationHelper;
+
     /**
      * @param Action\Context $context
      * @param Builder $productBuilder
@@ -69,7 +75,7 @@ public function execute()
         if ($productData) {
             $stockData = isset($productData['stock_data']) ? $productData['stock_data'] : [];
             $productData['stock_data'] = $this->stockFilter->filter($stockData);
-            $product->addData($productData);
+            $product = $this->getInitializationHelper()->initializeFromData($product, $productData);
         }
 
         $this->_eventManager->dispatch('catalog_product_new_action', ['product' => $product]);
@@ -92,4 +98,16 @@ public function execute()
 
         return $resultPage;
     }
+
+    /**
+     * @return Initialization\Helper
+     * @deprecated
+     */
+    protected function getInitializationHelper()
+    {
+        if (null === $this->initializationHelper) {
+            $this->initializationHelper = ObjectManager::getInstance()->get(Initialization\Helper::class);
+        }
+        return $this->initializationHelper;
+    }
 }