File tree Expand file tree Collapse file tree 2 files changed +4
-1
lines changed
app/code/Magento/CatalogUrlRewrite/Observer
dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import Expand file tree Collapse file tree 2 files changed +4
-1
lines changed Original file line number Diff line number Diff line change @@ -481,7 +481,7 @@ protected function currentUrlRewritesRegenerate()
481
481
$ url = $ currentUrlRewrite ->getIsAutogenerated ()
482
482
? $ this ->generateForAutogenerated ($ currentUrlRewrite , $ category )
483
483
: $ this ->generateForCustom ($ currentUrlRewrite , $ category );
484
- $ urlRewrites = array_merge ( $ urlRewrites , $ url ) ;
484
+ $ urlRewrites = $ url + $ urlRewrites ;
485
485
}
486
486
487
487
$ this ->product = null ;
Original file line number Diff line number Diff line change @@ -627,6 +627,7 @@ function ($input) {
627
627
explode (', ' , $ optionData )
628
628
)
629
629
);
630
+ // phpcs:ignore Magento2.Performance.ForeachArrayMerge
630
631
$ option = array_merge (...$ option );
631
632
632
633
if (!empty ($ option ['type ' ]) && !empty ($ option ['name ' ])) {
@@ -693,12 +694,14 @@ protected function mergeWithExistingData(
693
694
}
694
695
} else {
695
696
$ existingOptionId = array_search ($ optionKey , $ expectedOptions );
697
+ // phpcs:ignore Magento2.Performance.ForeachArrayMerge
696
698
$ expectedData [$ existingOptionId ] = array_merge (
697
699
$ this ->getOptionData ($ option ),
698
700
$ expectedData [$ existingOptionId ]
699
701
);
700
702
if ($ optionValues ) {
701
703
foreach ($ optionValues as $ optionKey => $ optionValue ) {
704
+ // phpcs:ignore Magento2.Performance.ForeachArrayMerge
702
705
$ expectedValues [$ existingOptionId ][$ optionKey ] = array_merge (
703
706
$ optionValue ,
704
707
$ expectedValues [$ existingOptionId ][$ optionKey ]
You can’t perform that action at this time.
0 commit comments