ISSUE-9924 Merge remote-tracking branch 'upstream/develop' into issue…

…-9924 * upstream/develop: (60 commits) Fix typo in comment Move prefix and suffix default values to a new PR MAGETWO-68877: Issue magento#7988 Typo changed also added comments for each index, getters and setters. magento#9484 Revert "MAGETWO-69728: Fixes layered navigation options being cached using the wrong store id. magento#9873" MAGETWO-67500: setup:di:compile returns exit code 0 if errors are found magento#7780 Fix prefix, middle name and suffix were not prefilled in the checkout add middle name to checkout address html templates magento#8878 Using Command output as message which actually provides more information for debugging than just the path Handling CLI error as a failure when validating composer.json file MAGETWO-69805: Return array of blocks as items instead of array of arrays magento#9157 MAGETWO-69666: Return array of pages as items instead of array of arrays magento#9823 MAGETWO-69723: Email to a Friend feature magento#9824 MAGETWO-69539: PHP "soap" extension is not declared in composer.json but can be used by Magento modules MAGETWO-67087: Saving category deletes url-rewrites for products in anchor categories MAGETWO-63054: [Catalog] MSRP field is not displayed for bundle products with fixed price MAGETWO-67087: Saving category deletes url-rewrites for products in anchor categories MAGETWO-67087: Saving category deletes url-rewrites for products in anchor categories MAGETWO-67087: Saving category deletes url-rewrites for products in anchor categories MAGETWO-67087: Saving category deletes url-rewrites for products in anchor categories MAGETWO-67087: Saving category deletes url-rewrites for products in anchor categories ...
AntonEvers · Jun 14, 2017 · 322c357 · 322c357
2 parents 95b1684 + ec99590
commit 322c357
Show file tree

Hide file tree

Showing 77 changed files with 1,311 additions and 227 deletions.
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml
@@ -43,7 +43,7 @@
                        data-validate="{required:true}"
                        value=""
                        placeholder="<?php /* @escapeNotVerified */ echo __('password') ?>"
-                       autocomplete="off"
+                       autocomplete="new-password"
                     />
             </div>
         </div>

diff --git a/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml b/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml
@@ -73,7 +73,7 @@
         <fieldset class="admin__fieldset password-box-container">
             <div class="admin__field field _required">
                 <label for="password" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('User Password')?></span></label>
-                <div class="admin__field-control"><input type="password" name="password" id="password" class="admin__control-text required-entry" autocomplete="off"></div>
+                <div class="admin__field-control"><input type="password" name="password" id="password" class="admin__control-text required-entry" autocomplete="new-password"></div>
             </div>
 
             <div class="admin__field field maintenance-checkbox-container">
@@ -119,7 +119,7 @@
                         <span><?php /* @escapeNotVerified */ echo __('FTP Password') ?></span>
                     </label>
                     <div class="admin__field-control">
-                        <input type="password" class="admin__control-text" name="ftp_pass" id="ftp_pass" autocomplete="off">
+                        <input type="password" class="admin__control-text" name="ftp_pass" id="ftp_pass" autocomplete="new-password">
                     </div>
                 </div>
                 <div class="admin__field field">

diff --git a/app/code/Magento/Braintree/Block/Paypal/Button.php b/app/code/Magento/Braintree/Block/Paypal/Button.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Braintree\Block\Paypal;
 
-use Magento\Checkout\Model\Session;
+use Magento\Braintree\Gateway\Config\PayPal\Config;
+use Magento\Braintree\Model\Ui\ConfigProvider;
 use Magento\Catalog\Block\ShortcutInterface;
-use Magento\Framework\View\Element\Template;
+use Magento\Checkout\Model\Session;
 use Magento\Framework\Locale\ResolverInterface;
