Fix multiple small issues with quick installer

Author: jaapmarcus

web/src/app/WebApp/Installers/Drupal/DrupalSetup.php

@@ -52,9 +52,9 @@ public function install(array $options=null) : bool
         $tmp_configpath = $this->saveTempFile($htaccess_rewrite);
         $this->appcontext->runUser('v-move-fs-file',[$tmp_configpath, $this->getDocRoot(".htaccess")], $result);
 
-        $php_version = $this -> appcontext -> getSupportedPHP($this -> config['server']['php']['supported']);
+       
         $this -> appcontext -> runUser('v-run-cli-cmd', [
-            "/usr/bin/php$php_version",
+            "/usr/bin/php".$options['php_version'],
             $this -> getDocRoot('/vendor/drush/drush/drush'), 
             'site-install',
             'standard',

web/src/app/WebApp/Installers/Grav/GravSetup.php

@@ -45,12 +45,12 @@ public function install(array $options = null)
 
 		if ( $options['admin'] == true ){
 			chdir($this->getDocRoot());
-			$php_version = $this -> appcontext -> getSupportedPHP($this -> config['server']['php']['supported']);
-			$this -> appcontext -> runUser('v-run-cli-cmd', ["/usr/bin/php$php_version", 
+			
+			$this -> appcontext -> runUser('v-run-cli-cmd', ["/usr/bin/php".$options['php_version'], 
 			$this->getDocRoot('/bin/gpm'),
 				'install admin'
 		    ], $status);
-			$this -> appcontext -> runUser('v-run-cli-cmd', ["/usr/bin/php$php_version", 
+			$this -> appcontext -> runUser('v-run-cli-cmd', ["/usr/bin/php".$options['php_version'], 
 				$this->getDocRoot('/bin/plugin'),
 				'login new-user',
 				'-u '.$options['username'],

web/src/app/WebApp/Installers/MediaWiki/MediaWikiSetup.php

@@ -58,8 +58,8 @@ public function install(array $options = null)
         $this->appcontext->runUser('v-copy-fs-directory', [
             $this->getDocRoot($this->extractsubdir . "/mediawiki-1.37.2/."),
             $this->getDocRoot()], $result);
-        $php_version = $this -> appcontext -> getSupportedPHP($this -> config['server']['php']['supported']);
-        $this->appcontext->runUser('v-run-cli-cmd', ["/usr/bin/php$php_version",
+
+        $this->appcontext->runUser('v-run-cli-cmd', ["/usr/bin/php".$options['php_version'],
             $this->getDocRoot('maintenance/install.php'),
             '--dbserver=localhost',
             '--dbname=' . $this->appcontext->user() . '_' . $options['database_name'],

web/src/app/WebApp/Installers/Nextcloud/NextcloudSetup.php

@@ -42,7 +42,8 @@ public function install(array $options = null): bool
 
         // install nextcloud
         $php_version = $this -> appcontext -> getSupportedPHP($this -> config['server']['php']['supported']);
-        $this->appcontext->runUser('v-run-cli-cmd', ["/usr/bin/php$php_version",
+    
+        $this->appcontext->runUser('v-run-cli-cmd', ["/usr/bin/php".$options['php_version'],
             $this->getDocRoot('occ'),
             'maintenance:install',
             '--database mysql',
@@ -55,7 +56,7 @@ public function install(array $options = null): bool
 
         $this->appcontext->runUser(
             'v-run-cli-cmd',
-            ['/usr/bin/php',
+            ["/usr/bin/php".$options['php_version'],
                 $this->getDocRoot('occ'),
                 'config:system:set',
                 'trusted_domains 2 --value='.$this->domain

web/src/app/WebApp/Installers/Opencart/OpencartSetup.php

@@ -61,10 +61,9 @@ public function install(array $options = null): bool
             $protocol = 'https://';
         }
 
-        $php_version = $this -> appcontext -> getSupportedPHP($this -> config['server']['php']['supported']);
 
         $this->appcontext->runUser('v-run-cli-cmd', [
-            "/usr/bin/php$php_version",
+           "/usr/bin/php".$options['php_version'],
             $this->getDocRoot("/install/cli_install.php"),
             "install",
             "--db_username " . $this->appcontext->user() . '_' .$options['database_user'],

web/src/app/WebApp/Installers/Prestashop/PrestashopSetup.php

@@ -61,7 +61,7 @@ public function install(array $options=null): bool
         $php_version = $this -> appcontext -> getSupportedPHP($this -> config['server']['php']['supported']);
 
         $this->appcontext->runUser('v-run-cli-cmd', [
-            "/usr/bin/php$php_version",
+            "/usr/bin/php".$options['php_version'],
             $this->getDocRoot("/install/index_cli.php"),
             "--db_user=" . $this->appcontext->user() . '_' .$options['database_user'],
             "--db_password=" . $options['database_password'],

web/src/app/WebApp/Installers/Wordpress/WordpressSetup.php

@@ -119,10 +119,9 @@ public function install(array $options = null)
             . "&admin_email="    . rawurlencode($options['wordpress_account_email'])
             ), $output, $return_var);
 
-        if ( strpos(implode(PHP_EOL,$output),'Error establishing a database connection' !== false)){
+        if ( strpos(implode(PHP_EOL,$output),'Error establishing a database connection') !== false){
            throw new \Exception('Error establishing a database connection'); 
         }
-
         if ($return_var > 0) {
             throw new \Exception(implode(PHP_EOL, $output));
         }