Install specific arch

src/actions/common.ps1

@@ -37,17 +37,62 @@ function Is-PVM-Setup {
     }
 }
 
+function Refresh-Installed-PHP-Versions-Cache {
+    try {
+        $installedVersions = Get-Installed-PHP-Versions-From-Directory
+        $cached = Cache-Data -cacheFileName "installed_php_versions" -data $installedVersions -depth 1
+
+        return 0
+    } catch {
+        $logged = Log-Data -data @{
+            header = "$($MyInvocation.MyCommand.Name) - Failed to refresh installed PHP versions cache"
+            exception = $_
+        }
+
+        return -1
+    }
+}
+
+function Get-Installed-PHP-Versions-From-Directory {
+    $directories = Get-All-Subdirectories -path "$STORAGE_PATH\php"
+    $installedVersions = $directories | ForEach-Object {
+        if (Test-Path "$($_.FullName)\php.exe"){
+            $phpInfo = Get-PHPInstallInfo -path $_.FullName
+
+            return $phpInfo
+        }
+        return $null
+    }
+
+    $installedVersions = ($installedVersions | Sort-Object { [version]$_.Version })
+
+    $cached = Cache-Data -cacheFileName "installed_php_versions" -data $installedVersions -depth 1
+
+    return $installedVersions
+}
+
 function Get-Installed-PHP-Versions {
-
+    param ($arch = $null, $buildType = $null)
     try {
-        $directories = Get-All-Subdirectories -path "$STORAGE_PATH\php"
-        $names = $directories | ForEach-Object {
-            if (Test-Path "$($_.FullName)\php.exe"){
-                return $_.Name
-            }
-            return $null
+        $installedVersions = Get-OrUpdateCache -cacheFileName "installed_php_versions" -depth 1 -compute {
+            Get-Installed-PHP-Versions-From-Directory
+        }
+
+        if ($null -eq $installedVersions) {
+            return @()
+        }
+
+        if ($arch) {
+            $installedVersions = $installedVersions | Where-Object { $_.Arch -eq $arch }
+        }
+
+        if ($buildType) {
+            $installedVersions = $installedVersions | Where-Object { $_.BuildType -eq $buildType }
         }
-        return ($names | Sort-Object { [version]$_ })        
+
+        $installedVersions = $installedVersions | Sort-Object { [version]$_.Version }
+
+        return $installedVersions
     } catch {
         $logged = Log-Data -data @{
             header = "$($MyInvocation.MyCommand.Name) - Failed to retrieve installed PHP versions"
@@ -64,47 +109,48 @@ function Get-UserSelected-PHP-Version {
     if (-not $installedVersions -or $installedVersions.Count -eq 0) {
         return $null
     }
-    if ($installedVersions.Count -eq 1) {
-        $version = $($installedVersions)
+    if ($installedVersions.Length -eq 1) {
+        $versionObj = $($installedVersions)
     } else {
         $currentVersion = Get-Current-PHP-Version
-        if ($currentVersion -and $currentVersion.version) {
-            $currentVersion = $currentVersion.version
-        }
+        $index = 0
         Write-Host "`nInstalled versions :"
         $installedVersions | ForEach-Object {
-            $versionNumber = $_
+            $_ | Add-Member -NotePropertyName "index" -NotePropertyValue $index -Force
             $isCurrent = ""
-            if ($currentVersion -eq $versionNumber) {
+            if (Is-Two-PHP-Versions-Equal -version1 $currentVersion -version2 $_) {
                 $isCurrent = "(Current)"
             }
-            Write-Host " - $versionNumber $isCurrent"
+            $metaData = ""
+            if ($_.Arch) {
+                $metaData += $_.Arch + " "
+            }
+            if ($_.BuildType) {
+                $metaData += $_.BuildType
+            }
+            $versionNumber = "$($_.version) ".PadRight(15, '.')
+            Write-Host " [$index] $versionNumber $metaData $isCurrent"
+            $index++
         }
-        $response = Read-Host "`nEnter the exact version to use. (or press Enter to cancel)"
+        $response = Read-Host "`nInsert the [number] matching the version to uninstall (or press Enter to cancel)"
         $response = $response.Trim()
         if (-not $response) {
             return @{ code = -1; message = "Operation cancelled."; color = "DarkYellow"}
         }
-        $version = $response
+        $versionObj = $installedVersions | Where-Object { $_.index -eq $response }
     }
-    $phpPath = Get-PHP-Path-By-Version -version $version
 
-    return @{ code = 0; version = $version; path = $phpPath }
+    return @{ code = 0; version = $versionObj.version; arch = $versionObj.arch; buildType = $versionObj.BuildType; path = $versionObj.InstallPath }
 }
 
 function Get-Matching-PHP-Versions {
     param ($version)
 
     try {
-        $installedVersions = Get-Installed-PHP-Versions  # You should have this function
-
-        $matchingVersions = @()
-        foreach ($v in $installedVersions) {
-            if ($v -like "$version*") {
-                $matchingVersions += ($v -replace 'php', '')
-            }
-        }
+        $installedVersions = Get-Installed-PHP-Versions
 
+        $matchingVersions = $installedVersions | Where-Object { $_.Version -like "$version*" }
+
         return $matchingVersions
     } catch {
         $logged = Log-Data -data @{
@@ -120,8 +166,12 @@ function Is-PHP-Version-Installed {
     param ($version)
 
     try {
-        $installedVersions = Get-Matching-PHP-Versions -version $version
-        return ($installedVersions -contains $version)
+        $installedVersions = Get-Matching-PHP-Versions -version $version.version
+        return ($installedVersions | Where-Object {
+            $_.Version -eq $version.version -and
+            $_.Arch -eq $version.arch -and
+            $_.BuildType -eq $version.BuildType
+        })
     } catch {
         $logged = Log-Data -data @{
             header = "$($MyInvocation.MyCommand.Name) - Failed to check if PHP version $version is installed"

src/actions/current.ps1

@@ -1,61 +1,64 @@
-
-function Get-PHP-Status {
-    param($phpPath)
-
-    $status = @{ opcache = $false; xdebug = $false }
-    try {
-        $phpIniPath = "$phpPath\php.ini"
-        if (-not (Test-Path $phpIniPath)) {
-            return $status
-        }
-
-        $iniContent = Get-Content $phpIniPath
-
-        foreach ($line in $iniContent) {
-            $trimmed = $line.Trim()
-            if ($trimmed -match '^(;)?\s*zend_extension\s*=.*opcache.*$') {
-                $status.opcache = -not $trimmed.StartsWith(';')
-            }
-
-            if ($trimmed -match '^(;)?\s*zend_extension\s*=.*xdebug.*$') {
-                $status.xdebug = -not $trimmed.StartsWith(';')
-            }
-        }
-    } catch {
-        $logged = Log-Data -data @{
-            header = "$($MyInvocation.MyCommand.Name) - Failed to retrieve PHP status"
-            exception = $_
-        }
-        Write-Host "An error occurred while checking PHP status: $_"
-    }
-
-    return $status
-}
-
-function Get-Current-PHP-Version {
-
-    try {
-        $emptyResult = @{ version = $null; path = $null; status = @{ opcache = $false; xdebug = $false } }
-        $currentPhpVersionPath = Get-Item $PHP_CURRENT_VERSION_PATH
-        if (-not $currentPhpVersionPath) {
-            return $emptyResult
-        }
-
-        $currentPhpVersionPath = $currentPhpVersionPath.Target
-        if (-not (Is-Directory-Exists -path $currentPhpVersionPath)) {
-            return $emptyResult
-        }
-
-        return @{
-            version = $(Split-Path $currentPhpVersionPath -Leaf)
-            path = $currentPhpVersionPath
-            status = Get-PHP-Status -phpPath $currentPhpVersionPath
-        }
-    } catch {
-        $logged = Log-Data -data @{
-            header = "$($MyInvocation.MyCommand.Name) - Failed to retrieve current PHP version"
-            exception = $_
-        }
-        return $emptyResult
-    }
+
+function Get-PHP-Status {
+    param($phpPath)
+
+    $status = @{ opcache = $false; xdebug = $false }
+    try {
+        $phpIniPath = "$phpPath\php.ini"
+        if (-not (Test-Path $phpIniPath)) {
+            return $status
+        }
+
+        $iniContent = Get-Content $phpIniPath
+
+        foreach ($line in $iniContent) {
+            $trimmed = $line.Trim()
+            if ($trimmed -match '^(;)?\s*zend_extension\s*=.*opcache.*$') {
+                $status.opcache = -not $trimmed.StartsWith(';')
+            }
+
+            if ($trimmed -match '^(;)?\s*zend_extension\s*=.*xdebug.*$') {
+                $status.xdebug = -not $trimmed.StartsWith(';')
+            }
+        }
+    } catch {
+        $logged = Log-Data -data @{
+            header = "$($MyInvocation.MyCommand.Name) - Failed to retrieve PHP status"
+            exception = $_
+        }
+        Write-Host "An error occurred while checking PHP status: $_"
+    }
+
+    return $status
+}
+
+function Get-Current-PHP-Version {
+
+    try {
+        $emptyResult = @{ version = $null; path = $null; status = @{ opcache = $false; xdebug = $false } }
+        $currentPhpVersionPath = Get-Item $PHP_CURRENT_VERSION_PATH
+        if (-not $currentPhpVersionPath) {
+            return $emptyResult
+        }
+
+        $currentPhpVersionPath = $currentPhpVersionPath.Target
+        if (-not (Is-Directory-Exists -path $currentPhpVersionPath)) {
+            return $emptyResult
+        }
+        $phpInfo = Get-PHPInstallInfo -path $currentPhpVersionPath
+
+        return @{
+            version = $phpInfo.Version
+            arch = $phpInfo.Arch
+            buildType = $phpInfo.BuildType
+            path = $phpInfo.InstallPath
+            status = Get-PHP-Status -phpPath $currentPhpVersionPath
+        }
+    } catch {
+        $logged = Log-Data -data @{
+            header = "$($MyInvocation.MyCommand.Name) - Failed to retrieve current PHP version"
+            exception = $_
+        }
+        return $emptyResult
+    }
 }