-use Magento\Braintree\Model\Ui\ConfigProvider;
+use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
-use Magento\Braintree\Gateway\Config\PayPal\Config;
 use Magento\Payment\Model\MethodInterface;
 
 /**
@@ -110,7 +110,7 @@ public function getContainerId()
      */
     public function getLocale()
     {
-        return strtolower($this->localeResolver->getLocale());
+        return $this->localeResolver->getLocale();
     }
 
     /**

diff --git a/app/code/Magento/Braintree/Model/LocaleResolver.php b/app/code/Magento/Braintree/Model/LocaleResolver.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Model;
+
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Braintree\Gateway\Config\PayPal\Config;
+
+class LocaleResolver implements ResolverInterface
+{
+    /**
+     * @var ResolverInterface
+     */
+    private $resolver;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @param ResolverInterface $resolver
+     * @param Config $config
+     */
+    public function __construct(ResolverInterface $resolver, Config $config)
+    {
+        $this->resolver = $resolver;
+        $this->config = $config;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDefaultLocalePath()
+    {
+        return $this->resolver->getDefaultLocalePath();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setDefaultLocale($locale)
+    {
+        return $this->resolver->setDefaultLocale($locale);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDefaultLocale()
+    {
+        return $this->resolver->getDefaultLocale();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setLocale($locale = null)
+    {
+        return $this->resolver->setLocale($locale);
+    }
+
+    /**
+     * Gets store's locale or the `en_US` locale if store's locale does not supported by PayPal.
+     *
+     * @return string
+     */
+    public function getLocale()
+    {
+        $locale = $this->resolver->getLocale();
+        $allowedLocales = $this->config->getValue('supported_locales');
+
+        return strpos($allowedLocales, $locale) !== false ? $locale : 'en_US';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function emulate($scopeId)
+    {
+        return $this->resolver->emulate($scopeId);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function revert()
+    {
+        return $this->resolver->revert();
+    }
+}
diff --git a/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php b/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
@@ -54,7 +54,7 @@ public function getConfig()
                     'title' => $this->config->getTitle(),
                     'isAllowShippingAddressOverride' => $this->config->isAllowToEditShippingAddress(),
                     'merchantName' => $this->config->getMerchantName(),
-                    'locale' => strtolower($this->resolver->getLocale()),
+                    'locale' => $this->resolver->getLocale(),
                     'paymentAcceptanceMarkSrc' =>
                         'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png',
                     'vaultCode' => self::PAYPAL_VAULT_CODE,

diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php
@@ -49,42 +49,35 @@ protected function setUp()
     /**
      * Run test getConfig method
      *
-     * @param array $config
+     * @param array $expected
      * @dataProvider getConfigDataProvider
      */
     public function testGetConfig($expected)
     {
-        $this->config->expects(static::once())
-            ->method('isActive')
+        $this->config->method('isActive')
             ->willReturn(true);
 
-        $this->config->expects(static::once())
-            ->method('isAllowToEditShippingAddress')
+        $this->config->method('isAllowToEditShippingAddress')
             ->willReturn(true);
 
-        $this->config->expects(static::once())
-            ->method('getMerchantName')
+        $this->config->method('getMerchantName')
             ->willReturn('Test');
 
-        $this->config->expects(static::once())
-            ->method('getTitle')
+        $this->config->method('getTitle')
             ->willReturn('Payment Title');
 
-        $this->localeResolver->expects(static::once())
-            ->method('getLocale')
+        $this->localeResolver->method('getLocale')
             ->willReturn('en_US');
 
-        $this->config->expects(static::once())
-            ->method('isSkipOrderReview')
+        $this->config->method('isSkipOrderReview')
             ->willReturn(false);
 
-        $this->config->expects(static::once())
-            ->method('getPayPalIcon')
+        $this->config->method('getPayPalIcon')
             ->willReturn([
                 'width' => 30, 'height' => 26, 'url' => 'https://icon.test.url'
             ]);
 
-        static::assertEquals($expected, $this->configProvider->getConfig());
+        self::assertEquals($expected, $this->configProvider->getConfig());
     }
 
     /**
@@ -101,7 +94,7 @@ public function getConfigDataProvider()
                             'title' => 'Payment Title',
                             'isAllowShippingAddressOverride' => true,
                             'merchantName' => 'Test',
-                            'locale' => 'en_us',
+                            'locale' => 'en_US',
                             'paymentAcceptanceMarkSrc' =>
                                 'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png',
                             'vaultCode' => ConfigProvider::PAYPAL_VAULT_CODE,

diff --git a/app/code/Magento/Braintree/etc/config.xml b/app/code/Magento/Braintree/etc/config.xml
@@ -34,7 +34,7 @@
                 <order_status>processing</order_status>
                 <environment>sandbox</environment>
                 <allowspecific>0</allowspecific>
-                <sdk_url><![CDATA[https://js.braintreegateway.com/js/braintree-2.25.0.min.js]]></sdk_url>
+                <sdk_url><![CDATA[https://js.braintreegateway.com/js/braintree-2.32.0.min.js]]></sdk_url>
                 <public_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <private_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <masked_fields>cvv,number</masked_fields>
@@ -66,6 +66,7 @@
                 <can_capture_vault>1</can_capture_vault>
                 <privateInfoKeys>processorResponseCode,processorResponseText,paymentId</privateInfoKeys>
                 <paymentInfoKeys>processorResponseCode,processorResponseText,paymentId,payerEmail</paymentInfoKeys>
+                <supported_locales>en_US,en_GB,en_AU,da_DK,fr_FR,fr_CA,de_DE,zh_HK,it_IT,nl_NL,no_NO,pl_PL,es_ES,sv_SE,tr_TR,pt_BR,ja_JP,id_ID,ko_KR,pt_PT,ru_RU,th_TH,zh_CN,zh_TW</supported_locales>
             </braintree_paypal>
             <braintree_cc_vault>
                 <model>BraintreeCreditCardVaultFacade</model>

diff --git a/app/code/Magento/Braintree/etc/frontend/di.xml b/app/code/Magento/Braintree/etc/frontend/di.xml
@@ -46,6 +46,7 @@
 
     <type name="Magento\Braintree\Block\Paypal\Button">
         <arguments>
+            <argument name="localeResolver" xsi:type="object">Magento\Braintree\Model\LocaleResolver</argument>
             <argument name="data" xsi:type="array">
                 <item name="template" xsi:type="string">Magento_Braintree::paypal/button.phtml</item>
                 <item name="alias" xsi:type="string">braintree.paypal.mini-cart</item>
@@ -54,4 +55,10 @@
             <argument name="payment" xsi:type="object">BraintreePayPalFacade</argument>
         </arguments>
     </type>
+
+    <type name="Magento\Braintree\Model\Ui\PayPal\ConfigProvider">
+        <arguments>
+            <argument name="resolver" xsi:type="object">Magento\Braintree\Model\LocaleResolver</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Braintree/view/frontend/requirejs-config.js b/app/code/Magento/Braintree/view/frontend/requirejs-config.js
@@ -6,7 +6,7 @@
 var config = {
     map: {
         '*': {
-            braintree: 'https://js.braintreegateway.com/js/braintree-2.25.0.min.js'
+            braintree: 'https://js.braintreegateway.com/js/braintree-2.32.0.min.js'
         }
     }
 };
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/paypal/button.js b/app/code/Magento/Braintree/view/frontend/web/js/paypal/button.js
@@ -105,7 +105,11 @@ define(
                                 event.preventDefault();
 
                                 registry.get(self.integrationName, function (integration) {
-                                    integration.paypal.initAuthFlow();
+                                    try {
+                                        integration.paypal.initAuthFlow();
+                                    } catch (e) {
+                                        $this.attr('disabled', 'disabled');
+                                    }
                                 });
                             });
                     }.bind(this);

diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
@@ -13,7 +13,8 @@ define([
     'Magento_Checkout/js/model/full-screen-loader',
     'Magento_Checkout/js/model/payment/additional-validators',
     'Magento_Vault/js/view/payment/vault-enabler',
-    'Magento_Checkout/js/action/create-billing-address'
+    'Magento_Checkout/js/action/create-billing-address',
+    'mage/translate'
 ], function (
     $,
     _,
@@ -23,7 +24,8 @@ define([
     fullScreenLoader,
     additionalValidators,
     VaultEnabler,
-    createBillingAddress
+    createBillingAddress,
+    $t
 ) {
     'use strict';
 
@@ -403,7 +405,13 @@ define([
          */
         payWithPayPal: function () {
             if (additionalValidators.validate()) {
-                Braintree.checkout.paypal.initAuthFlow();
+                try {
+                    Braintree.checkout.paypal.initAuthFlow();
+                } catch (e) {
+                    this.messageContainer.addErrorMessage({
+                        message: $t('Payment ' + this.getTitle() + ' can\'t be initialized.')
+                    });
+                }
             }
         },
 

diff --git a/app/code/Magento/Catalog/etc/mview.xml b/app/code/Magento/Catalog/etc/mview.xml
@@ -36,7 +36,6 @@
             <table name="catalog_product_entity_decimal" entity_column="entity_id" />
             <table name="catalog_product_entity_gallery" entity_column="entity_id" />
             <table name="catalog_product_entity_int" entity_column="entity_id" />
-            <table name="catalog_product_entity_media_gallery" entity_column="value_id" />
             <table name="catalog_product_entity_media_gallery_value" entity_column="entity_id" />
             <table name="catalog_product_entity_text" entity_column="entity_id" />
             <table name="catalog_product_entity_tier_price" entity_column="entity_id" />

diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml
@@ -27,7 +27,7 @@
                     <formElements>
                         <fileUploader>
                             <settings>
-                                <allowedExtensions>jpg jpeg gif png svg</allowedExtensions>
+                                <allowedExtensions>jpg jpeg gif png</allowedExtensions>
                                 <maxFileSize>2097152</maxFileSize>
                                 <uploaderConfig>
                                     <param xsi:type="string" name="url">theme/design_config_fileUploader/save</param>
@@ -87,7 +87,7 @@
                     <formElements>
                         <fileUploader>
                             <settings>
-                                <allowedExtensions>jpg jpeg gif png svg</allowedExtensions>
+                                <allowedExtensions>jpg jpeg gif png</allowedExtensions>
                                 <maxFileSize>2097152</maxFileSize>
                                 <uploaderConfig>
                                     <param xsi:type="string" name="url">theme/design_config_fileUploader/save</param>
@@ -147,7 +147,7 @@
                     <formElements>
                         <fileUploader>
                             <settings>
-                                <allowedExtensions>jpg jpeg gif png svg</allowedExtensions>
+                                <allowedExtensions>jpg jpeg gif png</allowedExtensions>
                                 <maxFileSize>2097152</maxFileSize>
                                 <uploaderConfig>
                                     <param xsi:type="string" name="url">theme/design_config_fileUploader/save</param>

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -1228,15 +1228,15 @@ protected function _saveLinks()
                                         'linked_product_id' => $linkedId,
                                         'link_type_id' => $linkId,
                                     ];
-                                    if (!empty($linkPositions[$linkedKey])) {
-                                        $positionRows[] = [
-                                            'link_id' => $productLinkKeys[$linkKey],
-                                            'product_link_attribute_id' => $positionAttrId[$linkId],
-                                            'value' => $linkPositions[$linkedKey],
-                                        ];
-                                    }
-                                    $nextLinkId++;
                                 }
+                                if (!empty($linkPositions[$linkedKey])) {
+                                    $positionRows[] = [
+                                        'link_id' => $productLinkKeys[$linkKey],
+                                        'product_link_attribute_id' => $positionAttrId[$linkId],
+                                        'value' => $linkPositions[$linkedKey],
+                                    ];
+                                }
+                                $nextLinkId++;
                             }
                         }
                     }

