Merge pull request hestiacp#1911 from jaapmarcus/fix/composer-version

Update default version composer

Author: ScIT-Raphael

bin/v-add-user-composer

@@ -15,6 +15,7 @@
 
 # Argument definition
 user=$1
+version=${2-2}
 
 if [ -z "$HESTIA" ]; then
     HESTIA="/usr/local/hestia"
@@ -31,8 +32,9 @@ source $HESTIA/conf/hestia.conf
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-check_args '1' "$#" 'USER'
+check_args '1' "$#" 'USER [VERSION]'
 is_format_valid 'user'
+is_number_format_valid 'version' "$version"
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 
@@ -78,7 +80,7 @@ if [[ "$signature" != $(sha384sum $COMPOSER_SETUP_FILE | cut -f 1 -d " ") ]]; th
     check_result $E_INVALID "Composer signature does not match"
 fi
 
-COMPOSER_HOME="$HOMEDIR/$user/.config/composer" user_exec /usr/bin/php "$COMPOSER_SETUP_FILE" --1 --quiet --install-dir="$COMPOSER_DIR" --filename=composer
+COMPOSER_HOME="$HOMEDIR/$user/.config/composer" user_exec /usr/bin/php "$COMPOSER_SETUP_FILE" --quiet "--$version" --install-dir="$COMPOSER_DIR" --filename=composer
 check_result $? "Composer install failed"
 
 [ -f "$COMPOSER_SETUP_FILE" ] && rm -f "$COMPOSER_SETUP_FILE"

web/src/app/System/HestiaApp.php

@@ -47,7 +47,7 @@ public function runUser(string $cmd, $args, &$cmd_result=null) : bool
         return $this->run($cmd, $args, $cmd_result);
     }
 
-    public function installComposer()
+    public function installComposer($version)
     {
         exec("curl https://composer.github.io/installer.sig", $output);
 
@@ -69,22 +69,28 @@ public function installComposer()
         }
 
         $install_folder = $this->getUserHomeDir() . DIRECTORY_SEPARATOR . '.composer';
-        $this->runUser('v-run-cli-cmd', ["/usr/bin/php", $composer_setup, "--1", "--quiet", "--install-dir=".$install_folder, "--filename=composer" ], $status);
+        $this->runUser('v-run-cli-cmd', ["/usr/bin/php", $composer_setup, "--quiet", "--install-dir=".$install_folder, "--filename=composer", "--$version" ], $status);
 
         unlink($composer_setup);
 
         if ($status->code !== 0 ) {
             throw new \Exception("Error installing composer");
         }
     }
+    
+    public function updateComposer($version){
+        $this->runUser('v-run-cli-cmd', ["composer", "selfupdate","--$version"]);
+    }
 
-    public function runComposer($args, &$cmd_result=null) : bool
+    public function runComposer($args, &$cmd_result=null,$version=1) : bool
     {
         $composer = $this->getUserHomeDir() . DIRECTORY_SEPARATOR . '.composer' . DIRECTORY_SEPARATOR . 'composer';
         if(!is_file($composer)) {
-            $this->installComposer();
+            $this->installComposer($version);
+        }else{
+            $this->updateComposer($version);
         }
-
+        
         if (!empty($args) && is_array($args)) {
             array_unshift($args, 'composer');
         } else {

web/src/app/WebApp/Installers/Laravel/LaravelSetup.php

@@ -21,8 +21,8 @@ class LaravelSetup extends BaseSetup {
         ],
         'database' => true,
         'resources' => [
-            'composer' => [ 'src' => 'laravel/laravel', 'dst' => '/' ],
-        ],
+            'composer' => [ 'src' => 'laravel/laravel', 'dst' => '/'],
+        ],   
     ];
 
     public function install(array $options=null) : bool

web/src/app/WebApp/Installers/Resources/ComposerResource.php

@@ -15,8 +15,11 @@ public function __construct(HestiaApp $appcontext, $data, $destination)
         $this->folder = dirname($destination);
         $this->project = basename($destination);
         $this->appcontext = $appcontext;
-
-        $this->appcontext->runComposer(["create-project", "--no-progress", "--prefer-dist", $data['src'], "-d " . $this->folder, $this->project ], $status);
+        if (empty($data['version'])){
+            $data['version'] = 2;
+        }
+        
+        $this->appcontext->runComposer(["create-project", "--no-progress", "--prefer-dist", $data['src'], "-d " . $this->folder, $this->project ], $status, $data['version']);
 
         if($status->code !== 0){
             throw new \Exception("Error fetching Composer resource: " . $status->text);