Replace the parametersMerger with SortedParameterMerger to ensure…

… the order of extra section is consistent
symplify · Aug 7, 2023 · 32957eb · 32957eb
1 parent af9ed4f
commit 32957eb
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/packages/Merge/ComposerKeyMerger/ExtraComposerKeyMerger.php b/packages/Merge/ComposerKeyMerger/ExtraComposerKeyMerger.php
@@ -5,8 +5,8 @@
 namespace Symplify\MonorepoBuilder\Merge\ComposerKeyMerger;
 
 use Symplify\MonorepoBuilder\ComposerJsonManipulator\ValueObject\ComposerJson;
+use Symplify\MonorepoBuilder\Merge\Arrays\SortedParameterMerger;
 use Symplify\MonorepoBuilder\Merge\Contract\ComposerKeyMergerInterface;
-use Symplify\PackageBuilder\Yaml\ParametersMerger;
 
 final class ExtraComposerKeyMerger implements ComposerKeyMergerInterface
 {
@@ -16,7 +16,7 @@ final class ExtraComposerKeyMerger implements ComposerKeyMergerInterface
     private const PHPSTAN = 'phpstan';
 
     public function __construct(
-        private ParametersMerger $parametersMerger
+        private SortedParameterMerger $sorted_parameter_merger
     ) {
     }
 
@@ -37,7 +37,7 @@ public function merge(ComposerJson $mainComposerJson, ComposerJson $newComposerJ
             }
         }
 
-        $extra = $this->parametersMerger->mergeWithCombine($mainComposerJson->getExtra(), $newComposerJsonExtra);
+        $extra = $this->sorted_parameter_merger->mergeRecursiveAndSort($mainComposerJson->getExtra(), $newComposerJsonExtra);
 
         // do not merge extra alias as only for local packages
         if (isset($extra['branch-alias'])) {