setup-php 2.16.0 → 2.17.0

package/src/scripts/extensions/add_extensions.ps1

@@ -0,0 +1,194 @@
+# Function to link dependencies to PHP directory.
+Function Set-ExtensionPrerequisites
+{
+  Param (
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    [ValidateLength(1, [int]::MaxValue)]
+    [string]
+    $deps_dir
+  )
+  $deps = Get-ChildItem -Recurse -Path $deps_dir
+  if ($deps.Count -ne 0) {
+    # Symlink dependencies instead of adding the directory to PATH ...
+    # as other actions change the PATH thus breaking extensions.
+    $deps | ForEach-Object {
+      New-Item -Itemtype SymbolicLink -Path $php_dir -Name $_.Name -Target $_.FullName -Force > $null 2>&1
+    }
+  } else {
+    Remove-Item $deps_dir -Recurse -Force
+  }
+}
+
+# Function to add PHP extensions.
+Function Add-Extension {
+  Param (
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    [ValidateLength(1, [int]::MaxValue)]
+    [string]
+    $extension,
+    [Parameter(Position = 1, Mandatory = $false)]
+    [ValidateNotNull()]
+    [ValidateSet('stable', 'beta', 'alpha', 'devel', 'snapshot')]
+    [string]
+    $stability = 'stable',
+    [Parameter(Position = 2, Mandatory = $false)]
+    [ValidateNotNull()]
+    [ValidatePattern('^\d+(\.\d+){0,2}$')]
+    [string]
+    $extension_version = ''
+  )
+  try {
+    $extension_info = Get-PhpExtension -Path $php_dir | Where-Object { $_.Name -eq $extension -or $_.Handle -eq $extension }
+    $deps_dir = "$ext_dir\$extension-vc$($installed.VCVersion)-$arch"
+    New-Item $deps_dir -Type Directory -Force > $null 2>&1
+    if ($null -ne $extension_info) {
+      switch ($extension_info.State) {
+        'Builtin' {
+          Add-Log $tick $extension "Enabled"
+        }
+        'Enabled' {
+          Add-Log $tick $extension "Enabled"
+        }
+        default {
+          Enable-ExtensionDependencies $extension
+          Enable-PhpExtension -Extension $extension_info.Handle -Path $php_dir
+          Set-ExtensionPrerequisites $deps_dir
+          Add-Log $tick $extension "Enabled"
+        }
+      }
+    }
+    else {
+      # Patch till PHP 8.1 DLLs are released as stable.
+      $minimumStability = $stability
+      if($version -eq '8.1' -and $stability -eq 'stable') {
+        $minimumStability = 'snapshot'
+      }
+
+      $params = @{ Extension = $extension; MinimumStability = $minimumStability; MaximumStability = $stability; Path = $php_dir; AdditionalFilesPath = $deps_dir; NoDependencies = $true }
+      if($extension_version -ne '') {
+        $params["Version"] = $extension_version
+      }
+      Install-PhpExtension @params
+      Set-ExtensionPrerequisites $deps_dir
+      Add-Log $tick $extension "Installed and enabled"
+    }
+  }
+  catch {
+    Add-Log $cross $extension "Could not install $extension on PHP $($installed.FullVersion)"
+  }
+}
+
+# Function to get a map of extensions and their dependent shared extensions.
+Function Get-ExtensionMap {
+  php -d'error_reporting=0' $src\scripts\extensions\extension_map.php $env:TEMP\map$version.orig
+}
+
+# Function to enable extension dependencies which are also extensions.
+Function Enable-ExtensionDependencies {
+  Param (
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    [ValidateLength(1, [int]::MaxValue)]
+    [string]
+    $extension
+  )
+  if (-not(Test-Path $env:TEMP\extdisabled\$extension)) {
+    return
+  }
+  Get-ExtensionMap
+  $entry = findstr /r "$extension`:.*" $env:TEMP\map$version.orig
+  if($entry) {
+    $entry.split(':')[1].trim().split(' ') | ForEach-Object {
+      if (-not(php -m | findstr -i $_)) {
+        Enable-PhpExtension -Extension $_ -Path $php_dir
+      }
+    }
+  }
+  Remove-Item $env:TEMP\extdisabled\$extension -Force
+}
+
+# Function to disable dependent extensions.
+Function Disable-DependentExtensions() {
+  Param (
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    [ValidateLength(1, [int]::MaxValue)]
+    [string]
+    $extension
+  )
+  Select-String -Pattern ".*:.*\s$extension(\s|$)" $env:TEMP\map$version.orig | ForEach-Object {
+    $dependent = $_.Matches[0].Value.split(':')[0];
+    Disable-ExtensionHelper -Extension $dependent -DisableDependents
+    Add-Log $tick ":$extension" "Disabled $dependent as it depends on $extension"
+  }
+}
+
+# Helper function to disable an extension.
+Function Disable-ExtensionHelper() {
+  Param (
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    [ValidateLength(1, [int]::MaxValue)]
+    [string]
+    $extension,
+    [switch] $DisableDependents
+  )
+  Get-ExtensionMap
+  if($DisableDependents) {
+    Disable-DependentExtensions $extension
+  }
+  Disable-PhpExtension -Extension $extension -Path $php_dir
+  New-Item $env:TEMP\extdisabled -Type Directory -Force > $null 2>&1
+  New-Item $env:TEMP\extdisabled\$extension -Type File -Force > $null 2>&1
+}
+
+# Function to disable an extension.
+Function Disable-Extension() {
+  Param (
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    [ValidateLength(1, [int]::MaxValue)]
+    [string]
+    $extension,
+    [Parameter(Position = 1, Mandatory = $false)]
+    [ValidateNotNull()]
+    [ValidateLength(1, [int]::MaxValue)]
+    [string]
+    $DisableDependents
+  )
+  if(php -m | findstr -i $extension) {
+    if(Test-Path $ext_dir\php_$extension.dll) {
+      try {
+        $params = @{ Extension = $extension; DisableDependents = ($DisableDependents -ne 'false') }
+        Disable-ExtensionHelper @params
+        Add-Log $tick ":$extension" "Disabled"
+      } catch {
+        Add-Log $cross ":$extension" "Could not disable $extension on PHP $($installed.FullVersion)"
+      }
+    } else {
+      Add-Log $cross ":$extension" "Could not disable $extension on PHP $($installed.FullVersion) as it not a shared extension"
+    }
+  } elseif(Test-Path $ext_dir\php_$extension.dll) {
+    Add-Log $tick ":$extension" "Disabled"
+  } else {
+    Add-Log $tick ":$extension" "Could not find $extension on PHP $($installed.FullVersion)"
+  }
+}
+
+# Function to disable shared extensions.
+Function Disable-AllShared() {
+  Get-ExtensionMap
+  (Get-Content $php_dir\php.ini) | Where-Object {$_ -notmatch '^(zend_)?extension\s*='} | Set-Content $php_dir\php.ini
+  New-Item $env:TEMP\extdisabled\$version -Type Directory -Force > $null 2>&1
+  Get-Childitem $ext_dir\*.dll | ForEach-Object {
+    New-Item ("$env:TEMP\extdisabled\$version\" + ($_.Name.split('.')[0].split('_')[1])) -Type File -Force > $null 2>&1
+  }
+  Add-Log $tick "none" "Disabled all shared extensions"
+}
+
+# Function to handle request to add PECL.
+Function Add-Pecl() {
+  Add-Log $tick "PECL" "Use extensions input to setup PECL extensions on windows"
+}

package/src/scripts/extensions/add_extensions.sh

@@ -0,0 +1,184 @@
+# Function to log result of installing extension.
+add_extension_log() {
+  (
+    check_extension "$(echo "$1" | cut -d '-' -f 1)" && add_log "${tick:?}" "$1" "$2"
+  ) || add_log "${cross:?}" "$1" "Could not install $1 on PHP ${semver:?}"
+}
+
+# Function to test if extension is loaded.
+check_extension() {
+  local extension=$1
+  if [ "$extension" != "mysql" ]; then
+    php -m | grep -i -q -w "$extension"
+  else
+    php -m | grep -i -q "$extension"
+  fi
+}
+
+# Function to check if extension is shared
+shared_extension() {
+  [ -e "${ext_dir:?}/$1.so" ]
+}
+
+# Function to enable cached extension's dependencies.
+enable_cache_extension_dependencies() {
+  if [ -d /tmp/extcache ] && shared_extension "$1"; then
+    cache_dir=$(find /tmp/extcache -maxdepth 1 -type d -regex ".*$1[0-9]*")
+    if [[ -n "$cache_dir" ]]; then
+      IFS=" " read -r -a deps <<<"$(find "$cache_dir" -maxdepth 1 -type f -name "*" -exec basename {} \; | tr '\n' ' ')"
+      if [[ -n "${deps[*]}" ]] && php "${deps[@]/#/-d ${2}=}" -d "${2}=$1" -m 2>/dev/null | grep -i -q "$1"; then
+        for ext in "${deps[@]}"; do
+          sudo rm -rf /tmp/extcache/"$ext"
+          enable_extension "$ext" "$2"
+        done
+      fi
+    fi
+  fi
+}
+
+# Function to enable existing extensions.
+enable_extension() {
+  modules_dir="/var/lib/php/modules/${version:?}"
+  [ -d "$modules_dir" ] && sudo find "$modules_dir" -path "*disabled*$1" -delete
+  enable_extension_dependencies "$1" "$2"
+  enable_cache_extension_dependencies "$1" "$2"
+  if ! check_extension "$1" && shared_extension "$1"; then
+    echo "$2=${ext_dir:?}/$1.so" | sudo tee -a "${pecl_file:-${ini_file[@]}}" >/dev/null
+  fi
+}
+
+# Function to enable array of extensions
+enable_extensions() {
+  local extensions=("$@")
+  to_wait=()
+  for ext in "${extensions[@]}"; do
+    enable_extension "$ext" extension >/dev/null 2>&1 &
+    to_wait+=($!)
+  done
+  wait "${to_wait[@]}"
+}
+
+# Function to get a map of extensions and their dependent shared extensions.
+get_extension_map() {
+  php -d'error_reporting=0' "${src:?}"/scripts/extensions/extension_map.php /tmp/map"$version".orig
+}
+
+# Function to enable extension dependencies which are also extensions.
+enable_extension_dependencies() {
+  local extension=$1
+  local prefix=$2
+  [ -e /tmp/extdisabled/"$version"/"$extension" ] || return;
+  get_extension_map
+  for dependency in $(grep "$extension:" /tmp/map"$version".orig | cut -d ':' -f 2 | tr '\n' ' '); do
+    enable_extension "$dependency" "$prefix"
+  done
+  rm /tmp/extdisabled/"$version"/"$extension"
+}
+
+# Function to disable dependent extensions.
+disable_extension_dependents() {
+  local extension=$1
+  for dependent in $(grep -E ".*:.*\s$extension(\s|$)" /tmp/map"$version".orig | cut -d ':' -f 1 | tr '\n' ' '); do
+    disable_extension_helper "$dependent" true
+    add_log "${tick:?}" ":$extension" "Disabled $dependent as it depends on $extension"
+  done
+}
+
+# Function to disable an extension.
+disable_extension() {
+  local extension=$1
+  if check_extension "$extension"; then
+    if shared_extension "$extension"; then
+      disable_extension_helper "$extension" true
+      (! check_extension "$extension" && add_log "${tick:?}" ":$extension" "Disabled") ||
+        add_log "${cross:?}" ":$extension" "Could not disable $extension on PHP ${semver:?}"
+    else
+      add_log "${cross:?}" ":$extension" "Could not disable $extension on PHP $semver as it not a shared extension"
+    fi
+  elif shared_extension "$extension"; then
+    add_log "${tick:?}" ":$extension" "Disabled"
+  else
+    add_log "${tick:?}" ":$extension" "Could not find $extension on PHP $semver"
+  fi
+}
+
+# Function to disable shared extensions.
+disable_all_shared() {
+  get_extension_map
+  sudo sed -i.orig -E -e "/^(zend_)?extension\s*=/d" "${ini_file[@]}" "$pecl_file" 2>/dev/null || true
+  sudo find "${ini_dir:-$scan_dir}"/.. -name "*.ini" -not -path "*php.ini" -not -path "*phar.ini" -not -path "*pecl.ini" -not -path "*mods-available*" -delete >/dev/null 2>&1 || true
+  mkdir -p /tmp/extdisabled/"$version"
+  sudo find "$ext_dir" -name '*.so' -print0 | xargs -0 -n 1 basename -s .so | xargs -n 1 -I{} touch /tmp/extdisabled/"$version"/{}
+  add_log "${tick:?}" "none" "Disabled all shared extensions"
+}
+
+# Function to configure PECL.
+configure_pecl() {
+  if ! [ -e /tmp/pecl_config ]; then
+    for script in pear pecl; do
+      sudo "$script" config-set php_ini "${pecl_file:-${ini_file[@]}}"
+      sudo "$script" channel-update "$script".php.net
+    done
+    echo '' | sudo tee /tmp/pecl_config >/dev/null 2>&1
+  fi
+}
+
+# Function to add an extension.
+add_extension() {
+  local extension=$1
+  local prefix=$2
+  enable_extension "$extension" "$prefix"
+  if check_extension "$extension"; then
+    add_log "${tick:?}" "$extension" "Enabled"
+  else
+    add_extension_helper "$extension" "$prefix"
+  fi
+}
+
+# Function to get the PECL version of an extension.
+get_pecl_version() {
+  local extension=$1
+  stability="$(echo "$2" | grep -m 1 -Eio "(stable|alpha|beta|rc|snapshot|preview)")"
+  pecl_rest='https://pecl.php.net/rest/r/'
+  response=$(get -s -n "" "$pecl_rest$extension"/allreleases.xml)
+  pecl_version=$(echo "$response" | grep -m 1 -Eio "([0-9]+\.[0-9]+\.[0-9]+${stability}[0-9]+)")
+  if [ ! "$pecl_version" ]; then
+    pecl_version=$(echo "$response" | grep -m 1 -Eo "([0-9]+\.[0-9]+\.[0-9]+)")
+  fi
+  echo "$pecl_version"
+}
+
+# Function to install PECL extensions and accept default options
+pecl_install() {
+  local extension=$1
+  add_pecl >/dev/null 2>&1
+  yes '' 2>/dev/null | sudo pecl install -f "$extension" >/dev/null 2>&1
+}
+
+# Function to install a specific version of PECL extension.
+add_pecl_extension() {
+  local extension=$1
+  local pecl_version=$2
+  local prefix=$3
+  enable_extension "$extension" "$prefix"
+  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot|preview).* ]]; then
+    pecl_version=$(get_pecl_version "$extension" "$pecl_version")
+  fi
+  ext_version=$(php -r "echo phpversion('$extension');")
+  if [ "${ext_version/-/}" = "$pecl_version" ]; then
+    add_log "${tick:?}" "$extension" "Enabled"
+  else
+    disable_extension_helper "$extension" >/dev/null 2>&1
+    pecl_install "$extension-$pecl_version"
+    add_extension_log "$extension-$pecl_version" "Installed and enabled"
+  fi
+}
+
+# Function to setup pre-release extensions using PECL.
+add_unstable_extension() {
+  local extension=$1
+  local stability=$2
+  local prefix=$3
+  pecl_version=$(get_pecl_version "$extension" "$stability")
+  add_pecl_extension "$extension" "$pecl_version" "$prefix"
+}

