Merge pull request hestiacp#2777 from hestiacp/update-default-composer-version

ScIT-Raphael · web-flow · commit 05f513b671b2 · 2022-07-31T13:11:12.000+02:00
Use version 2.x instead 1.x when not defined
diff --git a/web/src/app/System/HestiaApp.php b/web/src/app/System/HestiaApp.php
@@ -105,7 +105,7 @@ public function updateComposer($version)
         $this->runUser('v-run-cli-cmd', ["composer", "selfupdate","--$version"]);
     }
 
-    public function runComposer($args, &$cmd_result=null, $version=1): bool
+    public function runComposer($args, &$cmd_result=null, $version=2): bool
     {
         $composer = $this->getUserHomeDir() . DIRECTORY_SEPARATOR . '.composer' . DIRECTORY_SEPARATOR . 'composer';
         if (!is_file($composer)) {

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public function updateComposer($version)`
`105`	`105`	`$this->runUser('v-run-cli-cmd', ["composer", "selfupdate","--$version"]);`
`106`	`106`	`}`
`107`	`107`
`108`		`- public function runComposer($args, &$cmd_result=null, $version=1): bool`
	`108`	`+ public function runComposer($args, &$cmd_result=null, $version=2): bool`
`109`	`109`	`{`
`110`	`110`	`$composer = $this->getUserHomeDir() . DIRECTORY_SEPARATOR . '.composer' . DIRECTORY_SEPARATOR . 'composer';`
`111`	`111`	`if (!is_file($composer)) {`