setup-php 2.12.0 → 2.16.0

package/src/scripts/ext/patches/firebird.sh

@@ -1,11 +1,11 @@
-patch_firebird() {
-  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
-  lib_arch=$(gcc -dumpmachine)
-  lib_dir=/usr/lib/"$lib_arch"
-  if [ -d "$lib_dir" ]; then
-    sudo ln -sf "$lib_dir"/libfbclient.so.2 /usr/lib/libfbclient.so
-    sudo ln -sf "$lib_dir"/libib_util.so /usr/lib/
-  fi
-}
+patch_firebird() {
+  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
+  lib_arch=$(gcc -dumpmachine)
+  lib_dir=/usr/lib/"$lib_arch"
+  if [ -d "$lib_dir" ]; then
+    sudo ln -sf "$lib_dir"/libfbclient.so.2 /usr/lib/libfbclient.so
+    sudo ln -sf "$lib_dir"/libib_util.so /usr/lib/
+  fi
+}

package/src/scripts/ext/patches/geos.sh

@@ -1,7 +1,7 @@
-patch_geos() {
-  if [ "$(php -r "echo PHP_VERSION_ID;")" -ge 70000 ]; then
-    sed -i~ -e "s/, ce->name/, ZSTR_VAL(ce->name)/; s/ulong /zend_ulong /" geos.c
-  fi
-  get -q -n /tmp/php8.patch https://git.remirepo.net/cgit/rpms/php/php-geos.git/plain/0003-add-all-arginfo-and-fix-build-with-PHP-8.patch
-  patch -p1 < /tmp/php8.patch 2>/dev/null || true
-}
+patch_geos() {
+  if [ "$(php -r "echo PHP_VERSION_ID;")" -ge 70000 ]; then
+    sed -i~ -e "s/, ce->name/, ZSTR_VAL(ce->name)/; s/ulong /zend_ulong /" geos.c
+  fi
+  get -q -n /tmp/php8.patch https://git.remirepo.net/cgit/rpms/php/php-geos.git/plain/0003-add-all-arginfo-and-fix-build-with-PHP-8.patch
+  patch -p1 < /tmp/php8.patch 2>/dev/null || true
+}

package/src/scripts/ext/patches/http.sh

@@ -1,11 +1,11 @@
-patch_pecl_http() {
-  if [ "$(uname -s)" = 'Darwin' ] && ! [[ ${version:?} =~ ${old_versions:?} ]]; then
-    if [[ ${version:?} =~ 5.6|7.[0-4] ]]; then
-      sed -i '' -e "s|ext/propro|$(brew --prefix propro@"${version:?}")/include/php/ext/propro@${version:?}|" "./src/php_http_api.h"
-    fi
-    sed -i '' -e "s|ext/raphf|$(brew --prefix raphf@"${version:?}")/include/php/ext/raphf@${version:?}|" "./src/php_http_api.h"
-    if [ "${version:?}" = "5.6" ]; then
-      sed -i '' -e "s|\$abs_srcdir|\$abs_srcdir ${brew_prefix:?}/include|" -e "s|/ext/propro|/php/ext/propro@5.6|" -e "s|/ext/raphf|/php/ext/raphf@5.6|" "./config9.m4"
-    fi
-  fi
-}
+patch_pecl_http() {
+  if [ "$(uname -s)" = 'Darwin' ] && ! [[ ${version:?} =~ ${old_versions:?} ]]; then
+    if [[ ${version:?} =~ 5.6|7.[0-4] ]]; then
+      sed -i '' -e "s|ext/propro|$(brew --prefix propro@"${version:?}")/include/php/ext/propro@${version:?}|" "./src/php_http_api.h"
+    fi
+    sed -i '' -e "s|ext/raphf|$(brew --prefix raphf@"${version:?}")/include/php/ext/raphf@${version:?}|" "./src/php_http_api.h"
+    if [ "${version:?}" = "5.6" ]; then
+      sed -i '' -e "s|\$abs_srcdir|\$abs_srcdir ${brew_prefix:?}/include|" -e "s|/ext/propro|/php/ext/propro@5.6|" -e "s|/ext/raphf|/php/ext/raphf@5.6|" "./config9.m4"
+    fi
+  fi
+}

