Merge branch 'mrrobot47-update/installation-of-tools' into develop

Author: mbtamuli

ee-tools.json

@@ -8,12 +8,12 @@
         "version": ""
     },
     "pma": {
-        "url": "https://github.com/phpmyadmin/phpmyadmin/archive/RELEASE_{version}.zip",
-        "version": "4.8.2"
+        "url": "https://www.phpmyadmin.net/downloads/phpMyAdmin-latest-all-languages.zip",
+        "version": "latest"
     },
     "pra": {
         "url": "https://github.com/erikdubbelboer/phpRedisAdmin/archive/v{version}.zip",
-        "version": "1.10.2"
+        "version": "1.11.0"
     },
     "opcache": {
         "url": "https://raw.githubusercontent.com/amnuts/opcache-gui/master/index.php",

src/Admin_Tools_Command.php

@@ -35,14 +35,8 @@ public function __construct() {
 
 	/**
 	 * Installs admin tools for EasyEngine.
-	 *
-	 * ## EXAMPLES
-	 *
-	 *     # Install admin tools
-	 *     $ ee admin-tools install
-	 *
 	 */
-	public function install() {
+	private function install() {
 
 		if ( ! $this->is_installed() ) {
 			EE::log( 'Installing admin-tools. This may take some time.' );
@@ -80,8 +74,6 @@ public function install() {
 					EE::error( "No method found to install $tool. Aborting." );
 				}
 				EE::success( "Installed $tool successfully." );
-			} else {
-				EE::log( "$tool already installed." );
 			}
 		}
 	}
@@ -132,11 +124,8 @@ public function enable( $args, $assoc_args ) {
 			EE::error( sprintf( '%s site-type of %s-command does not support admin-tools.', $this->site_data->app_sub_type, $this->site_data->site_type ) );
 		}
 
-		if ( ! $this->is_installed() ) {
-			EE::log( 'It seems admin-tools have not yet been installed.' );
-			$this->install();
-			chdir( $this->site_data->site_fs_path );
-		}
+		$this->install();
+		chdir( $this->site_data->site_fs_path );
 
 		$this->move_config_file( 'docker-compose-admin.mustache', $this->site_data->site_fs_path . '/docker-compose-admin.yml' );
 
@@ -256,19 +245,6 @@ private function move_config_file( $template_file, $config_file ) {
 		$this->fs->dumpFile( $config_file, file_get_contents( ADMIN_TEMPLATE_ROOT . '/' . $template_file ) );
 	}
 
-	/**
-	 * Function to run install composer dependencies in tools that require it.
-	 *
-	 * @param string $tool_path Directory of the tool that contains `composer.json` file.
-	 */
-	private function composer_install( $tool_path ) {
-
-		chdir( $tool_path );
-		EE::log( 'Installing dependencies. This may take a little while.' );
-		$img_versions = \EE\Utils\get_image_versions();
-		EE::exec( sprintf( 'docker run --rm -it -e USER_ID=0 -e GROUP_ID=0 --user=root -v $PWD:/var/www/htdocs easyengine/php:%s composer update', $img_versions['easyengine/php'] ) );
-	}
-
 	/**
 	 * Function to install index.php file.
 	 *
@@ -306,13 +282,12 @@ private function install_pma( $data, $tool_path ) {
 
 		$temp_dir      = EE\Utils\get_temp_dir();
 		$download_path = $temp_dir . 'pma.zip';
-		$version       = str_replace( '.', '_', $data['version'] );
-		$download_url  = str_replace( '{version}', $version, $data['url'] );
-		$this->download( $download_path, $download_url );
-		$this->extract_zip( $download_path, $temp_dir );
-		$this->fs->rename( $temp_dir . 'phpmyadmin-RELEASE_' . $version, $tool_path );
+		$unzip_folder  = $temp_dir . '/pma';
+		$this->download( $download_path, $data['url'] );
+		$this->extract_zip( $download_path, $unzip_folder );
+		$zip_folder_name = scandir( $unzip_folder );
+		$this->fs->rename( $unzip_folder . '/' . array_pop( $zip_folder_name ), $tool_path );
 		$this->move_config_file( 'pma.config.mustache', $tool_path . '/config.inc.php' );
-		$this->composer_install( $tool_path );
 	}
 
 	/**
@@ -325,12 +300,19 @@ private function install_pra( $data, $tool_path ) {
 
 		$temp_dir      = EE\Utils\get_temp_dir();
 		$download_path = $temp_dir . 'pra.zip';
+		$unzip_folder  = $temp_dir . '/pra';
+		$vendor_zip    = $temp_dir . 'vendor.zip';
+		$vendor_path   = $unzip_folder . '/vendor';
 		$download_url  = str_replace( '{version}', $data['version'], $data['url'] );
 		$this->download( $download_path, $download_url );
-		$this->extract_zip( $download_path, $temp_dir );
-		$this->fs->rename( $temp_dir . 'phpRedisAdmin-' . $data['version'], $tool_path );
+		$this->extract_zip( $download_path, $unzip_folder );
+		$zip_folder_name        = scandir( $unzip_folder );
+		$vendor_requirement_url = 'https://github.com/nrk/predis/archive/v1.1.1.zip';
+		$this->download( $vendor_zip, $vendor_requirement_url );
+		$this->extract_zip( $vendor_zip, $vendor_path );
+		$this->fs->rename( $unzip_folder . '/' . array_pop( $zip_folder_name ), $tool_path );
 		$this->move_config_file( 'pra.config.mustache', $tool_path . '/includes/config.inc.php' );
-		$this->composer_install( $tool_path );
+
 	}
 
 	/**