🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #15292: Fix typo in property name (by @dmytro-ch)
 - #15291: [Backport] Fix typo in database column comment (by @VitaliyBoyko)
 - #15282: [fix] typo in private method name getUniq[ue]ImageIndex (by @mhauri)
 - #15269: Fix typo in Image::open exception message (by @t-richards)
 - #15133: Fix outdated address data when using Braintree's "Pay with PayPal" button (by @vovayatsyuk)
 - #15058: Add 'const' type support to layout arguments (by @IgorVitol)

Author: Stanislav Idolov

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

@@ -7,6 +7,7 @@
 define([
     'jquery',
     'underscore',
+    'mage/utils/wrapper',
     'Magento_Checkout/js/view/payment/default',
     'Magento_Braintree/js/view/payment/adapter',
     'Magento_Checkout/js/model/quote',
@@ -18,6 +19,7 @@ define([
 ], function (
     $,
     _,
+    wrapper,
     Component,
     Braintree,
     quote,
@@ -218,8 +220,9 @@ define([
 
         /**
          * Re-init PayPal Auth Flow
+         * @param {Function} callback - Optional callback
          */
-        reInitPayPal: function () {
+        reInitPayPal: function (callback) {
             if (Braintree.checkout) {
                 Braintree.checkout.teardown(function () {
                     Braintree.checkout = null;
@@ -228,6 +231,18 @@ define([
 
             this.disableButton();
             this.clientConfig.paypal.amount = this.grandTotalAmount;
+            this.clientConfig.paypal.shippingAddressOverride = this.getShippingAddress();
+
+            if (callback) {
+                this.clientConfig.onReady = wrapper.wrap(
+                    this.clientConfig.onReady,
+                    function (original, checkout) {
+                        this.clientConfig.onReady = original;
+                        original(checkout);
+                        callback();
+                    }.bind(this)
+                );
+            }
 
             Braintree.setConfig(this.clientConfig);
             Braintree.setup();
@@ -404,15 +419,19 @@ define([
          * Triggers when customer click "Continue to PayPal" button
          */
         payWithPayPal: function () {
-            if (additionalValidators.validate()) {
+            this.reInitPayPal(function () {
+                if (!additionalValidators.validate()) {
+                    return;
+                }
+
                 try {
                     Braintree.checkout.paypal.initAuthFlow();
                 } catch (e) {
                     this.messageContainer.addErrorMessage({
                         message: $t('Payment ' + this.getTitle() + ' can\'t be initialized.')
                     });
                 }
-            }
+            }.bind(this));
         },
 
         /**

app/code/Magento/Catalog/Console/Command/ImagesResizeCommand.php

@@ -216,7 +216,7 @@ private function getViewImages(array $themes): array
             ]);
             $images = $config->getMediaEntities('Magento_Catalog', ImageHelper::MEDIA_TYPE_CONFIG_NODE);
             foreach ($images as $imageId => $imageData) {
-                $uniqIndex = $this->getUniqImageIndex($imageData);
+                $uniqIndex = $this->getUniqueImageIndex($imageData);
                 $imageData['id'] = $imageId;
                 $viewImages[$uniqIndex] = $imageData;
             }
@@ -225,11 +225,11 @@ private function getViewImages(array $themes): array
     }
 
     /**
-     * Get uniq image index
+     * Get unique image index
      * @param array $imageData
      * @return string
      */
-    private function getUniqImageIndex(array $imageData): string
+    private function getUniqueImageIndex(array $imageData): string
     {
         ksort($imageData);
         unset($imageData['type']);

app/code/Magento/Catalog/Setup/InstallSchema.php

@@ -674,7 +674,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
                 null,
                 ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Attriute Set ID'
+                'Attribute Set ID'
             )
             ->addColumn(
                 'parent_id',

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

@@ -251,6 +251,7 @@
     <type name="Magento\Framework\Data\Argument\Interpreter\Composite">
         <arguments>
             <argument name="interpreters" xsi:type="array">
+                <item name="const" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\Constant</item>
                 <item name="object" xsi:type="object">configurableObjectArgumentInterpreterProxy</item>
                 <item name="configurableObject" xsi:type="object">configurableObjectArgumentInterpreterProxy</item>
                 <item name="array" xsi:type="object">arrayArgumentInterpreterProxy</item>

dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/paypal.test.js

@@ -27,7 +27,24 @@ define([
                     })
                 },
                 'Magento_Braintree/js/view/payment/adapter': {
+                    config: {},
+
+                    /** Stub */
+                    onReady: function () {},
+
+                    /** Stub */
+                    setConfig: function (config) {
+                        this.config = config;
+                    },
+
+                    /** Stub */
+                    setup: function () {
+                        this.config.onReady(this.checkout);
+                    },
+
                     checkout: {
+                        /** Stub */
+                        teardown: function () {},
                         paypal: {
                             /** Stub */
                             initAuthFlow: function () {}

dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php

@@ -31,7 +31,7 @@ class ControllerAclTest extends \PHPUnit\Framework\TestCase
      *
      * @var array
      */
-    private $whiteListetBackendControllers = [];
+    private $whiteListedBackendControllers = [];
 
     /**
      * List of ACL resources collected from acl.xml files.
@@ -57,7 +57,7 @@ protected function setUp()
             if (substr($item, 0, 1) === '#') {
                 continue;
             }
-            $this->whiteListetBackendControllers[$item] = 1;
+            $this->whiteListedBackendControllers[$item] = 1;
         }
     }
 
@@ -83,7 +83,7 @@ public function testAcl()
 
             $controllerClass = $this->getClassByFilePath($controllerPath);
             // skip whitelisted controllers.
-            if (isset($this->whiteListetBackendControllers[$controllerClass->getName()])) {
+            if (isset($this->whiteListedBackendControllers[$controllerClass->getName()])) {
                 continue;
             }
             // we don't have to check abstract classes.

lib/internal/Magento/Framework/Image.php

@@ -49,7 +49,7 @@ public function open()
         $this->_adapter->checkDependencies();
 
         if (!file_exists($this->_fileName)) {
-            throw new \Exception("File '{$this->_fileName}' does not exists.");
+            throw new \Exception("File '{$this->_fileName}' does not exist.");
         }
 
         $this->_adapter->open($this->_fileName);

lib/internal/Magento/Framework/View/Layout/etc/layout_merged.xsd

@@ -62,4 +62,10 @@
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
+
+    <xs:complexType name="const">
+        <xs:complexContent>
+            <xs:extension base="argumentType" />
+        </xs:complexContent>
+    </xs:complexType>
 </xs:schema>

lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd

@@ -32,4 +32,10 @@
             <xs:field xpath="@name"/>
         </xs:unique>
     </xs:element>
+
+    <xs:complexType name="const">
+        <xs:complexContent>
+            <xs:extension base="argumentType" />
+        </xs:complexContent>
+    </xs:complexType>
 </xs:schema>