package/src/scripts/ext/patches/pdo_oci.sh

@@ -1,6 +1,6 @@
-patch_pdo_oci() {
-  get -q -n config.m4 https://raw.githubusercontent.com/php/php-src/PHP-8.0/ext/pdo_oci/config.m4
-  if [[ ${version:?} =~ 5.[3-6] ]]; 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
-}
+patch_pdo_oci() {
+  get -q -n config.m4 https://raw.githubusercontent.com/php/php-src/PHP-8.0/ext/pdo_oci/config.m4
+  if [[ ${version:?} =~ 5.[3-6] ]]; 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
+}

package/src/scripts/ext/patches/phpize.sh

@@ -1,26 +1,26 @@
-# Function to get phpize location on darwin.
-get_phpize() {
-  if [[ "${version:?}" =~ 5.[3-5] ]]; then
-    echo '/opt/local/bin/phpize'
-  else
-    echo "/usr/local/bin/$(readlink /usr/local/bin/phpize)"
-  fi
-}
-
-# Function to patch phpize to link to php headers on darwin.
-patch_phpize() {
-  if [ "$(uname -s)" = "Darwin" ]; then
-    sudo cp "$phpize_orig" "$phpize_orig.bck"
-    sudo sed -i '' 's~includedir=.*~includedir="$(xcrun --show-sdk-path)/usr/include/php"~g' "$phpize_orig"
-  fi
-}
-
-# Function to restore phpize.
-restore_phpize() {
-  if [ "$os" = "Darwin" ]; then
-    sudo mv "$phpize_orig.bck" "$phpize_orig" || true
-  fi
-}
-
-os="$(uname -s)"
-phpize_orig="$(get_phpize)"
+# Function to get phpize location on darwin.
+get_phpize() {
+  if [[ "${version:?}" =~ 5.[3-5] ]]; then
+    echo '/opt/local/bin/phpize'
+  else
+    echo "/usr/local/bin/$(readlink /usr/local/bin/phpize)"
+  fi
+}
+
+# Function to patch phpize to link to php headers on darwin.
+patch_phpize() {
+  if [ "$(uname -s)" = "Darwin" ]; then
+    sudo cp "$phpize_orig" "$phpize_orig.bck"
+    sudo sed -i '' 's~includedir=.*~includedir="$(xcrun --show-sdk-path)/usr/include/php"~g' "$phpize_orig"
+  fi
+}
+
+# Function to restore phpize.
+restore_phpize() {
+  if [ "$os" = "Darwin" ]; then
+    sudo mv "$phpize_orig.bck" "$phpize_orig" || true
+  fi
+}
+
+os="$(uname -s)"
+phpize_orig="$(get_phpize)"

package/src/scripts/ext/patches/protobuf.sh

