🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - magento-engcom/magento2ce#1287: [EngCom Team] Batch 6. Forwardports to 2.3-develop (by @magento-engcom-team)
 - magento-engcom/magento2ce#1282: [EngCom Team] Batch 1. Forwardports to 2.3-develop (by @magento-engcom-team)


Fixed GitHub Issues:
 - #6661: XHTML templates Don't Use Schema URNs (reported by @astorm) has been fixed in magento-engcom/magento2ce#1287 by @magento-engcom-team in 2.3-develop branch
   Related commits:


 - #6802: Magento\Search\Helper\getSuggestUrl() not used in search template (reported by @schmengler) has been fixed in magento-engcom/magento2ce#1287 by @magento-engcom-team in 2.3-develop branch
   Related commits:


 - #10811: Replace FollowSymLinks with SymLinksIfOwnerMatch (reported by @s3rj1k) has been fixed in magento-engcom/magento2ce#1287 by @magento-engcom-team in 2.3-develop branch
   Related commits:


 - #10920: Sku => Entity_id relations are fetched inefficiently when inserting attributes values during product import (reported by @diwipl) has been fixed in magento-engcom/magento2ce#1287 by @magento-engcom-team in 2.3-develop branch
   Related commits:


 - #11230: Unit test fails after fresh installation (reported by @bnymn) has been fixed in magento-engcom/magento2ce#1287 by @magento-engcom-team in 2.3-develop branch
   Related commits:


 - #11793: Magento2.1.5 admin shipping report shows wrong currency code (reported by @pushparaj100) has been fixed in magento-engcom/magento2ce#1287 by @magento-engcom-team in 2.3-develop branch
   Related commits:


 - #11880: Magento 2.1.9 Configurable::getUsedProducts returns a different array after product collections is cached (reported by @apedicdev) has been fixed in magento-engcom/magento2ce#1287 by @magento-engcom-team in 2.3-develop branch
   Related commits:


 - #12079: Products in cart report error when we have grouped or bundle product (reported by @mihaifaget) has been fixed in magento-engcom/magento2ce#1287 by @magento-engcom-team in 2.3-develop branch
   Related commits:


 - #5105: Error While send Invoice with Grouped Products (reported by @srbarba) has been fixed in magento-engcom/magento2ce#1282 by @magento-engcom-team in 2.3-develop branch
   Related commits:


 - #7582: Payment methods in payments title in wrong language (reported by @Bartlomiejsz) has been fixed in magento-engcom/magento2ce#1282 by @magento-engcom-team in 2.3-develop branch
   Related commits:


 - #8958: Hint mistake in english language (reported by @MighT-W315H31T) has been fixed in magento-engcom/magento2ce#1282 by @magento-engcom-team in 2.3-develop branch
   Related commits:


 - #9920: stripped-min-length Validation via UI Component Fails with "special" characters (reported by @bap14) has been fixed in magento-engcom/magento2ce#1282 by @magento-engcom-team in 2.3-develop branch
   Related commits:


 - #10317: Region is being overridden when changing from a required-state country to one that is not required (reported by @nei) has been fixed in magento-engcom/magento2ce#1282 by @magento-engcom-team in 2.3-develop branch
   Related commits:


 - #10775: 404 Forbidden sounds not right (reported by @irinikp) has been fixed in magento-engcom/magento2ce#1282 by @magento-engcom-team in 2.3-develop branch
   Related commits:


 - #11163: Magento 2.2.0 Pages showing error: Data key is missing: code-entity (reported by @kfaer) has been fixed in magento-engcom/magento2ce#1282 by @magento-engcom-team in 2.3-develop branch
   Related commits:


 - #11231: Can't close mobile search bar once typed (reported by @BenSpace48) has been fixed in magento-engcom/magento2ce#1282 by @magento-engcom-team in 2.3-develop branch
   Related commits:

Author: magento-team

.htaccess.sample

@@ -111,7 +111,8 @@
 ############################################
 ## enable rewrites
 
