merge magento/2.3-develop into magento-trigger/MAGETWO-99210

Author: magento-cicd2

app/code/Magento/Braintree/Controller/Paypal/Review.php

@@ -14,6 +14,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Payment\Model\Method\Logger;
 
 /**
  * Class Review
@@ -25,6 +26,11 @@ class Review extends AbstractAction implements HttpPostActionInterface, HttpGetA
      */
     private $quoteUpdater;
 
+    /**
+     * @var Logger
+     */
+    private $logger;
+
     /**
      * @var string
      */
@@ -37,15 +43,18 @@ class Review extends AbstractAction implements HttpPostActionInterface, HttpGetA
      * @param Config $config
      * @param Session $checkoutSession
      * @param QuoteUpdater $quoteUpdater
+     * @param Logger $logger
      */
     public function __construct(
         Context $context,
         Config $config,
         Session $checkoutSession,
-        QuoteUpdater $quoteUpdater
+        QuoteUpdater $quoteUpdater,
+        Logger $logger
     ) {
         parent::__construct($context, $config, $checkoutSession);
         $this->quoteUpdater = $quoteUpdater;
+        $this->logger = $logger;
     }
 
     /**
@@ -57,6 +66,7 @@ public function execute()
             $this->getRequest()->getPostValue('result', '{}'),
             true
         );
+        $this->logger->debug($requestData);
         $quote = $this->checkoutSession->getQuote();
 
         try {

app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php

@@ -123,8 +123,8 @@ private function updateShippingAddress(Quote $quote, array $details)
     {
         $shippingAddress = $quote->getShippingAddress();
 
-        $shippingAddress->setLastname($details['lastName']);
-        $shippingAddress->setFirstname($details['firstName']);
+        $shippingAddress->setLastname($this->getShippingRecipientLastName($details));
+        $shippingAddress->setFirstname($this->getShippingRecipientFirstName($details));
         $shippingAddress->setEmail($details['email']);
 
         $shippingAddress->setCollectShippingRates(true);
@@ -188,4 +188,30 @@ private function updateAddressData(Address $address, array $addressData)
         $address->setSameAsBilling(false);
         $address->setCustomerAddressId(null);
     }
+
+    /**
+     * Returns shipping recipient first name.
+     *
+     * @param array $details
+     * @return string
+     */
+    private function getShippingRecipientFirstName(array $details)
+    {
+        return isset($details['shippingAddress']['recipientName'])
+            ? explode(' ', $details['shippingAddress']['recipientName'], 2)[0]
+            : $details['firstName'];
+    }
+
+    /**
+     * Returns shipping recipient last name.
+     *
+     * @param array $details
+     * @return string
+     */
+    private function getShippingRecipientLastName(array $details)
+    {
+        return isset($details['shippingAddress']['recipientName'])
+            ? explode(' ', $details['shippingAddress']['recipientName'], 2)[1]
+            : $details['lastName'];
+    }
 }

app/code/Magento/Braintree/Test/Unit/Controller/Paypal/ReviewTest.php

@@ -6,6 +6,7 @@
 
 namespace Magento\Braintree\Test\Unit\Controller\Paypal;
 
+use Magento\Payment\Model\Method\Logger;
 use Magento\Quote\Model\Quote;
 use Magento\Framework\View\Layout;
 use Magento\Checkout\Model\Session;
@@ -65,6 +66,11 @@ class ReviewTest extends \PHPUnit\Framework\TestCase
      */
     private $review;
 
+    /**
+     * @var Logger|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+
     protected function setUp()
     {
         /** @var Context|\PHPUnit_Framework_MockObject_MockObject $contextMock */
@@ -88,6 +94,9 @@ protected function setUp()
             ->getMock();
         $this->messageManagerMock = $this->getMockBuilder(ManagerInterface::class)
             ->getMockForAbstractClass();
+        $this->loggerMock = $this->getMockBuilder(Logger::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $contextMock->expects(self::once())
             ->method('getRequest')
@@ -103,7 +112,8 @@ protected function setUp()
             $contextMock,
             $this->configMock,
             $this->checkoutSessionMock,
-            $this->quoteUpdaterMock
+            $this->quoteUpdaterMock,
+            $this->loggerMock
         );
     }
 

app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php

@@ -165,7 +165,7 @@ private function getDetails(): array
                 'region' => 'IL',
                 'postalCode' => '60618',
                 'countryCodeAlpha2' => 'US',
