🔃 [EngCom] Public Pull Requests - 2.3-develop Minor Fixes

Accepted Public Pull Requests:
 - #22258: Use proper variables for tooltip styles on tablet devices (by @vovayatsyuk)
 - #22239: Spelling Correction (by @ansari-krish)
 - #22117: Previous scrolling to invalid form element is not being canceled on h� (by @yvechirko)
 - #22210: Typography_change (by @krnshah)
 - #22207: Translate comment tag in DHL config settings (by @yogeshsuhagiya)
 - #22205: Translated exception message (by @yogeshsuhagiya)
 - #22201: Correct spelling (by @ravi-chandra3197)
 - #22195: 22166: updated README to follow-up the switch from Bugcrowd to hackerone (by @mautz-et-tong)
 - #22184: Removing incorrect less selector '.abs-cleafix', it has a typo + it i� (by @hostep)
 - #22171: unregister phar only when appropriate (by @adaudenthun)
 - #21821: Aligning tooltip action on dashboard (by @rafaelstz)
 - #22151: Update PatchApplierTest.php - Corrected Spelling (by @ryantfowler)
 - #22128: Fixes issue - #21824. "save_parameters_in_session" set to true for admin user grid (by @jayankaghosh)
 - #22091: Fixed assignment of the guest customer to the guest group when 'Automatic Assignment by VAT ID' is enabled (by @vovayatsyuk)
 - #22046: FIX for issue #21916 - Elasticsearch6 generation does not exist (by @phoenix128)


Fixed GitHub Issues:
 - #21715: Previous scrolling to invalid form element is not being canceled on hitting submit multiple times (reported by @lukeromanowicz) has been fixed in #22117 by @yvechirko in 2.3-develop branch
   Related commits:
     1. 3e0836e

 - #22166: Information and link in README.md file related to Security issue reporting should be updated (reported by @sdzhepa) has been fixed in #22195 by @mautz-et-tong in 2.3-develop branch
   Related commits:
     1. 34bd8bd

 - #21973: Why phar stream is being unregistered? (reported by @kassner) has been fixed in #22171 by @adaudenthun in 2.3-develop branch
   Related commits:
     1. 191fc7c

 - #21824: Filter in admin users grid in backend isn't being remembered (reported by @ihor-sviziev) has been fixed in #22128 by @jayankaghosh in 2.3-develop branch
   Related commits:
     1. a56b987

 - #21916: Elasticsearch6 generation does not exist (reported by @wclshashank) has been fixed in #22046 by @phoenix128 in 2.3-develop branch
   Related commits:
     1. fa079c9
     2. 75684ca
     3. b8ab61b
     4. 6d87330

 - #21976: Magento doesn't work after upgrade from 2.3.0 to 2.3.1 (reported by @dweerd) has been fixed in #22046 by @phoenix128 in 2.3-develop branch
   Related commits:
     1. fa079c9
     2. 75684ca
     3. b8ab61b
     4. 6d87330

Author: magento-engcom-team

CHANGELOG.md

@@ -4136,7 +4136,7 @@ Tests:
   * Moved Multishipping functionality to newly created module Multishipping
   * Extracted Product duplication behavior from Product model to Product\Copier model
   * Replaced event "catalog_model_product_duplicate" with composite Product\Copier model
-  * Replaced event "catalog_product_prepare_save" with controller product initialization helper that can be customozed via plugins
+  * Replaced event "catalog_product_prepare_save" with controller product initialization helper that can be customized via plugins
   * Consolidated Authorize.Net functionality in single module Authorizenet
   * Eliminated dependency of Sales module on Shipping and Usa modules
   * Eliminated dependency of Shipping module on Customer module

README.md