package/src/scripts/{ext → extensions}/cubrid.sh

@@ -1,10 +1,10 @@
 # Function to log license details.
 add_license_log() {
-  printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "$ext" "Click to read the $ext related license information"
+  printf "$GROUP\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "$ext" "Click to read the $ext related license information"
   printf "Cubrid CCI package is required for %s extension.\n" "$ext"
   printf "The extension %s and Cubrid CCI are provided under the license linked below.\n" "$ext"
   printf "Refer to: \033[35;1m%s \033[0m\n" "https://github.com/CUBRID/cubrid-cci/blob/develop/COPYING"
-  echo "::endgroup::"
+  echo "$END_GROUP"
 }
 
 # Function to setup gcc-7 and g++-7
@@ -57,4 +57,4 @@ add_cubrid() {
 }
 
 # shellcheck source=.
-. "${scripts:?}"/ext/patches/phpize.sh
+. "${scripts:?}"/extensions/patches/phpize.sh

package/src/scripts/{ext → extensions}/extension_map.php

@@ -15,7 +15,7 @@ class ExtensionMap {
     /** @var string Prefix in PHP extension file. */
     private $file_prefix;
 
-    /** @var string String to store the map */
+    /** @var array Array to store the map */
     private $map;
 
     /**
@@ -25,7 +25,23 @@ class ExtensionMap {
         $this->extension_dir = ini_get('extension_dir');
         $this->file_extension = (PHP_OS == 'WINNT' ? '.dll' : '.so');
         $this->file_prefix = (PHP_OS == 'WINNT' ? 'php_' : '');
-        $this->map = '';
+        $this->map = array();
+    }
+
+    /**
+     * Function to read the extension map.
+     */
+    private function parseMap($path) {
+        if(file_exists($path)) {
+            $handle = fopen($path, "r");
+            if ($handle) {
+                while (($line = fgets($handle)) !== false) {
+                    $line_parts = explode(':', $line);
+                    $this->map[$line_parts[0]] = explode(' ', trim($line_parts[1]));
+                }
+                fclose($handle);
+            }
+        }
     }
 
     /**
@@ -34,7 +50,7 @@ class ExtensionMap {
      * @param string $extension
      * @return bool
      */
-    public function checkSharedExtension($extension) {
+    private function checkSharedExtension($extension) {
         $extension_file = $this->extension_dir. DIRECTORY_SEPARATOR . $this->file_prefix . $extension . $this->file_extension;
         return file_exists($extension_file);
     }
@@ -44,7 +60,7 @@ class ExtensionMap {
      *
      * @return string[]
      */
-    public function getSharedExtensions() {
+    private function getSharedExtensions() {
         $files = scandir($this->extension_dir);
         $extensions = array_diff($files, array('.','..'));
         $filter_pattern = "/$this->file_extension|$this->file_prefix/";
@@ -60,7 +76,7 @@ class ExtensionMap {
      * @param array $dependencies
      * @return array
      */
-    public function patchDependencies($extension, $dependencies) {
+    private function patchDependencies($extension, $dependencies) {
         // memcached 2.2.0 has no dependencies in reflection data.
         if($extension == 'memcached') {
             $dependencies = array_unique(array_merge($dependencies, array('igbinary', 'json', 'msgpack')));
@@ -74,7 +90,10 @@ class ExtensionMap {
      * @param string $extension
      * @throws ReflectionException
      */
-    public function addExtensionToMap($extension) {
+    private function addExtensionToMap($extension) {
+        if($this->map && array_key_exists($extension, $this->map) && !empty($this->map[$extension])) {
+            return;
+        }
         // PHP 5.3 does not allow using $this.
         $self = $this;
 
@@ -84,15 +103,15 @@ class ExtensionMap {
         $dependencies = array_filter($dependencies, function ($dependency) use ($self) {
             return $self->checkSharedExtension($dependency);
         });
-        $self->map .= $extension . ': ' . implode(' ', $dependencies) . PHP_EOL;
+        $self->map[$extension] = $dependencies;
     }
 
     /**
-     * Function to print the map of shared extensions and their dependent extensions.
-     *
-     * @return string
+     * Function to write the map of shared extensions and their dependent extensions.
      */
-    public function __toString() {
+    public function write() {
+        $path = $_SERVER['argv'][1];
+        $this->parseMap($path);
         $extensions = array_map('strtolower', $this->getSharedExtensions());
         foreach ($extensions as $extension) {
             try {
@@ -101,9 +120,13 @@ class ExtensionMap {
 
             }
         }
-        return $this->map;
+        $map_string = '';
+        foreach($this->map as $extension => $dependencies) {
+            $map_string .= $extension . ': ' . implode(' ', $dependencies) . PHP_EOL;
+        }
+        file_put_contents($path, $map_string);
     }
 }
 
 $extension_map = new ExtensionMap();
-echo $extension_map;
+$extension_map->write();

package/src/scripts/{ext → extensions}/http.sh

@@ -19,15 +19,6 @@ enable_http() {
   fi
 }
 
-# Function to install extensions.
-add_extension_helper() {
-  if [ "$os" = "Linux" ]; then
-    add_extension "$1" extension
-  else
-    add_brew_extension "$1" extension
-  fi
-}
-
 # Function to install http dependencies.
 add_http_dependencies() {
   if [[ ${version:?} =~ ${old_versions:?} ]]; then
@@ -78,13 +69,11 @@ add_http_helper() {
 add_http_latest() {
   enable_http
   if ! check_extension http; then
-    add_http_dependencies
     if [ "$os" = "Linux" ]; then
-      if ! [[ "${version:?}" =~ ${old_versions:?}|${nightly_versions:?} ]]; then
-        install_packages "php$version-http"
-      else
-        add_http_helper "$(get_http_version)" "$os"
-      fi
+      add_http_dependencies
+      package="php$version-http"
+      add_ppa ondrej/php >/dev/null 2>&1 || update_ppa ondrej/php
+      (check_package "$package" && install_packages "$package") || add_http_helper "$(get_http_version)" "$os"
     else
       if ! [[ "${version:?}" =~ ${old_versions:?} ]]; then
         add_brew_extension pecl_http extension

package/src/scripts/{ext → extensions}/ioncube.ps1

@@ -1,8 +1,8 @@
 # Function to log result of a operation.
 Function Add-LicenseLog() {
-  printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "ioncube" "Click to read the ioncube loader license information"
+  printf "$env:GROUP\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "ioncube" "Click to read the ioncube loader license information"
   Get-Content $ext_dir\ioncube\LICENSE.txt
-  Write-Output "::endgroup::"
+  Write-Output "$env:END_GROUP"
 }
 
 # Function to add ioncube extension.

package/src/scripts/{ext → extensions}/ioncube.sh

@@ -1,8 +1,8 @@
 # Function to log result of a operation.
 add_license_log() {
-  printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "ioncube" "Click to read the ioncube loader license information"
+  printf "$GROUP\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "ioncube" "Click to read the ioncube loader license information"
   cat "${ext_dir:?}"/IONCUBE_LICENSE.txt
-  echo "::endgroup::"
+  echo "$END_GROUP"
 }
 
 # Function to install ioncube.

package/src/scripts/{ext → extensions}/oci.ps1

@@ -1,10 +1,10 @@
 # Function to log license information.
 Function Add-LicenseLog() {
-    printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" $extension "Click to read the $extension related license information"
+    printf "$env:GROUP\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" $extension "Click to read the $extension related license information"
     printf "Oracle Instant Client package is required for %s extension.\n" $extension
     printf "It is provided under the Oracle Technology Network Development and Distribution License.\n"
     printf "Refer to: \033[35;1m%s \033[0m\n" "https://www.oracle.com/downloads/licenses/instant-client-lic.html"
-    Write-Output "::endgroup::"
+    Write-Output "$env:END_GROUP"
 }
 
 # Function to get instantclinet.
@@ -20,6 +20,36 @@ Function Add-InstantClient() {
   }
 }
 
+# Function to oci8 extension URL.
+Function Get-Oci8Url() {
+  if($version -lt '8.0') {
+    $ociVersion = '2.2.0'
+    if ($version -eq '7.0') {
+      $ociVersion = '2.1.8'
+    } elseif ($version -lt '7.0') {
+      $ociVersion = '2.0.12'
+    }
+    return Get-PeclArchiveUrl oci8 $ociVersion $installed
+  } else {
+    $ociUrl = '';
+    Get-PeclPackageVersion oci8 -MinimumStability stable -MaximumStability stable | ForEach-Object {
+      $ociUrl = Get-PeclArchiveUrl oci8 $_ $installed
+      if($ociUrl) {
+        return $ociUrl
+      }
+    }
+  }
+}
+
+# Function to get OCI8 DLL.
+Function Get-Oci8DLL() {
+  Get-ChildItem $ext_dir\php_oci8*.dll | ForEach-Object {
+    if((Get-PhpExtension -Path $_).PhpVersion -eq $version) {
+      return $_
+    }
+  }
+}
+
 # Function to install oci8 and pdo_oci.
 Function Add-Oci() {
   Param (
@@ -36,19 +66,14 @@ Function Add-Oci() {
       Enable-PhpExtension pdo_oci -Path $php_dir
     } else {
       if(-not(Test-Path $ext_dir\php_oci8.dll)) {
-        $status = 'Installed and enabled'
-        $ociVersion = Get-PeclPackageVersion oci8 -MinimumStability stable -MaximumStability stable | Select-Object -First 1
-        if ($version -eq '7.0') {
-          $ociVersion = '2.1.8'
-        } elseif ($version -lt '7.0') {
-          $ociVersion = '2.0.12'
-        } elseif ($version -lt '8.0') {
-          $ociVersion = '2.2.0'
+        $oci8DLL = Get-Oci8DLL
+        if($oci8DLL) {
+          Copy-Item -Path $oci8DLL -Destination $ext_dir\php_oci8.dll
+        } else {
+          $status = 'Installed and enabled'
+          Invoke-WebRequest -Uri (Get-Oci8Url) -OutFile $php_dir\oci8.zip
+          Expand-Archive -Path $php_dir\oci8.zip -DestinationPath $ext_dir -Force
         }
-        $ociUrl = Get-PeclArchiveUrl oci8 $ociVersion $installed
-        Invoke-WebRequest -Uri $ociUrl -OutFile $php_dir\oci8.zip
-        Expand-Archive -Path $php_dir\oci8.zip -DestinationPath $ext_dir -Force
-
       }
       Add-Content -Value "`r`nextension=php_oci8.dll" -Path $php_dir\php.ini
     }