setup-php 2.31.1 → 2.33.0

package/src/scripts/unix.sh

@@ -55,6 +55,7 @@ read_env() {
   fail_fast="${fail_fast:-${FAIL_FAST:-false}}"
   [[ -z "${ImageOS}" && -z "${ImageVersion}" || -n ${ACT} ]] && _runner=self-hosted || _runner=github
   runner="${runner:-${RUNNER:-$_runner}}"
+  tool_path_dir="${tools_dir:-${TOOLS_DIR:-/usr/local/bin}}"
 
   if [[ "$runner" = "github" && $_runner = "self-hosted" ]]; then
     fail_fast=true
@@ -63,13 +64,45 @@ read_env() {
 
   # Set Update to true if the ubuntu github image does not have PHP PPA.
   if [[ "$runner" = "github" && "${ImageOS}" =~ ubuntu.* ]]; then
-    check_ppa ondrej/php || update=true
+    if ! check_ppa ondrej/php; then
+      update=true
+      echo '' | sudo tee /tmp/sp_update >/dev/null 2>&1
+    elif [ -e /tmp/sp_update ]; then
+      update=true
+    fi
   fi
 
   export fail_fast
   export runner
   export update
   export ts
+  export tools_dir_path
+}
+
+# Function to create a lock.
+acquire_lock() {
+  lock_path="$1"
+  while true; do
+    if sudo mkdir "$lock_path" 2>/dev/null; then
+      echo $$ | sudo tee "$lock_path/pid" >/dev/null
+      return 0
+    else
+      if sudo test -f "$lock_path/pid"; then
+        lock_pid=$(sudo cat "$lock_path/pid")
+        if ! ps -p "$lock_pid" >/dev/null 2>&1; then
+          sudo rm -rf "$lock_path"
+          continue
+        fi
+      fi
+      sleep 1
+    fi
+  done
+}
+
+# Function to release the lock.
+release_lock() {
+  lock_path="$1"
+  sudo rm -rf "$lock_path"
 }
 
 # Function to download a file using cURL.
@@ -84,12 +117,23 @@ get() {
   if [ "$mode" = "-s" ]; then
     sudo curl "${curl_opts[@]}" "${links[0]}"
   else
+    if [ "$runner" = "self-hosted" ]; then
+      lock_path="$file_path.lock"
+      acquire_lock "$lock_path"
+      if [ "$execute" = "-e" ]; then
+        until [ -z "$(fuser "$file_path" 2>/dev/null)" ]; do
+          sleep 1
+        done
+      fi
+      trap 'release_lock "$lock_path"' EXIT SIGINT SIGTERM
+    fi
     for link in "${links[@]}"; do
       status_code=$(sudo curl -w "%{http_code}" -o "$file_path" "${curl_opts[@]}" "$link")
       [ "$status_code" = "200" ] && break
     done
     [ "$execute" = "-e" ] && sudo chmod a+x "$file_path"
     [ "$mode" = "-v" ] && echo "$status_code"
+    [ "$runner" = "self-hosted" ] && release_lock "$lock_path"
   fi
 }
 
@@ -168,6 +212,19 @@ self_hosted_setup() {
   fi
 }
 
+# Function to check pre-installed PHP
+check_pre_installed() {
+  if [ "$version" = "pre" ]; then
+    if [ -n "$php_config" ]; then
+      version="$(php_semver | cut -c 1-3)"
+      update=false
+    else
+      fail_fast=true
+      add_log "$cross" "PHP" "No pre-installed PHP version found"
+    fi
+  fi
+}
+
 # Function to configure PHP
 configure_php() {
   add_php_config

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/tools.ts

@@ -422,6 +422,9 @@ export async function addPHPUnitTools(data: RS): Promise<string> {
       'latest';
   }
   data['url'] = await getPharUrl(data);
+  if (data['url'].match(/-\d+/)) {
+    data['url'] += ',' + data['url'].replace(/-(\d+)\.\d+\.\d+/, '-$1');
+  }
   return await addArchive(data);
 }
 

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')