Add support for coverage: xdebug2

src/coverage.ts

@@ -140,8 +140,11 @@ export async function addCoverage(
     case 'xdebug':
     case 'xdebug3':
       return (
-        script +
-        (await addCoverageXdebug(coverage_driver, version, os_version, pipe))
+        script + (await addCoverageXdebug('xdebug', version, os_version, pipe))
+      );
+    case 'xdebug2':
+      return (
+        script + (await addCoverageXdebug('xdebug2', version, os_version, pipe))
       );
     case 'none':
       return script + (await disableCoverage(version, os_version, pipe));

src/extensions.ts

@@ -163,10 +163,11 @@ export async function addExtensionWindows(
           matches[1]
         );
         break;
-      // match 5.3pcov to 7.0pcov
-      case /7\.2xdebug/.test(version_extension):
+      // match 7.2xdebug2 to 7.4xdebug2
+      case /7\.[2-4]xdebug2/.test(version_extension):
         add_script += '\nAdd-Extension xdebug stable 2.9.8';
         break;
+      // match 5.3pcov to 7.0pcov
       case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
         add_script += await utils.getUnsupportedLog('pcov', version, 'win32');
         break;
@@ -267,24 +268,15 @@ export async function addExtensionLinux(
       case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
         add_script += await utils.getUnsupportedLog('pcov', version, 'linux');
         return;
-      // match 7.2xdebug3..7.4xdebug3
-      case /^7\.[2-4]xdebug3$/.test(version_extension):
-        add_script +=
-          '\nadd_extension_from_source xdebug xdebug/xdebug master --enable-xdebug zend_extension';
-        return;
-      // match 7.2xdebug
-      case /^7\.2xdebug$/.test(version_extension):
+      // match 7.2xdebug2...7.4xdebug2
+      case /^7\.[2-4]xdebug2$/.test(version_extension):
         add_script += await utils.joins(
           '\nadd_pecl_extension',
-          ext_name,
+          'xdebug',
           '2.9.8',
           ext_prefix
         );
-        break;
-      // match 8.0xdebug3...8.9xdebug3
-      case /^8\.[0-9]xdebug3$/.test(version_extension):
-        extension = 'xdebug';
-        break;
+        return;
       // match pdo extensions
       case /.*pdo[_-].*/.test(version_extension):
         extension = extension.replace(/pdo[_-]|3/, '');

src/scripts/darwin.sh

@@ -68,8 +68,9 @@ add_brew_tap() {
 
 # Function to install a php extension from shivammathur/extensions tap.
 add_brew_extension() {
-  extension=$1
+  formula=$1
   prefix=$2
+  extension=${formula//[0-9]/}
   enable_extension "$extension" "$prefix"
   if check_extension "$extension"; then
     add_log "${tick:?}" "$extension" "Enabled"
@@ -77,8 +78,8 @@ add_brew_extension() {
     add_brew_tap shivammathur/homebrew-php
     add_brew_tap shivammathur/homebrew-extensions
     sudo mv "$tap_dir"/shivammathur/homebrew-extensions/.github/deps/"$extension"/* "$tap_dir/homebrew/homebrew-core/Formula/" 2>/dev/null || true
-    brew install "$extension@$version" >/dev/null 2>&1
-    sudo cp "$brew_prefix/opt/$extension@$version/$extension.so" "$ext_dir"
+    brew install "$formula@$version" >/dev/null 2>&1
+    sudo cp "$brew_prefix/opt/$formula@$version/$extension.so" "$ext_dir"
     add_extension_log "$extension" "Installed and enabled"
   fi
 }

src/utils.ts

@@ -262,18 +262,11 @@ export async function CSVArray(values_csv: string): Promise<Array<string>> {
  * @param extension
  */
 export async function getExtensionPrefix(extension: string): Promise<string> {
-  const zend: Array<string> = [
-    'xdebug',
-    'xdebug3',
-    'opcache',
-    'ioncube',
-    'eaccelerator'
-  ];
-  switch (zend.indexOf(extension)) {
+  switch (true) {
     default:
-      return 'zend_extension';
-    case -1:
       return 'extension';
+    case /xdebug([2-3])?$|opcache|ioncube|eaccelerator/.test(extension):
+      return 'zend_extension';
   }
 }