Skip to content

Commit

Permalink
Fix oci extension support on Windows for PHP 8.4 and above
Browse files Browse the repository at this point in the history
  • Loading branch information
shivammathur committed Dec 27, 2024
1 parent 96fb539 commit 5bb2eed
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
4 changes: 4 additions & 0 deletions src/scripts/extensions/add_extensions.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@ Function Add-Extension {
{
$params["Version"] = $extension_version
}
# If extension for a different version exists
if(Test-Path $ext_dir\php_$extension.dll) {
Move-Item $ext_dir\php_$extension.dll $ext_dir\php_$extension.bak.dll -Force
}
Install-PhpExtension @params
Set-ExtensionPrerequisites $extension
}
Expand Down
24 changes: 10 additions & 14 deletions src/scripts/extensions/oci.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ Function Get-Oci8DLL() {
return $_
}
}
return $null
}

# Function to install oci8 and pdo_oci.
Expand All @@ -62,22 +63,17 @@ Function Add-Oci() {
try {
$status = 'Enabled'
Add-InstantClient
if ($extension -eq "pdo_oci") {
Enable-PhpExtension pdo_oci -Path $php_dir
} else {
if(-not(Test-Path $ext_dir\php_oci8.dll)) {
$oci8DLL = Get-Oci8DLL
if($oci8DLL) {
Copy-Item -Path $oci8DLL -Destination $ext_dir\php_oci8.dll
} else {
$status = 'Installed and enabled'
Get-File -Url (Get-Oci8Url) -OutFile $php_dir\oci8.zip
Expand-Archive -Path $php_dir\oci8.zip -DestinationPath $ext_dir -Force
}
if($version -lt '8.4') {
if($version -lt '5.6' -and $extension -eq 'oci8') {
Add-Content -Value "`r`nextension=php_oci8.dll" -Path $php_dir\php.ini
} else {
Enable-PhpExtension $extension -Path $php_dir
}
Add-Content -Value "`r`nextension=php_oci8.dll" -Path $php_dir\php.ini
} else {
$status = 'Installed and enabled'
Add-Extension $extension >$null 2>&1
}
Add-Log $tick $extension $status
Add-ExtensionLog $extension $status
Add-LicenseLog
} catch {
Add-Log $cross $extension "Could not install $extension on PHP $( $installed.FullVersion )"
Expand Down

0 comments on commit 5bb2eed

Please sign in to comment.