-    Options +FollowSymLinks
+    # The following line has better security but add some performance overhead - see https://httpd.apache.org/docs/2.4/en/misc/perf-tuning.html
+    Options -FollowSymLinks +SymLinksIfOwnerMatch
     RewriteEngine on
 
 ############################################

app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php

@@ -34,7 +34,7 @@ public function execute()
     {
         /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
-        $resultPage->setStatusHeader(404, '1.1', 'Forbidden');
+        $resultPage->setStatusHeader(404, '1.1', 'Not Found');
         $resultPage->setHeader('Status', '404 File not found');
         $resultPage->addHandle('adminhtml_noroute');
         return $resultPage;

app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html

@@ -85,7 +85,7 @@
 <div class="messages">
     <div class="message message-notice notice">
         <span
-            translate="'Search strings are either normal strings or regular exceptions (PCRE). They are matched in the same order as entered.'"></span>
+            translate="'Search strings are either normal strings or regular expressions (PCRE). They are matched in the same order as entered.'"></span>
         <br>
         <span
             translate="'Examples'"></span>:

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -5,19 +5,18 @@
  */
 namespace Magento\CatalogImportExport\Model\Import;
 
+use Magento\Catalog\Model\Config as CatalogConfig;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as ValidatorInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Filesystem;
 use Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor;
 use Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface;
 use Magento\Framework\Stdlib\DateTime;
-use Magento\Framework\Filesystem;
 use Magento\ImportExport\Model\Import;
 use Magento\ImportExport\Model\Import\Entity\AbstractEntity;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
-use Magento\Catalog\Model\Config as CatalogConfig;
 
 /**
  * Import entity product model
@@ -1298,20 +1297,15 @@ protected function _saveLinks()
      */
     protected function _saveProductAttributes(array $attributesData)
     {
+        $linkField = $this->getProductEntityLinkField();
         foreach ($attributesData as $tableName => $skuData) {
             $tableData = [];
             foreach ($skuData as $sku => $attributes) {
-                $linkId = $this->_connection->fetchOne(
-                    $this->_connection->select()
-                        ->from($this->getResource()->getTable('catalog_product_entity'))
-                        ->where('sku = ?', (string)$sku)
-                        ->columns($this->getProductEntityLinkField())
-                );
-
+                $linkId = $this->_oldSku[strtolower($sku)][$linkField];
                 foreach ($attributes as $attributeId => $storeValues) {
                     foreach ($storeValues as $storeId => $storeValue) {
                         $tableData[] = [
-                            $this->getProductEntityLinkField() => $linkId,
+                            $linkField => $linkId,
                             'attribute_id' => $attributeId,
                             'store_id' => $storeId,
                             'value' => $storeValue,
@@ -1321,6 +1315,7 @@ protected function _saveProductAttributes(array $attributesData)
             }
             $this->_connection->insertOnDuplicate($tableName, $tableData, ['value']);
         }
+
         return $this;
     }
 

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php

@@ -6,7 +6,6 @@
 namespace Magento\CatalogImportExport\Test\Unit\Model\Import;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Stdlib\DateTime;
 use Magento\ImportExport\Model\Import;
 
 /**
@@ -513,25 +512,6 @@ public function testSaveProductAttributes()
                 ]
             ]
         ];
-        $entityTable = 'catalog_product_entity';
-        $resource = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModel::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getTable'])
-            ->getMock();
-        $resource->expects($this->once())->method('getTable')->with($entityTable)->willReturnArgument(0);
-        $this->_resourceFactory->expects($this->once())->method('create')->willReturn($resource);
-        $selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $selectMock->expects($this->once())->method('from')->with($entityTable, '*', null)->willReturnSelf();
-        $selectMock->expects($this->once())->method('where')->with('sku = ?', $testSku)->willReturnSelf();
-        $selectMock->expects($this->once())->method('columns')->with('entity_id')->willReturnSelf();
-        $this->_connection->expects($this->any())->method('fetchOne')->willReturn(self::ENTITY_ID);
-        $this->_connection->expects($this->any())->method('select')->willReturn($selectMock);
-        $this->_connection->expects($this->any())
-            ->method('quoteInto')
-            ->willReturnCallback([$this, 'returnQuoteCallback']);
-
         $tableData[] = [
             'entity_id' => self::ENTITY_ID,
             'attribute_id' => $attributeId,
@@ -541,6 +521,7 @@ public function testSaveProductAttributes()
         $this->_connection->expects($this->once())
             ->method('insertOnDuplicate')
             ->with($testTable, $tableData, ['value']);
+        $this->setPropertyValue($this->importProduct, '_oldSku', [$testSku => ['entity_id' => self::ENTITY_ID]]);
         $object = $this->invokeMethod($this->importProduct, '_saveProductAttributes', [$attributesData]);
         $this->assertEquals($this->importProduct, $object);
     }

app/code/Magento/Checkout/view/frontend/web/js/region-updater.js

@@ -206,7 +206,7 @@ define([
                     regionInput.removeClass('required-entry');
                 }
 
-                regionList.removeClass('required-entry').hide();
+                regionList.removeClass('required-entry').prop('disabled', 'disabled').hide();
                 regionInput.show();
                 label.attr('for', regionInput.attr('id'));
             }

app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php

@@ -1296,7 +1296,7 @@ private function loadUsedProducts(\Magento\Catalog\Model\Product $product, $cach
                 if ($salableOnly) {
                     $collection = $this->salableProcessor->process($collection);
                 }
-                $usedProducts = $collection->getItems();
+                $usedProducts = array_values($collection->getItems());
                 $this->saveUsedProductsCacheData($product, $usedProducts, $cacheKey);
             }
             $product->setData($dataFieldName, $usedProducts);

app/code/Magento/CustomerImportExport/Model/Import/Customer.php

@@ -270,13 +270,29 @@ protected function _saveCustomerEntities(array $entitiesToCreate, array $entitie
             $this->_connection->insertOnDuplicate(
                 $this->_entityTable,
                 $entitiesToUpdate,
-                $this->customerFields
+                $this->getCustomerEntityFieldsToUpdate($entitiesToUpdate)
             );
         }
 
         return $this;
     }
 
+    /**
+     * Filter the entity that are being updated so we only change fields found in the importer file
+     *
+     * @param array $entitiesToUpdate
+     * @return array
+     */
+    private function getCustomerEntityFieldsToUpdate(array $entitiesToUpdate): array
+    {
+        $firstCustomer = reset($entitiesToUpdate);
+        $columnsToUpdate = array_keys($firstCustomer);
+        $customerFieldsToUpdate = array_filter($this->customerFields, function ($field) use ($columnsToUpdate) {
+            return in_array($field, $columnsToUpdate);
+        });
+        return $customerFieldsToUpdate;
+    }
+
     /**
      * Save customer attributes.
      *

app/code/Magento/GoogleOptimizer/view/adminhtml/ui_component/cms_page_form.xml

@@ -13,7 +13,12 @@
         </settings>
         <container name="google_experiment_container" sortOrder="250">
             <htmlContent name="html_content">
-                <block name="googleOptimizerBlockAdminhtmlFormCmsPage" class="Magento\GoogleOptimizer\Block\Adminhtml\Form\CmsPage" />
+                <block name="googleOptimizerBlockAdminhtmlFormCmsPage" class="Magento\GoogleOptimizer\Block\Adminhtml\Form\CmsPage">
+                    <arguments>
+                        <argument name="code-entity" xsi:type="string">Magento\GoogleOptimizer\Block\Adminhtml\Cms\Page\EntityCmsPage</argument>
+                        <argument name="form-name" xsi:type="string">cms_page_form</argument>
+                    </arguments>
+                </block>
             </htmlContent>
         </container>
     </fieldset>

app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php

@@ -28,6 +28,19 @@ public function addCustomParameter($param, $value)
         return false;
     }
 
+    /**
+     * Wrapper for 'newrelic_notice_error' function
+     *
+     * @param  Exception $exception
+     * @return void
+     */
+    public function reportError($exception)
+    {
+        if (extension_loaded('newrelic')) {
+            newrelic_notice_error($exception->getMessage(), $exception);
+        }
+    }
+
     /**
      * Checks whether newrelic-php5 agent is installed
      *