@@ -1,4 +1,4 @@
-patch_protobuf() {
-  mkdir -p third_party/wyhash
-  cp ../../../../third_party/wyhash/* third_party/wyhash
-}
+patch_protobuf() {
+  mkdir -p third_party/wyhash
+  cp ../../../../third_party/wyhash/* third_party/wyhash
+}

package/src/scripts/ext/phalcon.ps1

@@ -1,55 +1,54 @@
-# Function to install phalcon
-Function Add-PhalconHelper() {
-  if ($extension_version -eq '4') {
-    Install-Phpextension phalcon -MinimumStability stable -Path $php_dir
-  } else {
-    $domain = 'https://github.com'
-    $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" }
-    $match = Invoke-WebRequest -Uri "$domain/phalcon/cphalcon/releases/v3.4.5" | Select-String -Pattern "href=`"(.*phalcon_x64_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)`""
-    $zip_file = $match.Matches[0].Groups[1].Value
-    Invoke-WebRequest -Uri $domain/$zip_file -OutFile $ENV:RUNNER_TOOL_CACHE\phalcon.zip > $null 2>&1
-    Expand-Archive -Path $ENV:RUNNER_TOOL_CACHE\phalcon.zip -DestinationPath $ENV:RUNNER_TOOL_CACHE\phalcon -Force > $null 2>&1
-    Copy-Item -Path "$ENV:RUNNER_TOOL_CACHE\phalcon\php_phalcon.dll" -Destination "$ext_dir\php_phalcon.dll"
-    Enable-PhpExtension -Extension phalcon -Path $php_dir
-  }
-}
-
-Function Add-Phalcon() {
-  Param (
-    [Parameter(Position = 0, Mandatory = $true)]
-    [ValidateNotNull()]
-    [ValidateSet('phalcon3', 'phalcon4')]
-    [string]
-    $extension
-  )
-  try {
-    $status = 'Enabled'
-    $extension_version = $extension.substring($extension.Length - 1)
-
-    if($extension_version -eq '4') {
-      if (Test-Path $ext_dir\php_psr.dll) {
-        Enable-PhpExtension -Extension psr -Path $php_dir
-      } else {
-        Install-Phpextension psr -MinimumStability stable -Path $php_dir
-      }
-    }
-
-    if(Test-Path $ext_dir\php_phalcon.dll) {
-      $phalcon = Get-PhpExtension $ext_dir\php_phalcon.dll
-      if($phalcon.Version[0] -eq $extension_version) {
-        Enable-PhpExtension -Extension phalcon -Path $php_dir
-      } else {
-        $status = 'Installed and enabled'
-        Remove-Item $ext_dir\php_phalcon.dll
-        Add-PhalconHelper
-      }
-    } else {
-      $status = 'Installed and enabled'
-      Add-PhalconHelper
-    }
-    Add-Log $tick $extension $status
-  } catch [Exception] {
-    Write-Output $_.Exception|format-list -force
-    Add-Log $cross $extension "Could not install $extension on PHP $($installed.FullVersion)"
-  }
-}
+# Function to install phalcon
+Function Add-PhalconHelper() {
+  if ($extension_version -eq '4') {
+    Install-Phpextension -Extension phalcon -MinimumStability stable -Path $php_dir
+  } else {
+    $domain = 'https://github.com'
+    $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" }
+    $match = Invoke-WebRequest -Uri "$domain/phalcon/cphalcon/releases/v3.4.5" | Select-String -Pattern "href=`"(.*phalcon_x64_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)`""
+    $zip_file = $match.Matches[0].Groups[1].Value
+    Invoke-WebRequest -Uri $domain/$zip_file -OutFile $ENV:RUNNER_TOOL_CACHE\phalcon.zip > $null 2>&1
+    Expand-Archive -Path $ENV:RUNNER_TOOL_CACHE\phalcon.zip -DestinationPath $ENV:RUNNER_TOOL_CACHE\phalcon -Force > $null 2>&1
+    Copy-Item -Path "$ENV:RUNNER_TOOL_CACHE\phalcon\php_phalcon.dll" -Destination "$ext_dir\php_phalcon.dll"
+    Enable-PhpExtension -Extension phalcon -Path $php_dir
+  }
+}
+
+Function Add-Phalcon() {
+  Param (
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    [ValidateSet('phalcon3', 'phalcon4')]
+    [string]
+    $extension
+  )
+  try {
+    $status = 'Enabled'
+    $extension_version = $extension.substring($extension.Length - 1)
+
+    if($extension_version -eq '4') {
+      if (Test-Path $ext_dir\php_psr.dll) {
+        Enable-PhpExtension -Extension psr -Path $php_dir
+      } else {
+        Install-Phpextension -Extension psr -MinimumStability stable -Path $php_dir
+      }
+    }
+
+    if(Test-Path $ext_dir\php_phalcon.dll) {
+      $phalcon = Get-PhpExtension $ext_dir\php_phalcon.dll
+      if($phalcon.Version[0] -eq $extension_version) {
+        Enable-PhpExtension -Extension phalcon -Path $php_dir
+      } else {
+        $status = 'Installed and enabled'
+        Remove-Item $ext_dir\php_phalcon.dll
+        Add-PhalconHelper
+      }
+    } else {
+      $status = 'Installed and enabled'
+      Add-PhalconHelper
+    }
+    Add-Log $tick $extension $status
+  } catch [Exception] {
+    Add-Log $cross $extension "Could not install $extension on PHP $($installed.FullVersion)"
+  }
+}

package/src/scripts/ext/phalcon.sh

@@ -1,59 +1,59 @@
-# Helper function to add phalcon.
-add_phalcon_helper() {
-  status='Installed and enabled'
-  update_lists
-  if [ "$extension" = "phalcon4" ]; then
-    ${apt_install:?} "php${version:?}-psr" "php${version:?}-$extension"
-  else
-    ${apt_install:?} "php${version:?}-$extension"
-  fi
-}
-
-# Function to add phalcon3.
-add_phalcon3() {
-  if [ -e "${ext_dir:?}/phalcon.so" ]; then
-    phalcon_version=$(php -d="extension=phalcon.so" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
-    if [ "$phalcon_version" != "$extension_major_version" ]; then
-      add_phalcon_helper
-    else
-      echo "extension=phalcon.so" | sudo tee -a "$phalcon_ini_file"
-    fi
-  else
-    add_phalcon_helper
-  fi
-}
-
-# Function to add phalcon4.
-add_phalcon4() {
-  if [ -e "${ext_dir:?}/psr.so" ] && ! php -m | grep -i -q -w psr; then
-    echo "extension=psr.so" | sudo tee -a "${ini_file:?}"
-  fi
-  if [ -e "$ext_dir/phalcon.so" ]; then
-    if php -m | grep -i -q -w psr; then
-      phalcon_version=$(php -d="extension=phalcon" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
-      if [ "$phalcon_version" != "$extension_major_version" ]; then
-        add_phalcon_helper
-      else
-        echo "extension=phalcon.so" | sudo tee -a "$phalcon_ini_file"
-      fi
-    else
-      add_phalcon_helper
-    fi
-  else
-    add_phalcon_helper
-  fi
-}
-
-# Function to add phalcon.
-add_phalcon() {
-  extension=$1
-  status='Enabled'
-  phalcon_ini_file="${pecl_file:-${ini_file[@]}}"
-  extension_major_version=${extension: -1}
-  if [ "$extension_major_version" = "4" ]; then
-    add_phalcon4 >/dev/null 2>&1
-  elif [ "$extension_major_version" = "3" ]; then
-    add_phalcon3 >/dev/null 2>&1
-  fi
-  add_extension_log "phalcon" "$status"
-}
+# Helper function to add phalcon.
+add_phalcon_helper() {
+  status='Installed and enabled'
+  if [ "$(uname -s)" = "Darwin" ]; then
+    add_brew_extension "$extension" extension
+  else
+    if [ "$extension" = "phalcon4" ]; then
+      install_packages "php${version:?}-psr" "php${version:?}-$extension"
+    else
+      install_packages "php${version:?}-$extension"
+    fi
+  fi
+}
+
+# Function to add phalcon3.
+add_phalcon3() {
+  if shared_extension phalcon; then
+    phalcon_version=$(php -d="extension=phalcon.so" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
+    if [ "$phalcon_version" != "$extension_major_version" ]; then
+      add_phalcon_helper
+    else
+      enable_extension phalcon extension
+    fi
+  else
+    add_phalcon_helper
+  fi
+}
+
+# Function to add phalcon4.
+add_phalcon4() {
+  enable_extension psr extension
+  if shared_extension phalcon; then
+    if check_extension psr; then
+      phalcon_version=$(php -d="extension=phalcon" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
+      if [ "$phalcon_version" != "$extension_major_version" ]; then
+        add_phalcon_helper
+      else
+        enable_extension phalcon extension
+      fi
+    else
+      add_phalcon_helper
+    fi
+  else
+    add_phalcon_helper
+  fi
+}
+
+# Function to add phalcon.
+add_phalcon() {
+  extension=$1
+  status='Enabled'
+  extension_major_version=${extension: -1}
+  if [ "$extension_major_version" = "4" ]; then
+    add_phalcon4 >/dev/null 2>&1
+  elif [ "$extension_major_version" = "3" ]; then
+    add_phalcon3 >/dev/null 2>&1
+  fi
+  add_extension_log "phalcon" "$status"
+}