Merge pull request #131 from magento-commerce/MCLOUD-11536

tomreece · web-flow · commit 414e46479026 · 2024-04-19T09:40:41.000-05:00
MCLOUD-11536: Fix bin/ece-docker image:generate:php command composer versions
diff --git a/src/Command/Image/GeneratePhp.php b/src/Command/Image/GeneratePhp.php
@@ -342,8 +342,10 @@ private function getComposerVersion(string $phpVersion) : string
     {
         if ($this->semver::satisfies($phpVersion, '<8.0')) {
             return '1.10.22';
+        } else if ($this->semver::satisfies($phpVersion, '<=8.2')) {
+            return '2.2.23';
+        } else {
+            return '2.7.0';
         }
-
-        return $this->semver::satisfies($phpVersion, '<8.2') ? '2.1.14' : '2.2.18';
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -342,8 +342,10 @@ private function getComposerVersion(string $phpVersion) : string`
`342`	`342`	`{`
`343`	`343`	`if ($this->semver::satisfies($phpVersion, '<8.0')) {`
`344`	`344`	`return '1.10.22';`
	`345`	`+ } else if ($this->semver::satisfies($phpVersion, '<=8.2')) {`
	`346`	`+ return '2.2.23';`
	`347`	`+ } else {`
	`348`	`+ return '2.7.0';`
`345`	`349`	`}`
`346`		`-`
`347`		`- return $this->semver::satisfies($phpVersion, '<8.2') ? '2.1.14' : '2.2.18';`
`348`	`350`	`}`
`349`	`351`	`}`