@@ -45,7 +45,7 @@ Please review the [Code Contributions guide](https://devdocs.magento.com/guides/
 
 ## Reporting Security Issues
 
-To report security vulnerabilities in Magento software or web sites, please create a Bugcrowd researcher account [there](https://bugcrowd.com/magento) to submit and follow-up your issue. Learn more about reporting security issues [here](https://magento.com/security/reporting-magento-security-issue).
+To report security vulnerabilities or learn more about reporting security issues in Magento software or web sites visit the [Magento Bug Bounty Program](https://hackerone.com/magento) on hackerone. Please create a hackerone account [there](https://hackerone.com/magento) to submit and follow-up your issue.
 
 Stay up-to-date on the latest security news and patches for Magento by signing up for [Security Alert Notifications](https://magento.com/security/sign-up).
 

app/bootstrap.php

@@ -8,7 +8,9 @@
  * Environment initialization
  */
 error_reporting(E_ALL);
-stream_wrapper_unregister('phar');
+if (in_array('phar', \stream_get_wrappers())) {
+    stream_wrapper_unregister('phar');
+}
 #ini_set('display_errors', 1);
 
 /* PHP version validation */

app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php

@@ -75,7 +75,7 @@ public function execute()
             $this->logger->critical($e);
             $this->messageManager->addExceptionMessage(
                 $e,
-                'The order #' . $quote->getReservedOrderId() . ' cannot be processed.'
+                __('The order #%1 cannot be processed.', $quote->getReservedOrderId())
             );
         }
 

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php

@@ -4,13 +4,13 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes;
+
 /**
- * Bundle Extended Attribures Block
+ * Bundle Extended Attribures Block.
  *
- * @author      Magento Core Team <[email protected]>
+ * @author Magento Core Team <[email protected]>
  */
-namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes;
-
 class Extend extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element
 {
     /**
@@ -75,7 +75,7 @@ public function getElementHtml()
     }
 
     /**
-     * Execute method getElementHtml from parrent class
+     * Execute method getElementHtml from parent class
      *
      * @return string
      */
@@ -85,6 +85,8 @@ public function getParentElementHtml()
     }
 
     /**
+     * Get options.
+     *
      * @return array
      */
     public function getOptions()
@@ -106,6 +108,8 @@ public function getOptions()
     }
 
     /**
+     * Is disabled field.
+     *
      * @return bool
      */
     public function isDisabledField()
@@ -118,6 +122,8 @@ public function isDisabledField()
     }
 
     /**
+     * Get product.
+     *
      * @return mixed
      */
     public function getProduct()
@@ -129,6 +135,8 @@ public function getProduct()
     }
 
     /**
+     * Get extended element.
+     *
      * @param string $switchAttributeCode
      * @return \Magento\Framework\Data\Form\Element\Select
      * @throws \Magento\Framework\Exception\LocalizedException

app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php

@@ -69,6 +69,7 @@ public function __construct(
 
     /**
      * Overloaded method for getting list of bundle options
+     *
      * Caches result in quote item, because it can be used in cart 'recent view' and on same page in cart checkout
      *
      * @return array
@@ -88,7 +89,7 @@ public function getMessages()
         $messages = [];
         $quoteItem = $this->getItem();
 
-        // Add basic messages occuring during this page load
+        // Add basic messages occurring during this page load
         $baseMessages = $quoteItem->getMessage(false);
         if ($baseMessages) {
             foreach ($baseMessages as $message) {

app/code/Magento/Dhl/etc/adminhtml/system.xml

@@ -31,7 +31,7 @@
                 <field id="account" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Account Number</label>
                 </field>
-                <field id="content_type" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                <field id="content_type" translate="label comment" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Content Type (Non Domestic)</label>
                     <comment>Whether to use Documents or NonDocuments service for non domestic shipments. (Shipments within the EU are classed as domestic)</comment>
                     <source_model>Magento\Dhl\Model\Source\Contenttype</source_model>

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

@@ -61,6 +61,7 @@ Title,Title
 Password,Password
 "Account Number","Account Number"
 "Content Type","Content Type"
+"Whether to use Documents or NonDocuments service for non domestic shipments. (Shipments within the EU are classed as domestic)","Whether to use Documents or NonDocuments service for non domestic shipments. (Shipments within the EU are classed as domestic)"
 "Calculate Handling Fee","Calculate Handling Fee"
 "Handling Applied","Handling Applied"
 """Per Order"" allows a single handling fee for the entire order. ""Per Package"" allows an individual handling fee for each package.","""Per Order"" allows a single handling fee for the entire order. ""Per Package"" allows an individual handling fee for each package."

app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php

@@ -7,6 +7,11 @@
 
 use Magento\Framework\Event\ObserverInterface;
 
+/**
+ * Handle customer VAT number on collect_totals_before event of quote address.
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
 class CollectTotalsObserver implements ObserverInterface
 {
     /**
@@ -124,7 +129,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             );
         }
 
-        if ($groupId) {
+        if ($groupId !== null) {
             $address->setPrevQuoteCustomerGroupId($quote->getCustomerGroupId());
             $quote->setCustomerGroupId($groupId);
             $this->customerSession->setCustomerGroupId($groupId);

app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php

@@ -199,7 +199,7 @@ public function testDispatchWithCustomerCountryNotInEUAndNotLoggedCustomerInGrou
             ->method('getNotLoggedInGroup')
             ->will($this->returnValue($this->groupInterfaceMock));
         $this->groupInterfaceMock->expects($this->once())
-            ->method('getId')->will($this->returnValue(0));
+            ->method('getId')->will($this->returnValue(null));
         $this->vatValidatorMock->expects($this->once())
             ->method('isEnabled')
             ->with($this->quoteAddressMock, $this->storeId)
@@ -220,9 +220,6 @@ public function testDispatchWithCustomerCountryNotInEUAndNotLoggedCustomerInGrou
             $this->returnValue(false)
         );
 
-        $groupMock = $this->getMockBuilder(\Magento\Customer\Api\Data\GroupInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
         $this->customerMock->expects($this->once())->method('getId')->will($this->returnValue(null));
 
         /** Assertions */

