From d01ec214f2285ea34de65ccd76a29bceb6a50d2d Mon Sep 17 00:00:00 2001
From: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Sat, 27 Jun 2020 09:28:20 +0530
Subject: [PATCH] Use shivammathur/extensions tap for grpc, swoole, protobuf on
 macos

---
 __tests__/extensions.test.ts |  5 ++++-
 dist/index.js                | 12 ++++++------
 src/extensions.ts            | 12 ++++++------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/__tests__/extensions.test.ts b/__tests__/extensions.test.ts
index 0931f65d..aa013bab 100644
--- a/__tests__/extensions.test.ts
+++ b/__tests__/extensions.test.ts
@@ -114,12 +114,15 @@ describe('Extension tests', () => {
 
   it('checking addExtensionOnDarwin', async () => {
     let darwin: string = await extensions.addExtension(
-      'Xdebug, pcov, sqlite, :intl, ast-beta, grpc-1.2.3',
+      'Xdebug, pcov, grpc, protobuf, swoole, sqlite, :intl, ast-beta, grpc-1.2.3',
       '7.2',
       'darwin'
     );
     expect(darwin).toContain('add_brew_extension xdebug');
     expect(darwin).toContain('add_brew_extension pcov');
+    expect(darwin).toContain('add_brew_extension grpc');
+    expect(darwin).toContain('add_brew_extension protobuf');
+    expect(darwin).toContain('add_brew_extension swoole');
     expect(darwin).toContain('sudo pecl install -f sqlite3');
     expect(darwin).toContain('remove_extension intl');
     expect(darwin).toContain('add_unstable_extension ast beta extension');
diff --git a/dist/index.js b/dist/index.js
index 99011146..af94c6af 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -2776,13 +2776,13 @@ async function addExtensionDarwin(extension_csv, version, pipe) {
                 command =
                     command_prefix + 'xdebug-' + (await getXdebugVersion(version));
                 break;
-            // 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.1pcov...7.4pcov, 8.0pcov
+            // match 5.6xdebug to 8.0xdebug, 5.6swoole to 8.0swoole
+            // match 5.6grpc to 7.4grpc, 5.6protobuf to 7.4protobuf
+            // match 7.1pcov to 8.0pcov
+            case /(5\.6|7\.[0-4]|8\.[0-9])(xdebug|swoole)/.test(version_extension):
+            case /(5\.6|7\.[0-4])(grpc|protobuf)/.test(version_extension):
             case /(7\.[1-4]|8\.[0-9])pcov/.test(version_extension):
-                command = 'add_brew_extension pcov';
+                command = 'add_brew_extension ' + ext_name;
                 break;
             // match 5.6redis
             case /5\.6redis/.test(version_extension):
diff --git a/src/extensions.ts b/src/extensions.ts
index 7b34bbfd..e7d5828f 100644
--- a/src/extensions.ts
+++ b/src/extensions.ts
@@ -83,13 +83,13 @@ export async function addExtensionDarwin(
         command =
           command_prefix + 'xdebug-' + (await getXdebugVersion(version));
         break;
-      // 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.1pcov...7.4pcov, 8.0pcov
+      // match 5.6xdebug to 8.0xdebug, 5.6swoole to 8.0swoole
+      // match 5.6grpc to 7.4grpc, 5.6protobuf to 7.4protobuf
+      // match 7.1pcov to 8.0pcov
+      case /(5\.6|7\.[0-4]|8\.[0-9])(xdebug|swoole)/.test(version_extension):
+      case /(5\.6|7\.[0-4])(grpc|protobuf)/.test(version_extension):
       case /(7\.[1-4]|8\.[0-9])pcov/.test(version_extension):
-        command = 'add_brew_extension pcov';
+        command = 'add_brew_extension ' + ext_name;
         break;
       // match 5.6redis
       case /5\.6redis/.test(version_extension):