Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-89410-testValidComposer

Author: danielrenaud

.github/ISSUE_TEMPLATE.md

@@ -1,24 +1,35 @@
-<!--- Provide a general summary of the issue in the Title above -->
-<!--- Before adding new issues, please, check this article https://github.com/magento/magento2/wiki/Issue-reporting-guidelines-->
+<!---
+    Thank you for contributing to Magento.
+    To help us process this issue we recommend that you add the following information:
+     - Summary of the issue,
+     - Information on your environment,
+     - Steps to reproduce,
+     - Expected and actual results,
+
+    Please also have a look at our guidelines article before adding a new issue https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
+-->
 
 ### Preconditions
-<!--- Provide a more detailed information of environment you use -->
-<!--- Magento version, tag, HEAD, etc., PHP & MySQL version, etc.. -->
+<!---
+    Please provide as detailed information about your environment as possible.
+    For example Magento version, tag, HEAD, PHP & MySQL version, etc..
+-->
 1. 
 2. 
 
 ### Steps to reproduce
-<!--- Provide a set of unambiguous steps to reproduce this bug include code, if relevant  -->
+<!---
+    It is important to provide a set of clear steps to reproduce this bug.
+    If relevant please include code samples
+-->
 1. 
 2. 
 3. 
 
 ### Expected result
 <!--- Tell us what should happen -->
-1. 
+1. [Screenshot, logs]
 
 ### Actual result
 <!--- Tell us what happens instead -->
 1. [Screenshot, logs]
-
-<!--- (This may be platform independent comment) -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,15 +1,32 @@
-<!--- Provide a general summary of the Pull Request in the Title above -->
+<!---
+    Thank you for contributing to Magento.
+    To help us process this pull request we recommend that you add the following information:
+     - Summary of the pull request,
+     - Issue(s) related to the changes made,
+     - Manual testing scenarios,
+-->
+
+<!--- Please provide a general summary of the Pull Request in the Title above -->
 
 ### Description
-<!--- Provide a description of the changes proposed in the pull request -->
+<!---
+    Please provide a description of the changes proposed in the pull request.
+    Letting us know what has changed and why it needed changing will help us validate this pull request.
+-->
 
 ### Fixed Issues (if relevant)
-<!--- Provide a list of fixed issues in the format magento/magento2#<issue_number>, if relevant  -->
+<!---
+    If relevant, please provide a list of fixed issues in the format magento/magento2#<issue_number>.
+    There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
+-->
 1. magento/magento2#<issue_number>: Issue title
 2. ...
 
 ### Manual testing scenarios
-<!--- Provide a set of unambiguous steps to test the proposed code change -->
+<!---
+    Please provide a set of unambiguous steps to test the proposed code change.
+    Giving us manual testing scenarios will help with the processing and validation process.
+-->
 1. ...
 2. ...
 

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

@@ -447,7 +447,7 @@
     <!-- PayPal value handlers infrastructure -->
     <type name="Magento\Braintree\Gateway\Response\PayPal\VaultDetailsHandler">
         <arguments>
-            <argument name="paymentTokenFactory" xsi:type="object">Magento\Vault\Model\AccountPaymentTokenFactory</argument>
+            <argument name="paymentTokenFactory" xsi:type="object">Magento\Vault\Api\Data\PaymentTokenFactoryInterface</argument>
         </arguments>
     </type>
     <virtualType name="BraintreePayPalValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">

app/code/Magento/Catalog/view/base/web/js/price-options.js