-                'recipientName' => 'John Doe',
+                'recipientName' => 'Jane Smith',
             ],
             'billingAddress' => [
                 'streetAddress' => '123 Billing Street',
@@ -186,9 +186,9 @@ private function getDetails(): array
     private function updateShippingAddressStep(array $details): void
     {
         $this->shippingAddress->method('setLastname')
-            ->with($details['lastName']);
+            ->with('Smith');
         $this->shippingAddress->method('setFirstname')
-            ->with($details['firstName']);
+            ->with('Jane');
         $this->shippingAddress->method('setEmail')
             ->with($details['email']);
         $this->shippingAddress->method('setCollectShippingRates')

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

@@ -10,8 +10,9 @@ define([
     'Magento_Braintree/js/view/payment/method-renderer/cc-form',
     'Magento_Braintree/js/validator',
     'Magento_Vault/js/view/payment/vault-enabler',
-    'mage/translate'
-], function ($, Component, validator, VaultEnabler, $t) {
+    'mage/translate',
+    'Magento_Checkout/js/model/payment/additional-validators'
+], function ($, Component, validator, VaultEnabler, $t, additionalValidators) {
     'use strict';
 
     return Component.extend({
@@ -154,7 +155,7 @@ define([
          * Trigger order placing
          */
         placeOrderClick: function () {
-            if (this.validateCardType()) {
+            if (this.validateCardType() && additionalValidators.validate()) {
                 this.isPlaceOrderActionAllowed(false);
                 $(this.getSelector('submit')).trigger('click');
             }

app/code/Magento/Catalog/Api/Data/CategoryInterface.php

@@ -1,14 +1,14 @@
 <?php
 /**
- * Category data interface
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
 namespace Magento\Catalog\Api\Data;
 
 /**
+ * Category data interface.
+ *
  * @api
  * @since 100.0.2
  */
@@ -46,11 +46,15 @@ interface CategoryInterface extends \Magento\Framework\Api\CustomAttributesDataI
     /**#@-*/
 
     /**
+     * Retrieve category id.
+     *
      * @return int|null
      */
     public function getId();
 
     /**
+     * Set category id.
+     *
      * @param int $id
      * @return $this
      */
@@ -74,7 +78,7 @@ public function setParentId($parentId);
     /**
      * Get category name
      *
-     * @return string
+     * @return string|null
      */
     public function getName();
 
@@ -132,60 +136,82 @@ public function getLevel();
     public function setLevel($level);
 
     /**
+     * Retrieve children ids comma separated.
+     *
      * @return string|null
      */
     public function getChildren();
 
     /**
+     * Retrieve category creation date and time.
+     *
      * @return string|null
      */
     public function getCreatedAt();
 
     /**
+     * Set category creation date and time.
+     *
      * @param string $createdAt
      * @return $this
      */
     public function setCreatedAt($createdAt);
 
     /**
+     * Retrieve category last update date and time.
+     *
      * @return string|null
      */
     public function getUpdatedAt();
 
     /**
+     * Set category last update date and time.
+     *
      * @param string $updatedAt
      * @return $this
      */
     public function setUpdatedAt($updatedAt);
 
     /**
+     * Retrieve category full path.
+     *
      * @return string|null
      */
     public function getPath();
 
     /**
+     * Set category full path.
+     *
      * @param string $path
      * @return $this
      */
     public function setPath($path);
 
     /**
+     * Retrieve available sort by for category.
+     *
      * @return string[]|null
      */
     public function getAvailableSortBy();
 
     /**
+     * Set available sort by for category.
+     *
      * @param string[]|string $availableSortBy
      * @return $this
      */
     public function setAvailableSortBy($availableSortBy);
 
     /**
+     * Get category is included in menu.
+     *
      * @return bool|null
      */
     public function getIncludeInMenu();
 
     /**
+     * Set category is included in menu.
+     *
      * @param bool $includeInMenu
      * @return $this
      */

app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php

@@ -115,7 +115,7 @@ public function build($storeId, $changedIds, $valueFieldSuffix)
     /**
      * Create empty temporary table with given columns list
      *
-     * @param string $tableName  Table name
+     * @param string $tableName Table name
      * @param array $columns array('columnName' => \Magento\Catalog\Model\ResourceModel\Eav\Attribute, ...)
      * @param string $valueFieldSuffix
      *
@@ -304,12 +304,16 @@ protected function _fillTemporaryTable(
 
                 /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
                 foreach ($columnsList as $columnName => $attribute) {
-                    $countTableName = 't' . $iterationNum++;
+                    $countTableName = 't' . ($iterationNum++);
                     $joinCondition = sprintf(
-                        'e.%3$s = %1$s.%3$s AND %1$s.attribute_id = %2$d AND %1$s.store_id = 0',
+                        'e.%3$s = %1$s.%3$s' .
+                        ' AND %1$s.attribute_id = %2$d' .
+                        ' AND (%1$s.store_id = %4$d' .
+                        ' OR %1$s.store_id = 0)',
                         $countTableName,
                         $attribute->getId(),
-                        $metadata->getLinkField()
+                        $metadata->getLinkField(),
+                        $storeId
                     );
 
                     $select->joinLeft(
@@ -323,9 +327,10 @@ protected function _fillTemporaryTable(
                         $columnValueName = $attributeCode . $valueFieldSuffix;
                         if (isset($flatColumns[$columnValueName])) {
                             $valueJoinCondition = sprintf(
-                                'e.%1$s = %2$s.option_id AND %2$s.store_id = 0',
+                                'e.%1$s = %2$s.option_id AND (%2$s.store_id = %3$d OR %2$s.store_id = 0)',
                                 $attributeCode,
-                                $countTableName
+                                $countTableName,
+                                $storeId
                             );
                             $selectValue->joinLeft(
                                 [

app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CategoriesTest.php

@@ -154,38 +154,4 @@ public function modifyMetaLockedDataProvider()
     {
         return [[true], [false]];
     }
-
-    public function testModifyMetaWithCaching()
-    {
-        $this->arrayManagerMock->expects($this->exactly(2))
-            ->method('findPath')
-            ->willReturn(true);
-        $cacheManager = $this->getMockBuilder(CacheInterface::class)
-            ->getMockForAbstractClass();
-        $cacheManager->expects($this->once())
-            ->method('load')
-            ->with(Categories::CATEGORY_TREE_ID . '_');
-        $cacheManager->expects($this->once())
-            ->method('save');
-        
-        $modifier = $this->createModel();
-        $cacheContextProperty = new \ReflectionProperty(
-            Categories::class,
-            'cacheManager'
-        );
-        $cacheContextProperty->setAccessible(true);
-        $cacheContextProperty->setValue($modifier, $cacheManager);
-
-        $groupCode = 'test_group_code';
-        $meta = [
-            $groupCode => [
-                'children' => [
-                    'category_ids' => [
-                        'sortOrder' => 10,
-                    ],
-                ],
-            ],
-        ];
-        $modifier->modifyMeta($meta);
-    }
 }