setup-php 2.35.5 → 2.37.0

package/src/scripts/tools/ppa.sh

@@ -50,12 +50,23 @@ update_lists_helper() {
 update_lists() {
   local ppa=${1:-}
   local ppa_search=${2:-}
+  local status_token=${3:-$ppa_search}
   local list=
-  status_file=/tmp/os_lists
+  local status_file=/tmp/os_lists
+  local hash_cmd
   if [[ -n "$ppa" && -n "$ppa_search" ]]; then
-    list="$list_dir"/"$(basename "$(grep -lr "$ppa_search" "$list_dir")")"
-    status_file=/tmp/"$(echo -n "$ppa_search" | shasum -a 256 | cut -d ' ' -f 1)"
-  elif [ -e "$list_file" ] && grep -Eq '^deb |^Types deb' "$list_file"; then
+    if [ -f "$ppa_search" ]; then
+      list="$ppa_search"
+    else
+      list="$(grep -Elr "$ppa_search" "$list_dir" 2>/dev/null | head -n 1)"
+    fi
+    hash_cmd="$(command -v sha256sum || command -v shasum)"
+    if [ -n "$status_token" ] && [ -n "$hash_cmd" ]; then
+      status_file=/tmp/os_lists_"$(echo -n "$status_token" | $hash_cmd | awk '{print $1}')"
+    elif [ -n "$status_token" ]; then
+      status_file=/tmp/os_lists_$(date +%s)
+    fi
+  elif [ -e "$list_file" ] && grep -Eq '^deb |^Types: *deb' "$list_file"; then
     list="$list_file"
   fi
   if [ ! -e "$status_file" ]; then
@@ -64,6 +75,81 @@ update_lists() {
   fi
 }
 
+# Determine whether deb822 sources are the default on this system.
+get_sources_format() {
+  if [ -n "$sources_format" ]; then
+    echo "$sources_format"
+    return
+  fi
+  sources_format=deb
+  if [ -e "$list_dir"/ubuntu.sources ] || [ -e "$list_dir"/debian.sources ]; then
+    sources_format="deb822"
+  elif ! [[ "$ID" =~ ubuntu|debian ]]; then
+    find "$list_dir" -type f -name '*.sources' | grep -q . && sources_format="deb822"
+  fi
+  echo "$sources_format"
+}
+
+# Function to get sources file extension.
+get_sources_extension() {
+  [ "$1" = "deb822" ] && echo "sources" || echo "list"
+}
+
+# Function to escape regex special characters.
+escape_regex() {
+  printf '%s' "$1" | sed -e 's/[][\.^$*+?{}()|\/]/\\&/g'
+}
+
+# Function to merge two components strings.
+merge_components() {
+  local out=() t
+  for t in $1 $2; do [[ $t && " ${out[*]} " != *" $t "* ]] && out+=("$t"); done
+  printf '%s\n' "${out[*]}"
+}
+
+# Function to merge components from a file.
+merge_components_from_file() {
+  local path=$1
+  local incoming=$2
+  local current=
+  if [ -n "$path" ] && [ -e "$path" ]; then
+    if grep -Eq '^Components:' "$path"; then
+      current="$(grep -E '^Components:' "$path" | head -n 1 | cut -d ':' -f 2 | xargs)"
+    else
+      current="$(sed -E -n 's/^deb[[:space:]]+(\[[^]]*\][[:space:]]+)?[^[:space:]]+[[:space:]]+[^[:space:]]+[[:space:]]+//p' "$path" | head -n 1 | xargs)"
+    fi
+  fi
+  local merged
+  merged="$(merge_components "$current" "$incoming")"
+  if [ -z "$merged" ] || [ "$merged" = "$current" ]; then
+    return 1
+  fi
+  printf '%s\n' "$merged"
+}
+
+# Function to get repo patterns based on format.
+get_repo_patterns() {
+  local list_format=$1
+  local ppa_url=$2
+  local package_dist=$3
+  local branches=$4
+  local escaped_url
+  local escaped_dist
+  local escaped_branches
+  escaped_url="$(escape_regex "$ppa_url")"
+  escaped_dist="$(escape_regex "$package_dist")"
+  escaped_branches="$(escape_regex "$branches")"
+  local deb_primary="^deb[[:space:]]+(\\[[^]]*\\][[:space:]]+)?${escaped_url}[[:space:]]+${escaped_dist}[[:space:]]"
+  local deb_secondary="^deb[[:space:]]+(\\[[^]]*\\][[:space:]]+)?${escaped_url}[[:space:]]+${escaped_dist}[[:space:]]+.*${escaped_branches}([[:space:]]|$)"
+  local deb822_primary="^URIs: ${escaped_url}$"
+  local deb822_secondary="^Suites: ${escaped_dist}$"
+  if [ "$list_format" = "deb822" ]; then
+    printf '%s|%s\n' "$deb822_primary" "$deb822_secondary"
+  else
+    printf '%s|%s\n' "$deb_primary" "$deb_secondary"
+  fi
+}
+
 # Function to get fingerprint from an Ubuntu PPA.
 ubuntu_fingerprint() {
   ppa="$1"
@@ -104,19 +190,78 @@ add_key() {
   fi
 }
 
+# Function to handle existing list files.
+handle_existing_list() {
+  local ppa=$1
+  local list_format=$2
+  local branches=$3
+  local merged_components
+  if [ -z "$check_lists_file" ]; then
+    echo "Repository $ppa ($branches) already exists" && return 1
+  fi
+  if merged_components="$(merge_components_from_file "$check_lists_file" "$branches")"; then
+    sudo rm -f "$check_lists_file" && printf '%s\n' "$merged_components" && return 0
+  fi
+  if [[ "$list_format" = "deb822" && "$check_lists_file" = *.list ]]; then
+    sudo rm -f "$check_lists_file" && printf '%s\n' "$branches" && return 0
+  fi
+  echo "Repository $ppa ($branches) already exists" && return 1
+}
+
+# Function to write a list file.
+write_list() {
+  local type=$1
+  local ppa=$2
+  local url=$3
+  local suite=$4
+  local components=$5
+  local key_file=$6
+  local list_basename="${ppa%%/*}"-"$ID"-"${ppa#*/}"-"$suite"
+  local arch
+  arch="$(dpkg --print-architecture)"
+  sudo rm -f "$list_dir"/"${ppa/\//-}".list "$list_dir"/"${ppa/\//-}".sources "$list_dir"/"$list_basename".list "$list_dir"/"$list_basename".sources || true
+  if [ "$type" = "deb822" ]; then
+    cat <<EOF | sudo tee "$list_dir"/"$list_basename".sources >/dev/null
+Types: deb
+URIs: $url
+Suites: $suite
+Components: $components
+Architectures: $arch
+Signed-By: $key_file
+EOF
+  else
+    echo "deb [arch=$arch signed-by=$key_file] $url $suite $components" | sudo tee "$list_dir"/"$list_basename".list >/dev/null 2>&1
+  fi
+}
+
 # Function to check if a PPA and its lists exist
 check_lists() {
-  ppa=$1
-  ppa_search=$2
-  if grep -Eqr "$ppa_search" "$list_dir"; then
+  local ppa=$1
+  local primary=${2:-}
+  local secondary=${3:-}
+  local status_token=${4:-$primary}
+  local match_file=
+  check_lists_file=
+  if [ -n "$primary" ]; then
+    match_file=$(grep -Elr "$primary" "$list_dir" 2>/dev/null | head -n 1)
+  fi
+  if [ -z "$match_file" ] && [ -n "$secondary" ]; then
+    local candidate
+    candidate=$(grep -Elr "$secondary" "$list_dir" 2>/dev/null | head -n 1)
+    if [ -n "$candidate" ] && { [ -z "$primary" ] || grep -Eq "$primary" "$candidate"; }; then
+      match_file="$candidate"
+    fi
+  fi
+  if [ -n "$match_file" ]; then
+    local list_count
     list_count="$(sudo find /var/lib/apt/lists -type f -name "*${ppa/\//_}*" | wc -l)"
     if [ "$list_count" = "0" ]; then
-      update_lists "$ppa" "$ppa_search"
+      update_lists "$ppa" "$match_file" "$status_token"
     fi
-    return 0;
-  else
-    return 1;
+    check_lists_file="$match_file"
+    return 0
   fi
+  return 1
 }
 
 # Function to add a sources list.
@@ -126,19 +271,32 @@ add_list() {
   key_source=${3:-"$ppa_url"}
   package_dist=${4:-"$VERSION_CODENAME"}
   branches=${5:-main}
-  ppa_search="deb .*$ppa_url $package_dist .*$branches$"
-  if check_lists "$ppa" "$ppa_search"; then
-    echo "Repository $ppa already exists";
-    return 1;
-  else
-    arch=$(dpkg --print-architecture)
-    [ -e "$key_source" ] && key_file=$key_source || key_file="$key_dir"/"${ppa/\//-}"-keyring.gpg
-    add_key "$ppa" "$ppa_url" "$package_dist" "$key_source" "$key_file"
-    sudo rm -rf "$list_dir"/"${ppa/\//-}".list || true
-    echo "deb [arch=$arch signed-by=$key_file] $ppa_url $package_dist $branches" | sudo tee -a "$list_dir"/"${ppa%%/*}"-"$ID"-"${ppa#*/}"-"$package_dist".list >/dev/null 2>&1
-    update_lists "$ppa" "$ppa_search"
-    . /etc/os-release
+  local list_format
+  local list_extension
+  local status_token
+  local resolved_branches
+  local list_path=
+  list_format="$(get_sources_format)"
+  list_extension="$(get_sources_extension "$list_format")"
+  status_token="${ppa_url}|${package_dist}|${branches}"
+  IFS='|' read -r primary_pattern secondary_pattern <<< "$(get_repo_patterns "$list_format" "$ppa_url" "$package_dist" "$branches")"
+  if check_lists "$ppa" "$primary_pattern" "$secondary_pattern" "$status_token"; then
+    list_path="$check_lists_file"
+    if resolved_branches="$(handle_existing_list "$ppa" "$list_format" "$branches")"; then
+      branches="$resolved_branches"
+    else
+      [ -n "$resolved_branches" ] && echo "$resolved_branches" && return 1
+    fi
+    check_lists_file=
+    IFS='|' read -r primary_pattern secondary_pattern <<< "$(get_repo_patterns "$list_format" "$ppa_url" "$package_dist" "$branches")"
+    status_token="${ppa_url}|${package_dist}|${branches}"
   fi
+  [ -e "$key_source" ] && key_file=$key_source || key_file="$key_dir"/"${ppa/\//-}"-keyring.gpg
+  add_key "$ppa" "$ppa_url" "$package_dist" "$key_source" "$key_file"
+  write_list "$list_format" "$ppa" "$ppa_url" "$package_dist" "$branches" "$key_file"
+  list_path="$list_dir"/"${ppa%%/*}"-"$ID"-"${ppa#*/}"-"$package_dist"."$list_extension"
+  update_lists "$ppa" "$list_path" "$status_token"
+  . /etc/os-release
   return 0;
 }
 
@@ -148,8 +306,12 @@ check_ppa() {
   ppa_url=${2:-"$lpc_ppa/$ppa/ubuntu"}
   package_dist=${3:-"$VERSION_CODENAME"}
   branches=${4:-main}
-  ppa_search="deb .*$ppa_url $package_dist .*$branches$"
-  if check_lists "$ppa" "$ppa_search"; then
+  local list_format
+  list_format="$(get_sources_format)"
+  IFS='|' read -r primary_pattern secondary_pattern <<< "$(get_repo_patterns "$list_format" "$ppa_url" "$package_dist" "$branches")"
+  local status_token
+  status_token="${ppa_url}|${package_dist}|${branches}"
+  if check_lists "$ppa" "$primary_pattern" "$secondary_pattern" "$status_token"; then
     return 0;
   else
     return 1;
@@ -163,7 +325,7 @@ remove_list() {
   for ppa_url in "${ppa_urls[@]}"; do
     grep -lr "$ppa_url" "$list_dir" | xargs -n1 sudo rm -f
   done
-  sudo rm -f "$key_dir"/"${ppa/\//-}"-keyring || true
+  sudo rm -f "$key_dir"/"${ppa/\//-}"-keyring /tmp/os_lists* || true
 }
 
 # Function to check if ubuntu ppa is up
@@ -213,12 +375,23 @@ update_ppa() {
   ppa_url=${2:-"$lpc_ppa/$ppa/ubuntu"}
   package_dist=${4:-"$VERSION_CODENAME"}
   branches=${5:-main}
-  ppa_search="deb .*$ppa_url $package_dist .*$branches"
-  update_lists "$ppa" "$ppa_search"
+  local list_format
+  list_format="$(get_sources_format)"
+  IFS='|' read -r primary_pattern secondary_pattern <<< "$(get_repo_patterns "$list_format" "$ppa_url" "$package_dist" "$branches")"
+  local list_path
+  list_path="$(grep -Elr "$primary_pattern" "$list_dir" 2>/dev/null | head -n 1)"
+  if [ -z "$list_path" ] && [ -n "$secondary_pattern" ]; then
+    list_path="$(grep -Elr "$secondary_pattern" "$list_dir" 2>/dev/null | head -n 1)"
+  fi
+  local status_token
+  status_token="${ppa_url}|${package_dist}|${branches}"
+  update_lists "$ppa" "${list_path:-$primary_pattern}" "$status_token"
   . /etc/os-release
 }
 
 # Variables
+sources_format=
+check_lists_file=
 list_dir='/etc/apt/sources.list.d'
 list_file="/etc/apt/sources.list.d/$ID.sources"
 [ -e "$list_file" ] || list_file='/etc/apt/sources.list'

package/src/scripts/tools/symfony.ps1

@@ -1,18 +1,32 @@
 Function Add-Symfony() {
-  $arch_name ='amd64'
-  if(-not([Environment]::Is64BitOperatingSystem) -or $version -lt '7.0') {
-    $arch_name = '386'
-  }
-  $url = "https://github.com/symfony-cli/symfony-cli/releases/latest/download/symfony-cli_windows_${arch_name}.zip"
-  Get-File -Url $url -OutFile $bin_dir\symfony.zip >$null 2>&1
-  Expand-Archive -Path $bin_dir\symfony.zip -DestinationPath $bin_dir -Force >$null 2>&1
-  if(Test-Path $bin_dir\symfony.exe) {
-    Copy-Item -Path $bin_dir\symfony.exe -Destination $bin_dir\symfony-cli.exe > $null 2>&1
-    Add-ToProfile $current_profile 'symfony' "New-Alias symfony $bin_dir\symfony.exe"
-    Add-ToProfile $current_profile 'symfony_cli' "New-Alias symfony-cli $bin_dir\symfony-cli.exe"
-    $tool_version = Get-ToolVersion symfony "-V"
-    Add-Log $tick "symfony-cli" "Added symfony-cli $tool_version"
+  param(
+    [Parameter(Mandatory = $true, Position = 0, HelpMessage = 'Symfony version to be installed')]
+    [string] $protobuf_tag
+  )
+  $protobuf_tag = $protobuf_tag.replace('v', '')
+  if($protobuf_tag -ne 'latest' -and $protobuf_tag -notmatch '^\d+(\.\d+)*$') {
+    Add-Log $cross "symfony-cli" "Invalid symfony version: $protobuf_tag"
   } else {
-    Add-Log $cross "symfony-cli" "Could not setup symfony-cli"
+    $arch_name = 'amd64'
+    if (-not ([Environment]::Is64BitOperatingSystem) -or $version -lt '7.0') {
+      $arch_name = '386'
+    }
+    $symfony_releases = "https://github.com/symfony-cli/symfony-cli/releases"
+    if ($protobuf_tag -eq 'latest') {
+      $url = "$symfony_releases/latest/download/symfony-cli_windows_${arch_name}.zip"
+    } else {
+      $url = "$symfony_releases/download/v$protobuf_tag/symfony-cli_windows_${arch_name}.zip"
+    }
+    Get-File -Url $url -OutFile $bin_dir\symfony.zip > $null 2>&1
+    Expand-Archive -Path $bin_dir\symfony.zip -DestinationPath $bin_dir -Force > $null 2>&1
+    if (Test-Path $bin_dir\symfony.exe) {
+      Copy-Item -Path $bin_dir\symfony.exe -Destination $bin_dir\symfony-cli.exe > $null 2>&1
+      Add-ToProfile $current_profile 'symfony' "New-Alias symfony $bin_dir\symfony.exe"
+      Add-ToProfile $current_profile 'symfony_cli' "New-Alias symfony-cli $bin_dir\symfony-cli.exe"
+      $tool_version = Get-ToolVersion symfony "-V"
+      Add-Log $tick "symfony-cli" "Added symfony-cli $tool_version"
+    } else {
+      Add-Log $cross "symfony-cli" "Could not setup symfony-cli"
+    }
   }
 }

package/src/scripts/tools/symfony.sh

@@ -1,41 +1,44 @@
-add_symfony_with_brew() {
-  add_brew_tap symfony-cli/homebrew-tap
-  brew install symfony-cli/tap/symfony-cli
-}
-
 get_symfony_artifact_url() {
-    arch=$(dpkg --print-architecture)
-    url=$(get -s -n "" https://raw.githubusercontent.com/symfony-cli/homebrew-tap/main/Formula/symfony-cli.rb 2<&1 | grep -m 1 "url.*linux.*${arch}" | cut -d\" -f 2)
-    if [ -z "$url" ]; then
-      url=$(get -s -n "" https://api.github.com/repos/symfony-cli/symfony-cli/releases 2<&1 | grep -m 1 "url.*linux.*${arch}.*gz\"" | cut -d\" -f 4)
-    fi
-    echo "$url"
+  local symfony_tag=$1
+  local os
+  local arch
+  os="$(uname -s | tr '[:upper:]' '[:lower:]')"
+  arch="$(uname -m)"
+  case "$arch" in
+    arm|armv6*|armv7*) arch="armv6" ;;
+    aarch64*|armv8*|arm64) arch="arm64" ;;
+    i[36]86) arch="386" ;;
+    x86_64|amd64) arch="amd64" ;;
+  esac
+  [ "$os" = "darwin" ] && arch="all"
+  symfony_releases="https://github.com/symfony-cli/symfony-cli/releases"
+  if [ "$symfony_tag" = "latest" ]; then
+    echo "$symfony_releases/latest/download/symfony-cli_${os}_${arch}.tar.gz"
+  else
+    echo "$symfony_releases/download/v$symfony_tag/symfony-cli_${os}_${arch}.tar.gz"
+  fi
 }
 
 add_symfony_helper() {
-  if [ "$(uname -s)" = "Linux" ]; then
-    url="$(get_symfony_artifact_url)"
-    if [ -z "$url" ]; then
-      . "${0%/*}"/tools/brew.sh
-      configure_brew
-      add_symfony_with_brew
-    else
-      get -s -n "" "$url" | sudo tar -xz -C "${tool_path_dir:?}" 2>/dev/null
-      sudo chmod a+x /usr/local/bin/symfony
-    fi
-  elif [ "$(uname -s)" = "Darwin" ]; then
-    add_symfony_with_brew
-  fi
+  local install_dir=/usr/local/bin
+  [ "$(uname -s)" = "Darwin" ] && install_dir=${brew_prefix:?}/bin
+  get -s -n "" "$(get_symfony_artifact_url "$symfony_tag")" | sudo tar -xz -C "$install_dir" 2>/dev/null
+  sudo chmod a+x "$install_dir"/symfony
 }
 
 add_symfony() {
-  add_symfony_helper >/dev/null 2>&1
-  symfony_path="$(command -v symfony)"
-  if [[ -n "$symfony_path" ]]; then
-    sudo ln -s "$symfony_path" "${tool_path_dir:?}"/symfony-cli
-    tool_version=$(get_tool_version "symfony" "-V")
-    add_log "${tick:?}" "symfony-cli" "Added symfony-cli $tool_version"
+  local symfony_tag="${1/v/}"
+  if ! [[ "$symfony_tag" =~ ^[0-9]+(\.[0-9]+)*$ || "$symfony_tag" == 'latest' ]]; then
+      add_log "${cross:?}" "symfony-cli" "Version '$symfony_tag' is not valid for symfony-cli"
   else
-    add_log "${cross:?}" "symfony-cli" "Could not setup symfony-cli"
+    add_symfony_helper "$symfony_tag" >/dev/null 2>&1
+    symfony_path="$(command -v symfony)"
+    if [[ -n "$symfony_path" ]]; then
+      sudo ln -s "$symfony_path" "${tool_path_dir:?}"/symfony-cli
+      tool_version=$(get_tool_version "symfony" "-V")
+      add_log "${tick:?}" "symfony-cli" "Added symfony-cli $tool_version"
+    else
+      add_log "${cross:?}" "symfony-cli" "Could not setup symfony-cli"
+    fi
   fi
 }

package/src/scripts/unix.sh

@@ -4,7 +4,8 @@ export cross="✗"
 export curl_opts=(-sL)
 export old_versions="5.[3-5]"
 export jit_versions="8.[0-9]"
-export nightly_versions="8.[3-9]"
+export php_builder_versions="8.[3-9]"
+export nightly_versions="8.[6-9]"
 export xdebug3_versions="7.[2-4]|8.[0-9]"
 export latest="releases/latest/download"
 export github="https://github.com/shivammathur"
@@ -58,6 +59,7 @@ read_env() {
      -n "$ACT" || -n "$CONTAINER" ]] && _runner=self-hosted || _runner=github
   runner="${runner:-${RUNNER:-$_runner}}"
   tool_path_dir="${setup_php_tools_dir:-${SETUP_PHP_TOOLS_DIR:-/usr/local/bin}}"
+  tool_cache_path_dir="${setup_php_tool_cache_dir:-${SETUP_PHP_TOOL_CACHE_DIR:-${RUNNER_TOOL_CACHE:-/opt/hostedtoolcache}/setup-php/tools}}"  
 
   if [[ "$runner" = "github" && $_runner = "self-hosted" ]]; then
     fail_fast=true
@@ -79,6 +81,7 @@ read_env() {
   export update
   export ts
   export tool_path_dir
+  export tool_cache_path_dir
 }
 
 # Function to create a lock.
@@ -169,14 +172,15 @@ get_shell_profile() {
 # Function to add a path to the PATH variable.
 add_path() {
   path_to_add=$1
-  [[ ":$PATH:" == *":$path_to_add:"* ]] && return
+  action=$2
+  [[ "$action" == "verify" && ":$PATH:" == *":$path_to_add:"* ]] && return
   if [[ -n "$GITHUB_PATH" ]]; then
-    echo "$path_to_add" | tee -a "$GITHUB_PATH" >/dev/null 2>&1
+    printf '%s\n%s' "$path_to_add" "$(grep -v "^${path_to_add}$" "$GITHUB_PATH" 2>/dev/null)" > "$GITHUB_PATH"
   else
     profile=$(get_shell_profile)
     ([ -e "$profile" ] && grep -q ":$path_to_add\"" "$profile" 2>/dev/null) || echo "export PATH=\"\${PATH:+\${PATH}:}\"$path_to_add" | sudo tee -a "$profile" >/dev/null 2>&1
   fi
-  export PATH="${PATH:+${PATH}:}$path_to_add"
+  [[ ":$PATH:" == *":$path_to_add:"* ]] || export PATH="${PATH:+${PATH}:}$path_to_add"
 }
 
 # Function to add environment variables using a PATH.

package/src/scripts/win32.ps1

@@ -81,9 +81,10 @@ Function Get-PathFromRegistry {
 # Function to add a location to PATH.
 Function Add-Path {
   param(
-    [string]$PathItem
+    [string]$PathItem,
+    [switch]$Force
   )
-  if("$env:PATH;".contains("$PathItem;")) {
+  if(-not($Force) -and "$env:PATH;".contains("$PathItem;")) {
     return
   }
   if ($env:GITHUB_PATH) {
@@ -323,7 +324,7 @@ $php_builder = "$github/shivammathur/php-builder-windows"
 $current_profile = "$env:TEMP\setup-php.ps1"
 $ProgressPreference = 'SilentlyContinue'
 $jit_versions = '8.[0-9]'
-$nightly_versions = '8.[2-9]'
+$nightly_versions = '8.[6-9]'
 $xdebug3_versions = "7.[2-4]|8.[0-9]"
 $enable_extensions = ('openssl', 'curl', 'mbstring')
 
@@ -375,6 +376,7 @@ if(-not($env:ImageOS) -and -not($env:ImageVersion)) {
   if(-not(Test-Path -LiteralPath $current_profile)) {
     New-Item -Path $current_profile -ItemType "file" -Force >$null 2>&1
   }
+  Add-Path -PathItem $bin_dir -Force
 }
 
 $src = Join-Path -Path $PSScriptRoot -ChildPath \..
@@ -444,9 +446,12 @@ if($installed.MajorMinorVersion -ne $version) {
 }
 if($version -lt "5.5") {
   ('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 {
+} elseif($version -lt "8.5") {
   $enable_extensions += ('opcache')
 }
+if($version -ge "8.5" -and (Test-Path $ext_dir\php_opcache.dll)) {
+  Remove-Item $ext_dir\php_opcache.dll -Force
+}
 Enable-PhpExtension -Extension ($enable_extensions | Where-Object { Test-Path $ext_dir\php_$_.dll }) -Path $php_dir
 Add-PhpCAInfo
 Add-OpenSSLConf