Always include locked dev packages

wouterj · wouterj · commit 05bcffd591d6 · 2025-05-10T14:41:26.000+02:00
diff --git a/src/Downloader.php b/src/Downloader.php
@@ -134,7 +134,7 @@ public function getRecipes(array $operations): array
         $this->initialize();
 
         if ($this->conflicts) {
-            $lockedRepository = $this->composer->getLocker()->getLockedRepository();
+            $lockedRepository = $this->composer->getLocker()->getLockedRepository(true);
             foreach ($this->conflicts as $conflicts) {
                 foreach ($conflicts as $package => $versions) {
                     foreach ($versions as $version => $conflicts) {
diff --git a/src/Flex.php b/src/Flex.php
@@ -872,7 +872,7 @@ private function doesRecipeConflict(array $recipeData, OperationInterface $opera
             return false;
         }
 
-        $lockedRepository = $this->composer->getLocker()->getLockedRepository();
+        $lockedRepository = $this->composer->getLocker()->getLockedRepository(true);
 
         foreach ($recipeData['manifest']['conflict'] as $conflictingPackage => $constraint) {
             if ($lockedRepository->findPackage($conflictingPackage, $constraint)) {

Original file line number	Diff line number	Diff line change
`@@ -872,7 +872,7 @@ private function doesRecipeConflict(array $recipeData, OperationInterface $opera`
`872`	`872`	`return false;`
`873`	`873`	`}`
`874`	`874`
`875`		`- $lockedRepository = $this->composer->getLocker()->getLockedRepository();`
	`875`	`+ $lockedRepository = $this->composer->getLocker()->getLockedRepository(true);`
`876`	`876`
`877`	`877`	`foreach ($recipeData['manifest']['conflict'] as $conflictingPackage => $constraint) {`
`878`	`878`	`if ($lockedRepository->findPackage($conflictingPackage, $constraint)) {`