Merge pull request #34 from mrrobot47/update/to-utility-function

Update to utility functions

Author: rahulsprajapati

src/Admin_Tools_Command.php

@@ -9,6 +9,8 @@
 use EE\Model\Site;
 use Symfony\Component\Filesystem\Filesystem;
 use function EE\Site\Utils\auto_site_name;
+use function EE\Utils\download;
+use function EE\Utils\extract_zip;
 
 class Admin_Tools_Command extends EE_Command {
 
@@ -197,44 +199,6 @@ private function is_installed( $tool = '' ) {
 		return $this->fs->exists( ADMIN_TOOL_DIR . '/' . $tool );
 	}
 
-	/**
-	 * Function to download file to a path.
-	 *
-	 * @param string $path         Path to download the file on.
-	 * @param string $download_url Url to download the file from.
-	 */
-	private function download( $path, $download_url ) {
-
-		$headers = array();
-		$options = array(
-			'timeout'  => 1200,  // 20 minutes ought to be enough for everybody.
-			'filename' => $path,
-		);
-		EE\Utils\http_request( 'GET', $download_url, null, $headers, $options );
-	}
-
-	/**
-	 * Extract zip files.
-	 *
-	 * @param string $zip_file        Path to the zip file.
-	 * @param string $path_to_extract Path where zip needs to be extracted to.
-	 *
-	 * @return bool Success of extraction.
-	 */
-	private function extract_zip( $zip_file, $path_to_extract ) {
-
-		$zip = new ZipArchive;
-		$res = $zip->open( $zip_file );
-		if ( true === $res ) {
-			$zip->extractTo( $path_to_extract );
-			$zip->close();
-
-			return true;
-		}
-
-		return false;
-	}
-
 	/**
 	 * Place config files from templates to tools.
 	 *
@@ -285,8 +249,8 @@ private function install_pma( $data, $tool_path ) {
 		$download_path = $temp_dir . 'pma.zip';
 		$unzip_folder  = $temp_dir . '/pma';
 		$this->fs->remove( [ $download_path, $unzip_folder ] );
-		$this->download( $download_path, $data['url'] );
-		$this->extract_zip( $download_path, $unzip_folder );
+		download( $download_path, $data['url'] );
+		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' );
@@ -306,14 +270,14 @@ private function install_pra( $data, $tool_path ) {
 		$this->fs->remove( [ $download_path, $unzip_folder ] );
 		$vendor_zip   = $temp_dir . 'vendor.zip';
 		$download_url = str_replace( '{version}', $data['version'], $data['url'] );
-		$this->download( $download_path, $download_url );
-		$this->extract_zip( $download_path, $unzip_folder );
+		download( $download_path, $download_url );
+		extract_zip( $download_path, $unzip_folder );
 		$zip_folder_name        = scandir( $unzip_folder );
 		$pra_root_folder        = $unzip_folder . '/' . array_pop( $zip_folder_name );
 		$vendor_path            = $pra_root_folder . '/vendor';
 		$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, $pra_root_folder );
+		download( $vendor_zip, $vendor_requirement_url );
+		extract_zip( $vendor_zip, $pra_root_folder );
 		$this->fs->rename( $pra_root_folder . '/predis-1.1.1', $vendor_path );
 		$this->fs->rename( $pra_root_folder, $tool_path );
 		$this->move_config_file( 'pra.config.mustache', $tool_path . '/includes/config.inc.php' );
@@ -330,7 +294,7 @@ private function install_opcache( $data, $tool_path ) {
 		$temp_dir      = EE\Utils\get_temp_dir();
 		$download_path = $temp_dir . 'opcache-gui.php';
 		$this->fs->remove( $download_path );
-		$this->download( $download_path, $data['url'] );
+		download( $download_path, $data['url'] );
 		$this->fs->rename( $temp_dir . 'opcache-gui.php', $tool_path . '-gui.php' );
 	}