Improve extension support

src/extensions.ts

@@ -1,6 +1,24 @@
 import * as path from 'path';
 import * as utils from './utils';
 
+/**
+ * Function to get Xdebug version compatible with php versions
+ *
+ * @param version
+ */
+export async function getXdebugVersion(version: string): Promise<string> {
+  switch (version) {
+    case '5.3':
+      return '2.2.7';
+    case '5.4':
+      return '2.4.1';
+    case '5.5':
+      return '2.5.5';
+    default:
+      return '2.9.6';
+  }
+}
+
 /**
  * Install and enable extensions for darwin
  *
@@ -32,17 +50,17 @@ export async function addExtensionDarwin(
           ' ' +
           ext_prefix;
         return;
-      // match 5.6xdebug
-      case /5\.6xdebug/.test(version_extension):
-        command = command_prefix + 'xdebug-2.5.5' + pipe;
+      // match 5.6xdebug, 7.0xdebug...7.4xdebug, 8.0xdebug
+      case /(5\.6|7\.[0-4]|8\.[0-9])xdebug/.test(version_extension):
+        command = 'add_brew_extension xdebug';
         break;
-      // match 7.0xdebug
-      case /7\.0xdebug/.test(version_extension):
-        command = command_prefix + 'xdebug-2.9.0' + pipe;
+      // match 7.1pcov...7.4pcov, 8.0pcov
+      case /(7\.[1-4]|8\.[0-9])pcov/.test(version_extension):
+        command = 'add_brew_extension pcov';
         break;
       // match 5.6redis
       case /5\.6redis/.test(version_extension):
-        command = command_prefix + 'redis-2.2.8' + pipe;
+        command = command_prefix + 'redis-2.2.8';
         break;
       // match imagick
       case /^imagick$/.test(extension):
@@ -57,7 +75,7 @@ export async function addExtensionDarwin(
       // match sqlite
       case /^sqlite$/.test(extension):
         extension = 'sqlite3';
-        command = command_prefix + extension + pipe;
+        command = command_prefix + extension;
         break;
       // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
       case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
@@ -70,7 +88,7 @@ export async function addExtensionDarwin(
           version;
         return;
       default:
-        command = command_prefix + extension + pipe;
+        command = command_prefix + extension;
         break;
     }
     script +=

src/scripts/darwin.sh

@@ -68,6 +68,16 @@ add_pecl_extension() {
   fi
 }
 
+# Function to install a php extension from shivammathur/extensions tap.
+add_brew_extension() {
+  extension=$1
+  if ! brew tap | grep shivammathur/extensions; then
+    brew tap --shallow shivammathur/extensions
+  fi
+  brew install "$extension@$version"
+  sudo cp "$(brew --prefix)/opt/$extension@$version/$extension.so" "$ext_dir"
+}
+
 # Function to setup extensions
 add_extension() {
   extension=$1
@@ -169,7 +179,7 @@ setup_php() {
     update_formulae
   fi
   export HOMEBREW_NO_INSTALL_CLEANUP=TRUE
-  brew tap shivammathur/homebrew-php
+  brew tap --shallow shivammathur/homebrew-php
   brew install shivammathur/php/php@"$version"
   brew link --force --overwrite php@"$version"
 }

src/scripts/win32.ps1

@@ -239,7 +239,8 @@ Set-PhpIniKey -Key 'date.timezone' -Value 'UTC' -Path $php_dir
 Enable-PhpExtension -Extension openssl, curl, opcache, mbstring -Path $php_dir
 Update-PhpCAInfo -Path $php_dir -Source CurrentUser
 if ($version -eq 'master') {
-  Copy-Item $dir"\..\src\bin\php_$env:PHPTS`_pcov.dll" -Destination $ext_dir"\php_pcov.dll"
+  Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/shivammathur/php-extensions-windows/releases/latest/download/php_$env:phpts`_$arch`_pcov.dll" -OutFile $ext_dir"\php_pcov.dll" >$null 2>&1
+  Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/shivammathur/php-extensions-windows/releases/latest/download/php_$env:phpts`_$arch`_xdebug.dll" -OutFile $ext_dir"\php_xdebug.dll" >$null 2>&1
   Set-PhpIniKey -Key 'opcache.jit_buffer_size' -Value '256M' -Path $php_dir
   Set-PhpIniKey -Key 'opcache.jit' -Value '1235' -Path $php_dir
 }