#23085: Static test fix.

engcom-Foxtrot · engcom-Foxtrot · commit 8a87635c053f · 2019-08-19T13:52:56.000+03:00
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Address.php b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
@@ -761,6 +761,7 @@ protected function _saveCustomerDefaults(array $defaults)
     {
         foreach ($defaults as $tableName => $data) {
             foreach ($data as $customerId => $defaultsData) {
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $data = array_merge(
                     ['entity_id' => $customerId],
                     $defaultsData
@@ -801,11 +802,13 @@ public function getEntityTypeCode()
      *
      * @static
      * @return array
+     * phpcs:disable Magento2.Functions.StaticFunction
      */
     public static function getDefaultAddressAttributeMapping()
     {
         return self::$_defaultAddressAttributeMapping;
     }
+    // phpcs:enable
 
     /**
      * Check if address for import is empty (for customer composite mode)

Original file line number	Diff line number	Diff line change
`@@ -761,6 +761,7 @@ protected function _saveCustomerDefaults(array $defaults)`
`761`	`761`	`{`
`762`	`762`	`foreach ($defaults as $tableName => $data) {`
`763`	`763`	`foreach ($data as $customerId => $defaultsData) {`
	`764`	`+ // phpcs:ignore Magento2.Performance.ForeachArrayMerge`
`764`	`765`	`$data = array_merge(`
`765`	`766`	`['entity_id' => $customerId],`
`766`	`767`	`$defaultsData`
`@@ -801,11 +802,13 @@ public function getEntityTypeCode()`
`801`	`802`	`*`
`802`	`803`	`* @static`
`803`	`804`	`* @return array`
	`805`	`+ * phpcs:disable Magento2.Functions.StaticFunction`
`804`	`806`	`*/`
`805`	`807`	`public static function getDefaultAddressAttributeMapping()`
`806`	`808`	`{`
`807`	`809`	`return self::$_defaultAddressAttributeMapping;`
`808`	`810`	`}`
	`811`	`+ // phpcs:enable`
`809`	`812`
`810`	`813`	`/**`
`811`	`814`	`* Check if address for import is empty (for customer composite mode)`