🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #15460: Improvements to the CONTRIBUTING.md document (by @RebeccaBrocton)
 - #15421: Updated font-size variable and standardize #ToDo UI (by @vgelani)
 - #15422: Refactor JavsScript for UrlRewrite module edit page (by @patelnimesh1988)
 - #15435: [Backport] Removed redundant else statement (by @rogyar)
 - #15409: Prevent multiple add-to-cart initializations in case of ajax loaded product listing (by @vovayatsyuk)
 - #15211: Error 500 in Module Manager (by @flancer64)
 - #15340: Submitting search form (mini) with enter key fires event handlers bound by jquery twice (by @amjadm61)
 - #15364: Added language translation for comment tag (by @yogeshks)
 - #15371: Added language translation in template files (by @rahul-kachhadiya)
 - #15258: [backport] fixes for instant purchase module from #15257 (by @mhauri)
 - #15010: [BUGFIX] Added row_id to the flat action indexer so the value isn't s� (by @lewisvoncken)


Fixed GitHub Issues:
 - #15356: Refactore javascript for module URL rewrite (reported by @vgelani) has been fixed in #15422 by @patelnimesh1988 in 2.2-develop branch
   Related commits:
     1. 28642a6

 - #15192: Module Manager module grid is not working Magento 2.2.4 (reported by @jignesh-baldha) has been fixed in #15211 by @flancer64 in 2.2-develop branch
   Related commits:
     1. a95034a
     2. 131a458

 - #13793: Submitting search form (mini) with enter key fires event handlers bound by jquery twice (reported by @koenner01) has been fixed in #15340 by @amjadm61 in 2.2-develop branch
   Related commits:
     1. 153faa6

 - #15361: Comments are not translated for Signifyd module. (reported by @yogeshks) has been fixed in #15364 by @yogeshks in 2.2-develop branch
   Related commits:
     1. f295906

Author: Stanislav Idolov

.github/CONTRIBUTING.md

@@ -1,34 +1,34 @@
 # Contributing to Magento 2 code
 
 Contributions to the Magento 2 codebase are done using the fork & pull model.
