From 3c6827c2c33cb70c4941941ce4cc3e0c113c40e5 Mon Sep 17 00:00:00 2001
From: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Wed, 14 Apr 2021 14:07:15 +0530
Subject: [PATCH] Use shivammathur/extensions for phalcon and psr

---
 __tests__/extensions.test.ts | 11 ++++-------
 dist/index.js                |  4 ++--
 src/extensions.ts            |  4 ++--
 src/scripts/ext/phalcon.sh   | 17 ++++-------------
 4 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/__tests__/extensions.test.ts b/__tests__/extensions.test.ts
index 63b530b3..3fefb877 100644
--- a/__tests__/extensions.test.ts
+++ b/__tests__/extensions.test.ts
@@ -160,7 +160,7 @@ describe('Extension tests', () => {
 
   it('checking addExtensionOnDarwin', async () => {
     let darwin: string = await extensions.addExtension(
-      'amqp, apcu, Xdebug, pcov, grpc, igbinary, imagick, imap, msgpack, protobuf, redis, swoole, sqlite, oci8, pdo_oci, :intl, ast-beta, grpc-1.2.3',
+      'amqp, apcu, Xdebug, pcov, grpc, igbinary, imagick, imap, msgpack, phalcon3, phalcon4, protobuf, psr, redis, swoole, sqlite, oci8, pdo_oci, :intl, ast-beta, grpc-1.2.3',
       '7.2',
       'darwin'
     );
@@ -173,7 +173,10 @@ describe('Extension tests', () => {
     expect(darwin).toContain('add_brew_extension imagick extension');
     expect(darwin).toContain('add_brew_extension imap extension');
     expect(darwin).toContain('add_brew_extension msgpack extension');
+    expect(darwin).toContain('add_brew_extension phalcon3 extension');
+    expect(darwin).toContain('add_brew_extension phalcon4 extension');
     expect(darwin).toContain('add_brew_extension protobuf extension');
+    expect(darwin).toContain('add_brew_extension psr extension');
     expect(darwin).toContain('add_brew_extension redis extension');
     expect(darwin).toContain('add_brew_extension swoole extension');
     expect(darwin).toContain('add_extension sqlite3');
@@ -181,12 +184,6 @@ describe('Extension tests', () => {
     expect(darwin).toContain('add_unstable_extension ast beta extension');
     expect(darwin).toContain('add_pecl_extension grpc 1.2.3 extension');
 
-    darwin = await extensions.addExtension('phalcon3', '7.0', 'darwin');
-    expect(darwin).toContain('add_phalcon phalcon3');
-
-    darwin = await extensions.addExtension('phalcon4', '7.3', 'darwin');
-    expect(darwin).toContain('add_phalcon phalcon4');
-
     darwin = await extensions.addExtension('couchbase', '5.6', 'darwin');
     expect(darwin).toContain('add_couchbase');
 
diff --git a/dist/index.js b/dist/index.js
index 45c1630b..ea9454c9 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -1822,7 +1822,6 @@ async function addExtensionDarwin(extension_csv, version) {
             case /^(5\.[3-6]|7\.[0-4]|8\.0)blackfire(-\d+\.\d+\.\d+)?$/.test(version_extension):
             case /^couchbase$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(extension):
             case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
-            case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
                 add_script += await utils.customPackage(ext_name, 'ext', extension, 'darwin');
                 return;
             // match pre-release versions. For example - xdebug-beta
@@ -1840,9 +1839,10 @@ async function addExtensionDarwin(extension_csv, version) {
             // match 5.6 and newer - amqp, apcu, grpc, igbinary, imagick, imap, msgpack, protobuf, raphf, redis, swoole, xdebug, xdebug2, zmq
             // match 7.1 and newer - pcov
             // match 5.6 to 7.4 - propro
-            case /(?<!5\.[3-5])(amqp|apcu|grpc|igbinary|imagick|imap|msgpack|protobuf|raphf|redis|swoole|xdebug|xdebug2|zmq)/.test(version_extension):
+            case /(?<!5\.[3-5])(amqp|apcu|grpc|igbinary|imagick|imap|msgpack|protobuf|psr|raphf|redis|swoole|xdebug|xdebug2|zmq)/.test(version_extension):
             case /(5\.6|7\.[0-4])propro/.test(version_extension):
             case /(?<!5\.[3-6]|7\.0)pcov/.test(version_extension):
+            case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4/.test(version_extension):
                 add_script += await utils.joins('\nadd_brew_extension', ext_name, ext_prefix);
                 return;
             // match sqlite
diff --git a/src/extensions.ts b/src/extensions.ts
index 4ad24c42..d0d698b4 100644
--- a/src/extensions.ts
+++ b/src/extensions.ts
@@ -39,7 +39,6 @@ export async function addExtensionDarwin(
         extension
       ):
       case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
-      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
         add_script += await utils.customPackage(
           ext_name,
           'ext',
@@ -72,11 +71,12 @@ export async function addExtensionDarwin(
       // match 5.6 and newer - amqp, apcu, grpc, igbinary, imagick, imap, msgpack, protobuf, raphf, redis, swoole, xdebug, xdebug2, zmq
       // match 7.1 and newer - pcov
       // match 5.6 to 7.4 - propro
-      case /(?<!5\.[3-5])(amqp|apcu|grpc|igbinary|imagick|imap|msgpack|protobuf|raphf|redis|swoole|xdebug|xdebug2|zmq)/.test(
+      case /(?<!5\.[3-5])(amqp|apcu|grpc|igbinary|imagick|imap|msgpack|protobuf|psr|raphf|redis|swoole|xdebug|xdebug2|zmq)/.test(
         version_extension
       ):
       case /(5\.6|7\.[0-4])propro/.test(version_extension):
       case /(?<!5\.[3-6]|7\.0)pcov/.test(version_extension):
+      case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4/.test(version_extension):
         add_script += await utils.joins(
           '\nadd_brew_extension',
           ext_name,
diff --git a/src/scripts/ext/phalcon.sh b/src/scripts/ext/phalcon.sh
index c6c932b8..48de1c16 100644
--- a/src/scripts/ext/phalcon.sh
+++ b/src/scripts/ext/phalcon.sh
@@ -1,19 +1,11 @@
 # Helper function to add phalcon.
 add_phalcon_helper() {
   status='Installed and enabled'
-  if [ "$os_name" = "Linux" ]; then
-    update_lists
-    if [ "$extension" = "phalcon4" ]; then
-      ${apt_install:?} "php${version:?}-psr" "php${version:?}-$extension"
-    else
-      ${apt_install:?} "php${version:?}-$extension"
-    fi
+  update_lists
+  if [ "$extension" = "phalcon4" ]; then
+    ${apt_install:?} "php${version:?}-psr" "php${version:?}-$extension"
   else
-    sed -i '' '/extension.*psr/d' "${ini_file:?}"
-    add_brew_tap shivammathur/homebrew-phalcon
-    brew install phalcon@"${version:?}"_"$extension_major_version"
-    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:?}"
+    ${apt_install:?} "php${version:?}-$extension"
   fi
 }
 
@@ -56,7 +48,6 @@ add_phalcon4() {
 add_phalcon() {
   extension=$1
   status='Enabled'
-  os_name=$(uname -s)
   phalcon_ini_file="${pecl_file:-${ini_file[@]}}"
   extension_major_version=${extension: -1}
   if [ "$extension_major_version" = "4" ]; then