app/code/Magento/User/view/adminhtml/layout/adminhtml_user_grid_block.xml

@@ -16,6 +16,7 @@
                     <argument name="default_sort" xsi:type="string">username</argument>
                     <argument name="default_dir" xsi:type="string">asc</argument>
                     <argument name="grid_url" xsi:type="url" path="*/*/roleGrid"/>
+                    <argument name="save_parameters_in_session" xsi:type="boolean">true</argument>
                 </arguments>
                 <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" as="grid.columnSet" name="permission.user.grid.columnSet">
                     <arguments>

app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less

@@ -470,8 +470,6 @@ label.mage-error {
     }
 
     .admin__data-grid-header-row {
-        &:extend(.abs-cleafix);
-
         .action-select-multiselect {
             -webkit-appearance: menulist-button;
             appearance: menulist-button;

app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_field-tooltips.less

@@ -22,7 +22,7 @@
 @field-tooltip-content__width: 32rem;
 @field-tooltip-content__z-index: 1;
 
-@field-tooltip-action__margin-left: 2rem;
+@field-tooltip-action__margin-left: 0;
 
 //
 //  Form Fields

app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less

@@ -173,10 +173,10 @@
         width: 0;
     }
     .field-tooltip .field-tooltip-content::before {
-        border-bottom-color: @color-gray40;
+        .lib-css(border-bottom-color, @checkout-tooltip-content__border-color);
     }
     .field-tooltip .field-tooltip-content::after {
-        border-bottom-color: @color-gray-light01;
+        .lib-css(border-bottom-color, @checkout-tooltip-content__background-color);
         top: 1px;
     }
 }

lib/internal/Magento/Framework/Code/Generator.php

@@ -8,11 +8,15 @@
 use Magento\Framework\Code\Generator\DefinedClasses;
 use Magento\Framework\Code\Generator\EntityAbstract;
 use Magento\Framework\Code\Generator\Io;
+use Magento\Framework\ObjectManager\ConfigInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Phrase;
 use Magento\Framework\Filesystem\Driver\File;
 use Psr\Log\LoggerInterface;
 
+/**
+ * Class code generator.
+ */
 class Generator
 {
     const GENERATION_SUCCESS = 'success';
@@ -232,7 +236,21 @@ protected function shouldSkipGeneration($resultEntityType, $sourceClassName, $re
     {
         if (!$resultEntityType || !$sourceClassName) {
             return self::GENERATION_ERROR;
-        } elseif ($this->definedClasses->isClassLoadableFromDisk($resultClass)) {
+        }
+
+        /** @var ConfigInterface $omConfig */
+        $omConfig = $this->objectManager->get(ConfigInterface::class);
+        $virtualTypes = $omConfig->getVirtualTypes();
+
+        /**
+         * Do not try to autogenerate virtual types
+         * For example virtual types with names overlapping autogenerated suffixes
+         */
+        if (isset($virtualTypes[$resultClass])) {
+            return self::GENERATION_SKIP;
+        }
+
+        if ($this->definedClasses->isClassLoadableFromDisk($resultClass)) {
             $generatedFileName = $this->_ioObject->generateResultFileName($resultClass);
             /**
              * Must handle two edge cases: a competing process has generated the class and written it to disc already,
@@ -244,9 +262,12 @@ protected function shouldSkipGeneration($resultEntityType, $sourceClassName, $re
                 $this->_ioObject->includeFile($generatedFileName);
             }
             return self::GENERATION_SKIP;
-        } elseif (!isset($this->_generatedEntities[$resultEntityType])) {
+        }
+
+        if (!isset($this->_generatedEntities[$resultEntityType])) {
             throw new \InvalidArgumentException('Unknown generation entity.');
         }
+
         return false;
     }
 }