Merge branch 'master' into feature/ls-remote

# Conflicts:
#	common/helpers.go
#	common/helpers_test.go

Author: Lotti

commands/help.go

@@ -7,7 +7,7 @@ import (
 
 func Help(notFoundError bool) {
 	theme.Title("pvm: PHP Version Manager")
-	theme.Info("Version 1.1.1")
+	theme.Info("Version 1.2.0")
 
 	if notFoundError {
 		theme.Error("Command not found")

commands/install.go

@@ -85,64 +85,67 @@ func Install(args []string) {
 	}
 
 	// check if .pvm folder exists
-	if _, err := os.Stat(homeDir + "/.pvm"); os.IsNotExist(err) {
+	pvmPath := filepath.Join(homeDir, ".pvm")
+	if _, err := os.Stat(pvmPath); os.IsNotExist(err) {
 		theme.Info("Creating .pvm folder in home directory")
-		os.Mkdir(homeDir+"/.pvm", 0755)
+		os.Mkdir(pvmPath, 0755)
 	}
 
 	// check if .pvm/versions folder exists
-	if _, err := os.Stat(homeDir + "/.pvm/versions"); os.IsNotExist(err) {
+	versionsPath := filepath.Join(pvmPath, "versions")
+	if _, err := os.Stat(versionsPath); os.IsNotExist(err) {
 		theme.Info("Creating .pvm/versions folder in home directory")
-		os.Mkdir(homeDir+"/.pvm/versions", 0755)
+		os.Mkdir(versionsPath, 0755)
 	}
 
 	theme.Info("Downloading")
 
-	// Get the data
-	downloadResponse, err := http.Get("https://windows.php.net" + desiredVersion.Url)
-	if err != nil {
-		log.Fatalln(err)
-	}
-
-	defer downloadResponse.Body.Close()
-
 	// zip filename from url
+	zipUrl := "https://windows.php.net" + desiredVersion.Url
 	zipFileName := strings.Split(desiredVersion.Url, "/")[len(strings.Split(desiredVersion.Url, "/"))-1]
+	zipPath := filepath.Join(versionsPath, zipFileName)
 
 	// check if zip already exists
-	if _, err := os.Stat(homeDir + "/.pvm/versions/" + zipFileName); err == nil {
+	if _, err := os.Stat(zipPath); err == nil {
 		theme.Error(fmt.Sprintf("PHP %s already exists", desiredVersion))
 		return
 	}
 
-	// Create the file
-	out, err := os.Create(homeDir + "/.pvm/versions/" + zipFileName)
-	if err != nil {
-		log.Fatalln(err)
-	}
-
-	// Write the body to file
-	_, err = io.Copy(out, downloadResponse.Body)
-
-	if err != nil {
-		out.Close()
-		log.Fatalln(err)
+	// Get the data
+	if _, err := downloadFile(zipUrl, zipPath); err != nil {
+		log.Fatalf("Error while downloading PHP from %v: %v!", zipUrl, err)
 	}
 
-	// Close the file
-	out.Close()
-
 	// extract the zip file to a folder
+	phpFolder := strings.Replace(zipFileName, ".zip", "", -1)
+	phpPath := filepath.Join(versionsPath, phpFolder)
 	theme.Info("Unzipping")
-	Unzip(homeDir+"/.pvm/versions/"+zipFileName, homeDir+"/.pvm/versions/"+strings.Replace(zipFileName, ".zip", "", -1))
+	Unzip(zipPath, phpPath)
 
 	// remove the zip file
 	theme.Info("Cleaning up")
-	err = os.Remove(homeDir + "/.pvm/versions/" + zipFileName)
+	err = os.Remove(zipPath)
 	if err != nil {
 		log.Fatalln(err)
 	}
 
+	// install composer
+	composerFolderPath := filepath.Join(phpPath, "composer")
+	if _, err := os.Stat(composerFolderPath); os.IsNotExist(err) {
+		theme.Info("Creating composer folder")
+		os.Mkdir(composerFolderPath, 0755)
+	}
+
+	composerPath := filepath.Join(composerFolderPath, "composer.phar")
+	composerUrl := "https://getcomposer.org/download/latest-stable/composer.phar"
+	if desiredVersion.LessThan(common.Version{Major: 7, Minor: 2}) {
+		composerUrl = "https://getcomposer.org/download/latest-2.2.x/composer.phar"
+	}
+
+	if _, err := downloadFile(composerUrl, composerPath); err != nil {
+		log.Fatalf("Error while downloading Composer from %v: %v!", composerUrl, err)
+	}
+
 	theme.Success(fmt.Sprintf("Finished installing PHP %s", desiredVersion))
 }
 
@@ -258,3 +261,30 @@ func FindLatestMinor(versions []common.Version, major int, threadSafe bool) comm
 
 	return latestMinor
 }
+
+func downloadFile(fileUrl string, filePath string) (bool, error) {
+	downloadResponse, err := http.Get(fileUrl)
+	if err != nil {
+		return false, err
+	}
+
+	defer downloadResponse.Body.Close()
+
+	// Create the file
+	out, err := os.Create(filePath)
+	if err != nil {
+		return false, err
+	}
+
+	// Write the body to file
+	_, err = io.Copy(out, downloadResponse.Body)
+
+	if err != nil {
+		out.Close()
+		return false, err
+	}
+
+	// Close the file
+	out.Close()
+	return true, nil
+}

commands/use.go

@@ -108,9 +108,22 @@ func Use(args []string) {
 		os.Remove(shPathCGI)
 	}
 
+	// remove old composer bat script
+	batPathComposer := filepath.Join(binPath, "composer.bat")
+	if _, err := os.Stat(batPathComposer); err == nil {
+		os.Remove(batPathComposer)
+	}
+
+	// remove the old composer sh script
+	shPathComposer := filepath.Join(binPath, "composer")
+	if _, err := os.Stat(shPathComposer); err == nil {
+		os.Remove(shPathComposer)
+	}
+
 	versionFolderPath := filepath.Join(homeDir, ".pvm", "versions", selectedVersion.folder.Name())
 	versionPath := filepath.Join(versionFolderPath, "php.exe")
 	versionPathCGI := filepath.Join(versionFolderPath, "php-cgi.exe")
+	composerPath := filepath.Join(versionFolderPath, "composer", "composer.phar")
 
 	// create bat script for php
 	batCommand := "@echo off \n"
@@ -158,6 +171,31 @@ func Use(args []string) {
 		log.Fatalln(err)
 	}
 
+	// create bat script for composer
+	batCommandComposer := "@echo off \n"
+	batCommandComposer = batCommandComposer + "set filepath=\"" + versionPath + "\"\n"
+	batCommandComposer = batCommandComposer + "set composerpath=\"" + composerPath + "\"\n"
+	batCommandComposer = batCommandComposer + "set arguments=%*\n"
+	batCommandComposer = batCommandComposer + "%filepath% %composerpath% %arguments%\n"
+
+	err = os.WriteFile(batPathComposer, []byte(batCommandComposer), 0755)
+
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	// create sh script for php
+	shCommandComposer := "#!/bin/bash\n"
+	shCommandComposer = shCommandComposer + "filepath=\"" + versionPath + "\"\n"
+	shCommandComposer = shCommandComposer + "composerpath=\"" + composerPath + "\"\n"
+	shCommandComposer = shCommandComposer + "\"$filepath\" \"$composerpath\" \"$@\""
+
+	err = os.WriteFile(shPathComposer, []byte(shCommandComposer), 0755)
+
+	if err != nil {
+		log.Fatalln(err)
+	}
+
 	// create directory link to ext directory
 	extensionDirPath := filepath.Join(versionFolderPath, "ext")
 	extensionLinkPath := filepath.Join(binPath, "ext")

common/helpers_test.go

@@ -25,4 +25,4 @@ func Test_Version_Compare(t *testing.T) {
 	v7 := Version{Major: 1, Minor: 2}
 
 	assert.Equal(t, v6.LessThan(v7), false)
-}
+}