diff --git a/app/code/Magento/CatalogRule/etc/mview.xml b/app/code/Magento/CatalogRule/etc/mview.xml
@@ -18,7 +18,6 @@
             <table name="catalog_product_entity_decimal" entity_column="entity_id" />
             <table name="catalog_product_entity_gallery" entity_column="entity_id" />
             <table name="catalog_product_entity_int" entity_column="entity_id" />
-            <table name="catalog_product_entity_media_gallery" entity_column="value_id" />
             <table name="catalog_product_entity_media_gallery_value" entity_column="entity_id" />
             <table name="catalog_product_entity_text" entity_column="entity_id" />
             <table name="catalog_product_entity_tier_price" entity_column="entity_id" />

diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Product/AnchorUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/Product/AnchorUrlRewriteGenerator.php
@@ -41,7 +41,7 @@ public function __construct(
     }
 
     /**
-     * Generate list based on categories
+     * Generate product rewrites for anchor categories
      *
      * @param int $storeId
      * @param Product $product

diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Product/CanonicalUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/Product/CanonicalUrlRewriteGenerator.php
@@ -30,7 +30,7 @@ public function __construct(ProductUrlPathGenerator $productUrlPathGenerator, Ur
     }
 
     /**
-     * Generate list based on store view
+     * Generate product rewrites without categories
      *
      * @param int $storeId
      * @param Product $product