🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #11554: Improve attribute checking (by @FreekVandeursen)
 - #16644: Removed double occurrences from Magento modules. (by @sanganinamrata)
 - #16645: Updated Magento_Newsletter's block file. (by @sanganinamrata)
 - #16590: Fix of invalid price for integer currencies when amount less than group size (by @vkublytskyi)
 - #16540: Fix zero price simple failed to resolve as default (by @torreytsui)
 - #16691: Added 'title' attribute to 'img' tag in knockout template files. (by @sanganinamrata)
 - #16690: Added translation function for Magento_Braintree module's template file. (by @sanganinamrata)
 - #16689: Added 'title' attribute to 'a' link. (by @sanganinamrata)
 - #16678: Improved code and remove unnecessary space (by @ronak2ram)
 - #16530: Fixed widget template rendering issue while rewriting widget block. (by @sanganinamrata)
 - #16559: fix icon color variable naming (by @Karlasa)
 - #16711: Fixed typo in SynonymGroupRepositoryInterface (by @AnshuMishra17)
 - #16271: Covered Magento\Checkout\Model\Cart\CollectQuote by Unit Test (by @eduard13)
 - #16675: Prevent running SQL query on every item in the database when the quote is empty (by @LordZardeck)
 - #16669: Prevent servers being slammed from many search suggestion requests (by @LordZardeck)
 - #16646: Corrected Magento_Framework's test xml file. (by @sanganinamrata)
 - #16626: [Backport] Fix type hints and add undefined property in Webapi [2.3-develop] (by @mageprince)
 - #16584: [Backport] Remove the timezone from the date when retrieving the current month from a UTC timestamp. (by @mageprince)


Fixed GitHub Issues:
 - #11717: Wrong price amount on product page (reported by @HirokazuNishi) has been fixed in #16590 by @vkublytskyi in 2.2-develop branch
   Related commits:
     1. e1db595

 - #16529: Rewriting product listing widget block breaks its template rendering. (reported by @sanganinamrata) has been fixed in #16530 by @sanganinamrata in 2.2-develop branch
   Related commits:
     1. 83e3818
     2. 7e173ee

 - #15940: Wrong end of month at Reports for Europe/Berlin time zone if month contains 31 day (reported by @Stepa4man) has been fixed in #16584 by @mageprince in 2.2-develop branch
   Related commits:
     1. e233d6c

Author: magento-engcom-team

app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml

@@ -17,7 +17,7 @@
             <?= /* @escapeNotVerified */ $edition ?>
             class="logo">
             <img class="logo-img" src="<?= /* @escapeNotVerified */ $block->getViewFileUrl($logoSrc) ?>"
-            alt="<?= $block->escapeHtml(__('Magento Admin Panel')) ?>"/>
+            alt="<?= $block->escapeHtml(__('Magento Admin Panel')) ?>" title="<?= $block->escapeHtml(__('Magento Admin Panel')) ?>"/>
         </a>
     <?php break; ?>
     <?php case 'user': ?>

app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml

@@ -34,7 +34,7 @@
         <?php foreach ($block->getValues()->getAttributeBackend()->getImageTypes() as $type): ?>
             <td class="gallery" align="center" style="vertical-align:bottom;">
             <a href="<?= /* @escapeNotVerified */ $image->setType($type)->getSourceUrl() ?>" target="_blank" onclick="imagePreview('<?= $block->getElement()->getHtmlId() ?>_image_<?= /* @escapeNotVerified */ $type ?>_<?= /* @escapeNotVerified */ $image->getValueId() ?>');return false;">
