🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:
 - #17157: [Backport] Removed double occurrence of keywords in sentences. (by @gelanivishal)
 - #17136: [Backport] Remove commented code (by @mage2pratik)

Author: Stanislav Idolov

CHANGELOG.md

@@ -2351,7 +2351,7 @@ Tests:
     * [#686](https://github.com/magento/magento2/issues/686) -- Product save validation errors in the admin don't hide the overlay
     * [#702](https://github.com/magento/magento2/issues/702) -- Base table or view not found
     * [#652](https://github.com/magento/magento2/issues/652) -- Multishipping checkout not to change the Billing address js issue
-    * [#648](https://github.com/magento/magento2/issues/648) -- An equal (=) sign in the hash of the product page to to break the tabs functionality
+    * [#648](https://github.com/magento/magento2/issues/648) -- An equal (=) sign in the hash of the product page to break the tabs functionality
 * Service Contracts:
     * Refactored usage of new API of the Customer module
     * Implemented Service Contracts for the Sales module

app/code/Magento/Backend/Block/Dashboard/Bar.php

@@ -38,14 +38,6 @@ public function getTotals()
      */
     public function addTotal($label, $value, $isQuantity = false)
     {
-        /*if (!$isQuantity) {
-          $value = $this->format($value);
-          $decimals = substr($value, -2);
-          $value = substr($value, 0, -2);
-          } else {
-          $value = ($value != '')?$value:0;
-          $decimals = '';
-          }*/
         if (!$isQuantity) {
             $value = $this->format($value);
         }

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

@@ -123,7 +123,6 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
         // update attributes group and sort
         $attributes = [
             'custom_design' => ['group' => 'design', 'sort' => 10],
-            // 'custom_design_apply' => array('group' => 'design', 'sort' => 20),
             'custom_design_from' => ['group' => 'design', 'sort' => 30],
             'custom_design_to' => ['group' => 'design', 'sort' => 40],
             'page_layout' => ['group' => 'design', 'sort' => 50],

app/code/Magento/Integration/view/adminhtml/web/js/integration.js

@@ -166,8 +166,9 @@ define([
                 try {
                     //Is the success callback invoked
                     if (IdentityLogin.win.closed ||
-                        (IdentityLogin.win.location.href == IdentityLogin.successCallbackUrl)) {
-                        //Stop the the polling
+                        IdentityLogin.win.location.href == IdentityLogin.successCallbackUrl //eslint-disable-line eqeqeq
+                    ) {
+                        //Stop the polling
                         clearInterval(IdentityLogin.checker);
                         $('body').trigger('processStart');
                         //Check for window closed

app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php

@@ -65,12 +65,6 @@ public function getModel()
      */
     protected function _prepareLayout()
     {
-        // Load Wysiwyg on demand and Prepare layout
-//        $block = $this->getLayout()->getBlock('head');
-//        if ($this->_wysiwygConfig->isEnabled() && $block) {
-//            $block->setCanLoadTinyMce(true);
-//        }
-
         $this->getToolbar()->addChild(
             'back_button',
             'Magento\Backend\Block\Widget\Button',

app/code/Magento/Sales/Model/Order/Creditmemo.php

@@ -588,13 +588,6 @@ public function getCommentsCollection($reload = false)
     {
         $collection = $this->_commentCollectionFactory->create()->setCreditmemoFilter($this->getId())
             ->setCreatedAtOrder();
-//
-//            $this->setComments($comments);
-//            /**
-//             * When credit memo created with adding comment,
-//             * comments collection must be loaded before we added this comment.
-//             */
-//            $this->getComments()->load();
 
         if ($this->getId()) {
             foreach ($collection as $comment) {

app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml

@@ -7,14 +7,6 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php /*$_source = $block->getSource(); ?>
-<?php $block->setPriceDataObject($_source) ?>
-<?php if ($_source): ?>
-<table width="100%">
-    <?php echo $block->getChildHtml('main'); ?>
-    <?php echo $block->getChildHtml('footer'); ?>
-</table>
-<?php endif;*/ ?>
 <table class="data-table admin__table-secondary order-subtotal-table">
     <?php $_totals = $block->getTotals('footer')?>
 

dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/ProductRuleTest.php

@@ -66,7 +66,7 @@ public function testReindexWithProductNotVisibleIndividually()
         $this->assertEquals(
             7.5,
             $this->resourceRule->getRulePrice(new \DateTime(), 1, 1, $product->getId()),
-            "Catalog price rule doesn't apply to to product with visibility value \"Not Visibility Individually\""
+            "Catalog price rule doesn't apply to product with visibility value \"Not Visibility Individually\""
         );
     }
 }

dev/tests/integration/testsuite/Magento/Tax/Model/TaxCalculationTest.php

@@ -2189,7 +2189,7 @@ protected function setupMultiRuleQuote()
     }
 
     /**
-     * Create the base results for the the multi rules test
+     * Create the base results for the multi rules test
      *
      * @return array
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)

lib/internal/Magento/Framework/Api/Uploader.php

@@ -21,7 +21,7 @@ public function __construct()
     }
 
     /**
-     * Explicitly set the the file attributes instead of setting it via constructor
+     * Explicitly set the file attributes instead of setting it via constructor
      *
      * @param array $fileAttributes
      * @return void