Improve support for couchbase, pdo_firdbird, pdo_oci and phalcon3

Downgrade husky to 4.x

src/scripts/common.sh

@@ -262,6 +262,15 @@ php_semver() {
   php"$version" -v | grep -Eo -m 1 "[0-9]+\.[0-9]+\.[0-9]+" | head -n 1
 }
 
+# Function to get the tag for a php version.
+php_src_tag() {
+  php_src_tag='master'
+  if ! [[ ${version:?} =~ $nightly_versions ]]; then
+    php_src_tag="php-$semver"
+  fi
+  echo "$php_src_tag"
+}
+
 # Function to install extension from a GitHub repository
 add_extension_from_github() {
   extension=$1

src/scripts/ext/couchbase.sh

@@ -1,7 +1,7 @@
 # Function to install libraries required by couchbase
 add_couchbase_libs() {
   if [ "$(uname -s)" = "Linux" ]; then
-    if [[ ${version:?} =~ 5.6|7.[0-1] ]]; then
+    if [[ ${version:?} =~ 5.[3-6]|7.[0-1] ]]; then
       trunk="http://packages.couchbase.com/ubuntu"
       list="deb $trunk ${DISTRIB_CODENAME:?} ${DISTRIB_CODENAME:?}/main"
     else
@@ -14,7 +14,7 @@ add_couchbase_libs() {
     sudo apt-get update
     ${apt_install:?} libcouchbase-dev
   else
-    if [[ ${version:?} =~ 5.6|7.[0-1] ]]; then
+    if [[ ${version:?} =~ 5.[3-6]|7.[0-1] ]]; then
       brew install libcouchbase@2
       brew link --overwrite --force libcouchbase@2
     else
@@ -30,9 +30,11 @@ add_couchbase() {
   if check_extension "couchbase"; then
     add_log "${tick:?}" "couchbase" "Enabled"
   else
-    if [[ ${version:?} =~ 5.6|7.[0-1] ]]; then
+    if [[ "${version:?}" =~ ${old_versions:?} ]]; then
+      pecl_install couchbase-2.2.3 >/dev/null 2>&1
+    elif [[ "${version:?}" =~ 5.6|7.[0-1] ]]; then
       pecl_install couchbase-2.6.2 >/dev/null 2>&1
-    elif [[ ${version:?} =~ 7.2 ]]; then
+    elif [[ "${version:?}" =~ 7.2 ]]; then
       pecl_install couchbase-3.0.4 >/dev/null 2>&1
     else
       pecl_install couchbase >/dev/null 2>&1

src/scripts/ext/firebird.ps1

@@ -0,0 +1,20 @@
+Function Add-Choco() {
+  try {
+    if($null -eq (Get-Command -Name choco.exe -ErrorAction SilentlyContinue)) {
+      # Source: https://docs.chocolatey.org/en-us/choco/setup
+      Set-ExecutionPolicy Bypass -Scope Process -Force
+      [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072
+      Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
+    }
+  } catch { }
+}
+
+Function Add-Firebird() {
+  Add-Choco > $null 2>&1
+  choco install firebird -params '/ClientAndDevTools' -y --force > $null 2>&1
+  if((Get-ChildItem $env:ProgramFiles\**\**\fbclient.dll | Measure-Object).Count -eq 1) {
+    Add-Extension pdo_firebird
+  } else {
+    Add-Log $cross pdo_firebird "Could not install pdo_firebird on PHP $( $installed.FullVersion )"
+  }
+}

src/scripts/ext/firebird.sh

@@ -0,0 +1,46 @@
+add_firebird_client_darwin() {
+  pkg_name=$(get -s -n "" https://github.com/FirebirdSQL/firebird/releases/latest | grep -Eo "Firebird-.*.pkg" | head -n 1)
+  get -q -e "/tmp/firebird.pkg" https://github.com/FirebirdSQL/firebird/releases/latest/download/"$pkg_name"
+  sudo installer -pkg /tmp/firebird.pkg -target /
+  sudo mkdir -p /opt/firebird/include /opt/firebird/lib
+  sudo find /Library/Frameworks/Firebird.framework -name '*.h' -exec cp "{}" /opt/firebird/include \;
+  sudo find /Library/Frameworks/Firebird.framework -name '*.dylib' -exec cp "{}" /opt/firebird/lib \;
+}
+
+add_firebird_helper() {
+  firebird_dir=$1
+  tag="$(php_src_tag)"
+  get -s -n "" https://github.com/php/php-src/archive/"$tag".tar.gz | tar -xzf - -C /tmp
+  (
+    cd /tmp/php-src-"$tag"/ext/pdo_firebird || exit
+    if [[ "${version:?}" =~ ${old_versions:?} ]]; then
+      sudo sed -i '' '/PHP_CHECK_PDO_INCLUDES/d' config.m4 2>/dev/null || sudo sed -i '/PHP_CHECK_PDO_INCLUDES/d' config.m4
+    fi
+    sudo phpize
+    sudo ./configure --with-pdo-firebird="$firebird_dir"
+    sudo make -j"$(nproc 2>/dev/null || sysctl -n hw.ncpu)"
+    sudo make install
+    enable_extension pdo_firebird extension
+  )
+}
+
+add_firebird() {
+  enable_extension pdo_firebird
+  if ! check_extension pdo_firebird; then
+    if [ "$(uname -s)" = "Linux" ]; then
+      if [[ "${version:?}" =~ 5.3|${nightly_versions:?} ]]; then
+        lib_arch=$(gcc -dumpmachine)
+        install_packages firebird-dev >/dev/null 2>&1
+        sudo ln -sf /usr/lib/"$lib_arch"/libfbclient.so.2 /usr/lib/libfbclient.so >/dev/null 2>&1
+        sudo ln -sf /usr/lib/"$lib_arch"/libib_util.so /usr/lib/ >/dev/null 2>&1
+        add_firebird_helper /usr >/dev/null 2>&1
+      else
+        add_pdo_extension firebird >/dev/null 2>&1
+      fi
+    else
+      add_firebird_client_darwin >/dev/null 2>&1
+      add_firebird_helper /opt/firebird >/dev/null 2>&1
+    fi
+    add_extension_log pdo_firebird "Installed and enabled"
+  fi
+}

src/scripts/ext/oci.ps1

@@ -37,11 +37,13 @@ Function Add-Oci() {
     } else {
       if(-not(Test-Path $ext_dir\php_oci8.dll)) {
         $status = 'Installed and enabled'
-        $ociVersion = '2.2.0'
+        $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'
         }
         $ociUrl = Get-PeclArchiveUrl oci8 $ociVersion $installed
         Invoke-WebRequest -Uri $ociUrl -OutFile $php_dir\oci8.zip

src/scripts/ext/oci.sh

@@ -7,17 +7,6 @@ add_license_log() {
   echo "::endgroup::"
 }
 
-# Function to get the tag for a php version.
-get_tag() {
-  tag='master'
-  if ! [[ ${version:?} =~ $nightly_versions ]]; then
-    tag="php-$(php -v | head -n 1 | cut -f 2 -d ' ' | cut -f 1 -d '-')"
-  elif [ "${version:?}" = '8.0' ]; then
-    tag="PHP-8.0"
-  fi
-  echo "$tag"
-}
-
 # Function to install instantclient and SDK.
 add_client() {
   sudo mkdir -p -m 777 "$oracle_home"
@@ -49,7 +38,7 @@ get_php() {
 
 # Function to get phpize location on darwin.
 get_phpize() {
-  if [[ "$version" =~ 5.[3-5] ]]; then
+  if [[ "${version:?}" =~ 5.[3-5] ]]; then
     echo '/opt/local/bin/phpize'
   else
     echo "/usr/local/bin/$(readlink /usr/local/bin/phpize)"
@@ -94,14 +83,14 @@ add_oci_helper() {
   if ! [ -e "${ext_dir:?}/$ext.so" ]; then
     status='Installed and enabled'
     phpize_orig=$(get_phpize)
-    tag=$(get_tag)
+    tag=$(php_src_tag)
     get_php
     patch_phpize
     (
       cd "/opt/oracle/php-src-$tag/ext/$ext" || exit 1
       [ "$ext" = "pdo_oci" ] && patch_pdo_oci_config
       sudo phpize && ./configure --with-php-config="$(command -v php-config)" --with-"${ext/_/-}"=instantclient,"$oracle_client"
-      sudo make -j"$(nproc)"
+      sudo make -j"$(nproc 2>/dev/null || sysctl -n hw.ncpu)"
       sudo cp ./modules/* "$ext_dir/"
     )
     restore_phpize
@@ -116,7 +105,6 @@ add_oci() {
   oracle_home='/opt/oracle'
   oracle_client=$oracle_home/instantclient
   os=$(uname -s)
-  nightly_versions='8.[0-1]'
   add_client >/dev/null 2>&1
   add_dependencies >/dev/null 2>&1
   add_oci_helper >/dev/null 2>&1

src/scripts/ext/phalcon.sh

@@ -6,14 +6,15 @@ add_phalcon_helper() {
     if [ "$extension" = "phalcon4" ]; then
       ${apt_install:?} "php${version:?}-psr" "php${version:?}-$extension"
     else
-      ${apt_install:?} "php${version:?}-$extension"
+      get -q -e /tmp/phalcon.deb "https://packagecloud.io/phalcon/stable/packages/ubuntu/bionic/php${version:?}-phalcon_3.4.5-1+php${version:?}_amd64.deb/download.deb"
+      sudo dpkg -i /tmp/phalcon.deb
     fi
   else
     sed -i '' '/extension.*psr/d' "${ini_file:?}"
-    brew tap shivammathur/homebrew-phalcon
+    add_brew_tap shivammathur/homebrew-phalcon
     brew install phalcon@"${version:?}"_"$extension_major_version"
-    sudo cp /usr/local/opt/psr@"${version:?}"/psr.so "${ext_dir:?}"
-    sudo cp /usr/local/opt/phalcon@"${version:?}"_"$extension_major_version"/phalcon.so "${ext_dir:?}"
+    sudo cp "${brew_prefix:?}"/opt/psr@"${version:?}"/psr.so "${ext_dir:?}"
+    sudo cp "${brew_prefix:?}"/opt/phalcon@"${version:?}"_"$extension_major_version"/phalcon.so "${ext_dir:?}"
   fi
 }