-This contribution model has contributors maintaining their own copy of the forked codebase (which can easily be synced with the main copy). The forked repository is then used to submit a request to the base repository to “pull” a set of changes (hence the phrase “pull request”).
+This contribution model has contributors maintaining their own copy of the forked codebase (which can easily be synced with the main copy). The forked repository is then used to submit a request to the base repository to “pull” a set of changes. For more information on pull requests please refer to [GitHub Help](https://help.github.com/articles/about-pull-requests/).
 
-Contributions can take the form of new components/features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations or just good suggestions.
+Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes or optimizations.
 
-The Magento 2 development team will review all issues and contributions submitted by the community of developers in the first in, first out order. During the review we might require clarifications from the contributor. If there is no response from the contributor for two weeks, the issue is closed.
+The Magento 2 development team will review all issues and contributions submitted by the community of developers in the first in, first out order. During the review we might require clarifications from the contributor. If there is no response from the contributor within two weeks, the pull request will be closed.
 
 
 ## Contribution requirements
 
-1. Contributions must adhere to [Magento coding standards](http://devdocs.magento.com/guides/v2.0/coding-standards/bk-coding-standards.html).
-2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request to be merged quickly and without additional clarification requests.
-3. Commits must be accompanied by meaningful commit messages.
-4. PRs which include bug fixing, must be accompanied with step-by-step description of how to reproduce the bug.
+1. Contributions must adhere to the [Magento coding standards](https://devdocs.magento.com/guides/v2.2/coding-standards/bk-coding-standards.html).
+2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request being merged quickly and without additional clarification requests.
+3. Commits must be accompanied by meaningful commit messages. Please see the [Magento Pull Request Template](https://github.com/magento/magento2/blob/2.2-develop/.github/PULL_REQUEST_TEMPLATE.md) for more information.
+4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
 3. PRs which include new logic or new features must be submitted along with:
-* Unit/integration test coverage (we will be releasing more information on writing test coverage in the near future).
-* Proposed [documentation](http://devdocs.magento.com) update. Documentation contributions can be submitted [here](https://github.com/magento/devdocs).
-4. For large features or changes, please [open an issue](https://github.com/magento/magento2/issues) and discuss first. This may prevent duplicate or unnecessary effort, and it may gain you some additional contributors.
-5. All automated tests are passed successfully (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
+* Unit/integration test coverage
+* Proposed [documentation](http://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
+4. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
+5. All automated tests must pass (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
 
 ## Contribution process
 
-If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). By doing that, you will be able to collaborate with the Magento 2 development team, “fork” the Magento 2 project and be able to easily send “pull requests”.
+If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). This will allow you to collaborate with the Magento 2 development team, fork the Magento 2 project and send pull requests.
 
 1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
 2. Review the [Contributor License Agreement](https://magento.com/legaldocuments/mca) if this is your first time contributing.
 3. Create and test your work.
-4. Fork the Magento 2 repository according to [Fork a repository instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow [Create a pull request instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#pull_request).
-5. Once your contribution is received, Magento 2 development team will review the contribution and collaborate with you as needed to improve the quality of the contribution.
+4. Fork the Magento 2 repository according to the [Fork A Repository instructions](http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#pull_request).
+5. Once your contribution is received the Magento 2 development team will review the contribution and collaborate with you as needed.
 
 ## Code of Conduct
 

app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml

@@ -84,7 +84,7 @@ $ccType = $block->getInfoData('cc_type');
                    name="payment[is_active_payment_token_enabler]"
                    class="admin__control-checkbox"/>
             <label class="label" for="<?= /* @noEscape */ $code ?>_vault">
-                <span><?= $block->escapeHtml('Save for later use.') ?></span>
+                <span><?= $block->escapeHtml(__('Save for later use.')) ?></span>
             </label>
         </div>
     <?php endif; ?>

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

@@ -175,6 +175,7 @@ public function write($storeId, $productId, $valueFieldSuffix = '')
 
         if (!empty($updateData)) {
             $updateData += ['entity_id' => $productId];
+            $updateData += ['row_id' => $productId];
             $updateFields = [];
             foreach ($updateData as $key => $value) {
                 $updateFields[$key] = $key;

app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js

@@ -38,6 +38,11 @@ define([
         _bindSubmit: function () {
             var self = this;
 
+            if (this.element.data('catalog-addtocart-initialized')) {
+                return;
+            }
+
+            this.element.data('catalog-addtocart-initialized', 1);
             this.element.on('submit', function (e) {
                 e.preventDefault();
                 self.submitForm($(this));

app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php

@@ -258,9 +258,8 @@ protected function _getSuperAttributeId($productId, $attributeId)
     {
         if (isset($this->_productSuperAttrs["{$productId}_{$attributeId}"])) {
             return $this->_productSuperAttrs["{$productId}_{$attributeId}"];
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**

app/code/Magento/InstantPurchase/Model/InstantPurchaseOption.php

@@ -19,22 +19,22 @@
 class InstantPurchaseOption
 {
     /**
-     * @var PaymentTokenInterface
+     * @var PaymentTokenInterface|null
      */
     private $paymentToken;
 
     /**
-     * @var AddressIn
+     * @var Address|null
      */
     private $shippingAddress;
 
     /**
-     * @var Address
+     * @var Address|null
      */
     private $billingAddress;
 
     /**
-     * @var ShippingMethodInterface
+     * @var ShippingMethodInterface|null
      */
     private $shippingMethod;
 

app/code/Magento/InstantPurchase/Model/InstantPurchaseOptionLoadingFactory.php

@@ -100,7 +100,7 @@ public function create(
     /**
      * Loads customer address model by identifier.
      *
-     * @param $addressId
+     * @param int $addressId
      * @return Address
      */
     private function getAddress($addressId): Address

app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/DeferredShippingMethodChooserPool.php

@@ -32,7 +32,7 @@ public function get($type) : DeferredShippingMethodChooserInterface
     {
         if (!isset($this->choosers[$type])) {
             throw new \InvalidArgumentException(sprintf(
-                'Deferred shipping method chooser is not registered.',
+                'Deferred shipping method %s is not registered.',
                 $type
             ));
         }

app/code/Magento/InstantPurchase/PaymentMethodIntegration/IntegrationsManager.php

@@ -146,7 +146,7 @@ private function findIntegrations(int $storeId): array
      *    </instant_purchase>
      *
      * @param VaultPaymentInterface $paymentMethod
-     * @param $storeId
+     * @param int|string|null|\Magento\Store\Model\Store $storeId
      * @return bool
      */
     private function isIntegrationAvailable(VaultPaymentInterface $paymentMethod, $storeId): bool

app/code/Magento/Multishipping/i18n/en_US.csv

@@ -88,3 +88,5 @@ Options,Options
 "Review Order","Review Order"
 "Select Shipping Method","Select Shipping Method"
 "We received your order!","We received your order!"
+"Ship to:","Ship to:"
+"Error:","Error:"