-            <img id="<?= $block->getElement()->getHtmlId() ?>_image_<?= /* @escapeNotVerified */ $type ?>_<?= /* @escapeNotVerified */ $image->getValueId() ?>" src="<?= /* @escapeNotVerified */ $image->setType($type)->getSourceUrl() ?>?<?= /* @escapeNotVerified */ time() ?>" alt="<?= /* @escapeNotVerified */ $image->getValue() ?>" height="25" class="small-image-preview v-middle"/></a><br/>
+            <img id="<?= $block->getElement()->getHtmlId() ?>_image_<?= /* @escapeNotVerified */ $type ?>_<?= /* @escapeNotVerified */ $image->getValueId() ?>" src="<?= /* @escapeNotVerified */ $image->setType($type)->getSourceUrl() ?>?<?= /* @escapeNotVerified */ time() ?>" alt="<?= /* @escapeNotVerified */ $image->getValue() ?>" title="<?= /* @escapeNotVerified */ $image->getValue() ?>" height="25" class="small-image-preview v-middle"/></a><br/>
             <input type="file" name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_<?= /* @escapeNotVerified */ $type ?>[<?= /* @escapeNotVerified */ $image->getValueId() ?>]" size="1"></td>
         <?php endforeach; ?>
         <td class="gallery" align="center" style="vertical-align:bottom;"><input type="input" name="<?= /* @escapeNotVerified */ $block->getElement()->getParentName() ?>[position][<?= /* @escapeNotVerified */ $image->getValueId() ?>]" value="<?= /* @escapeNotVerified */ $image->getPosition() ?>" id="<?= $block->getElement()->getHtmlId() ?>_position_<?= /* @escapeNotVerified */ $image->getValueId() ?>" size="3"/></td>

app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml

@@ -29,6 +29,7 @@ $config = [
        class="action-braintree-paypal-logo" disabled>
         <img class="braintree-paypal-button-hidden"
              src="https://checkout.paypal.com/pwpp/2.17.6/images/pay-with-paypal.png"
-             alt="Pay with PayPal"/>
+             alt="<?= $block->escapeHtml(__('Pay with PayPal')) ?>"
+             title="<?= $block->escapeHtml(__('Pay with PayPal')) ?>"/>
     </button>
 </div>

app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html

@@ -12,7 +12,7 @@
                data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()" />
         <label class="label" data-bind="attr: {'for': getCode()}">
             <!-- PayPal Logo -->
-            <img data-bind="attr: {src: getPaymentAcceptanceMarkSrc(), alt: $t('Acceptance Mark')}"
+            <img data-bind="attr: {src: getPaymentAcceptanceMarkSrc(), alt: $t('Acceptance Mark')}, title: $t('Acceptance Mark')}"
                  class="payment-icon"/>
             <!-- PayPal Logo -->
             <span text="getTitle()"></span>

app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html

@@ -15,6 +15,7 @@
                 <div class="control captcha-image">
                     <img data-bind="attr: {
                                         alt: $t('Please type the letters and numbers below'),
+                                        title: $t('Please type the letters and numbers below'),
                                         height: imageHeight(),
                                         src: getImageSource(),
                                         }"

app/code/Magento/Catalog/Model/Indexer/Category/Product/TableMaintainer.php

@@ -143,7 +143,7 @@ public function getMainTable(int $storeId)
     public function createTablesForStore(int $storeId)
     {
         $mainTableName = $this->getMainTable($storeId);
-        //Create index table for store based on on main replica table
+        //Create index table for store based on main replica table
         //Using main replica table is necessary for backward capability and TableResolver plugin work
         $this->createTable(
             $this->getTable(AbstractAction::MAIN_INDEX_TABLE . $this->additionalTableSuffix),

app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php

@@ -241,7 +241,7 @@ protected function _createItem($label, $value, $count = 0)
     }
 
     /**
-     * Get all product ids from from collection with applied filters
+     * Get all product ids from collection with applied filters
      *
      * @return array
      */

app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php

@@ -307,7 +307,7 @@ protected function _saveValueTitles(\Magento\Framework\Model\AbstractModel $obje
     }
 
     /**
-     * Get first col from from first row for option table
+     * Get first col from first row for option table
      *
      * @param string $tableName
      * @param int $optionId

app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php

@@ -300,7 +300,7 @@ protected function _saveValueTitles(AbstractModel $object)
     }
 
     /**
-     * Get first col from from first row for option table
+     * Get first col from first row for option table
      *
      * @param string $tableName
      * @param int $optionId

app/code/Magento/Catalog/Pricing/Price/ConfiguredRegularPrice.php

@@ -61,7 +61,7 @@ public function setItem(ItemInterface $item)
         $this->item = $item;
         return $this;
     }
-    
+
     /**
      * Price value of product with configured options
      *
@@ -70,8 +70,7 @@ public function setItem(ItemInterface $item)
     public function getValue()
     {
         $basePrice = parent::getValue();
-
-        return ($this->item && $basePrice !== false)
+        return $this->item && $basePrice !== false
             ? $basePrice + $this->configuredOptions->getItemOptionsValue($basePrice, $this->item)
             : $basePrice;
     }