@@ -20,8 +20,10 @@ define([
         optionConfig: {},
         optionHandlers: {},
         optionTemplate: '<%= data.label %>' +
-        '<% if (data.finalPrice.value) { %>' +
+        '<% if (data.finalPrice.value > 0) { %>' +
         ' +<%- data.finalPrice.formatted %>' +
+        '<% } else if (data.finalPrice.value < 0) { %>' +
+        ' <%- data.finalPrice.formatted %>' +
         '<% } %>',
         controlContainer: 'dd'
     };

app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml

@@ -10,7 +10,7 @@
 ?>
 <?php $_total = $block->getItems()->getSize() ?>
 <?php if ($_total): ?>
-    <a href="#" class="action print" title="<?= /* @escapeNotVerified */ __('Print This Page') ?>">
+    <a href="#" class="action print hidden-print" title="<?= /* @escapeNotVerified */ __('Print This Page') ?>">
         <span><?= /* @escapeNotVerified */ __('Print This Page') ?></span>
     </a>
         <div class="table-wrapper comparison">
@@ -29,7 +29,7 @@
                         <?php if ($_i++ == 0): ?>
                             <th scope="row" class="cell label remove"><span><?= /* @escapeNotVerified */ __('Remove Product') ?></span></th>
                         <?php endif; ?>
-                        <td class="cell remove product">
+                        <td class="cell remove product hidden-print">
                             <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
                             <a href="#" data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataRemove($_item) ?>'
                                class="action delete" title="<?= /* @escapeNotVerified */ __('Remove Product') ?>">
@@ -59,7 +59,7 @@
                             </strong>
                             <?= $block->getReviewsSummaryHtml($_item, 'short') ?>
                             <?= /* @escapeNotVerified */ $block->getProductPrice($_item, '-compare-list-top') ?>
-                            <div class="product-item-actions">
+                            <div class="product-item-actions hidden-print">
                                 <div class="actions-primary">
                                     <?php if ($_item->isSaleable()): ?>
                                         <form data-role="tocart-form" action="<?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToCartUrl($_item) ?>" method="post">

app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js

@@ -12,7 +12,7 @@ define([
     $.widget('mage.shoppingCart', {
         /** @inheritdoc */
         _create: function () {
-            var items, i;
+            var items, i, reload;
 
             $(this.options.emptyCartButton).on('click', $.proxy(function () {
                 $(this.options.emptyCartButton).attr('name', 'update_cart_action_temp');
@@ -36,6 +36,27 @@ define([
             $(this.options.continueShoppingButton).on('click', $.proxy(function () {
                 location.href = this.options.continueShoppingUrl;
             }, this));
+
+            $(document).on('ajax:removeFromCart', $.proxy(function () {
+                reload = true;
+                $('div.block.block-minicart').on('dropdowndialogclose', $.proxy(function () {
+                    if (reload === true) {
+                        location.reload();
+                        reload = false;
+                    }
+                    $('div.block.block-minicart').off('dropdowndialogclose');
+                }));
+            }, this));
+            $(document).on('ajax:updateItemQty', $.proxy(function () {
+                reload = true;
+                $('div.block.block-minicart').on('dropdowndialogclose', $.proxy(function () {
+                    if (reload === true) {
+                        location.reload();
+                        reload = false;
+                    }
+                    $('div.block.block-minicart').off('dropdowndialogclose');
+                }));
+            }, this));
         }
     });
 

app/code/Magento/Checkout/view/frontend/web/js/sidebar.js

@@ -220,6 +220,7 @@ define([
          */
         _updateItemQtyAfter: function (elem) {
             this._hideItemButton(elem);
+            $(document).trigger('ajax:updateItemQty');
         },
 
         /**

app/code/Magento/Customer/Model/Customer/NotificationStorage.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Customer\Model\Customer;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Cache\FrontendInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 
@@ -18,21 +19,21 @@ class NotificationStorage
     private $cache;
 
     /**
-     * @param FrontendInterface $cache
-     */
-
-    /**
-     * @param FrontendInterface $cache
+     * @var SerializerInterface
      */
     private $serializer;
 
     /**
      * NotificationStorage constructor.
      * @param FrontendInterface $cache
+     * @param SerializerInterface $serializer
      */
-    public function __construct(FrontendInterface $cache)
-    {
+    public function __construct(
+        FrontendInterface $cache,
+        SerializerInterface $serializer = null
+    ) {
         $this->cache = $cache;
+        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
     }
 
     /**
@@ -45,7 +46,7 @@ public function __construct(FrontendInterface $cache)
     public function add($notificationType, $customerId)
     {
         $this->cache->save(
-            $this->getSerializer()->serialize([
+            $this->serializer->serialize([
                 'customer_id' => $customerId,
                 'notification_type' => $notificationType
             ]),
@@ -88,19 +89,4 @@ private function getCacheKey($notificationType, $customerId)
     {
         return 'notification_' . $notificationType . '_' . $customerId;
     }
-
-    /**
-     * Get serializer
-     *
-     * @return SerializerInterface
-     * @deprecated 100.2.0
-     */
-    private function getSerializer()
-    {
-        if ($this->serializer === null) {
-            $this->serializer = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(SerializerInterface::class);
-        }
-        return $this->serializer;
-    }
 }

app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php

@@ -165,7 +165,7 @@ public function getValue(\Magento\Framework\DataObject $object)
                 $options = $opt->getAllOptions();
                 if ($options) {
                     foreach ($options as $option) {
-                        if ($option['value'] == $value) {
+                        if ($option['value'] === $value) {
                             $valueOption = $option['label'];
                         }
                     }

app/code/Magento/Paypal/Model/Api/Nvp.php

@@ -1025,7 +1025,7 @@ public function callGetPalDetails()
     }
 
     /**
-     * Set Customer BillingA greement call
+     * Set Customer BillingAgreement call
      *
      * @return void
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_SetCustomerBillingAgreement
@@ -1425,15 +1425,15 @@ protected function _deformatNVP($nvpstr)
         $nvpstr = strpos($nvpstr, "\r\n\r\n") !== false ? substr($nvpstr, strpos($nvpstr, "\r\n\r\n") + 4) : $nvpstr;
 
         while (strlen($nvpstr)) {
-            //postion of Key
+            //position of Key
             $keypos = strpos($nvpstr, '=');
             //position of value
             $valuepos = strpos($nvpstr, '&') ? strpos($nvpstr, '&') : strlen($nvpstr);
 
             /*getting the Key and Value values and storing in a Associative Array*/
             $keyval = substr($nvpstr, $intial, $keypos);
             $valval = substr($nvpstr, $keypos + 1, $valuepos - $keypos - 1);
-            //decoding the respose
+            //decoding the response
             $nvpArray[urldecode($keyval)] = urldecode($valval);
             $nvpstr = substr($nvpstr, $valuepos + 1, strlen($nvpstr));
         }