setup-php 2.31.0 → 2.32.0

package/src/scripts/win32.ps1

@@ -3,7 +3,7 @@ param (
   [ValidateNotNull()]
   [ValidateLength(1, [int]::MaxValue)]
   [string]
-  $version = '8.2',
+  $version = '8.4',
   [Parameter(Position = 1, Mandatory = $true)]
   [ValidateNotNull()]
   [ValidateLength(1, [int]::MaxValue)]
@@ -401,6 +401,15 @@ if (Test-Path -LiteralPath $php_dir -PathType Container) {
 }
 $status = "Installed"
 $extra_version = ""
+if($version -eq 'pre') {
+  if($null -ne $installed) {
+    $version = $installed.MajorMinorVersion
+    $env:update = 'false'
+  } else {
+    Add-Log $cross "PHP" "No pre-installed PHP version found"
+    Write-Error "No pre-installed PHP version found" -ErrorAction Stop
+  }
+}
 if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version -replace '^(\d+(\.\d+)*).*', '$1.'))) -or $ts -ne $installed.ThreadSafe) {
   if ($version -lt '7.0' -and ($null -eq (Get-Module -ListAvailable -Name VcRedist))) {
     Install-PSPackage VcRedist VcRedist-main\VcRedist\VcRedist "$github/aaronparker/VcRedist/archive/main.zip" Get-VcList >$null 2>&1
@@ -434,7 +443,7 @@ if($installed.MajorMinorVersion -ne $version) {
   Write-Error "Could not setup PHP $version" -ErrorAction Stop
 }
 if($version -lt "5.5") {
-  ('libeay32.dll', 'ssleay32.dll') | ForEach-Object -Parallel { Get-File -Url "$using:php_builder/releases/download/openssl-1.0.2u/$_" -OutFile $using:php_dir\$_ >$null 2>&1 }
+  ('libeay32.dll', 'ssleay32.dll') | ForEach-Object -Parallel { Invoke-WebRequest -Uri "$using:php_builder/releases/download/openssl-1.0.2u/$_" -OutFile $using:php_dir\$_ >$null 2>&1 }
 } else {
   $enable_extensions += ('opcache')
 }

package/src/utils.ts

@@ -436,12 +436,17 @@ export async function readPHPVersion(): Promise<string> {
   const versionFile =
     (await getInput('php-version-file', false)) || '.php-version';
   if (fs.existsSync(versionFile)) {
-    return fs.readFileSync(versionFile, 'utf8').replace(/[\r\n]/g, '');
+    const contents: string = fs.readFileSync(versionFile, 'utf8');
+    const match: RegExpMatchArray | null = contents.match(
+      /^(?:php\s)?(\d+\.\d+\.\d+)$/m
+    );
+    return match ? match[1] : contents.trim();
   } else if (versionFile !== '.php-version') {
     throw new Error(`Could not find '${versionFile}' file.`);
   }
 
-  const composerLock = 'composer.lock';
+  const composerProjectDir = await readEnv('COMPOSER_PROJECT_DIR');
+  const composerLock = path.join(composerProjectDir, 'composer.lock');
   if (fs.existsSync(composerLock)) {
     const lockFileContents = JSON.parse(fs.readFileSync(composerLock, 'utf8'));
     if (
@@ -452,7 +457,7 @@ export async function readPHPVersion(): Promise<string> {
     }
   }
 
-  const composerJson = 'composer.json';
+  const composerJson = path.join(composerProjectDir, 'composer.json');
   if (fs.existsSync(composerJson)) {
     const composerFileContents = JSON.parse(
       fs.readFileSync(composerJson, 'utf8')