From 0d9a1ba5ae14203fcaa289234e84725c92292eda Mon Sep 17 00:00:00 2001
From: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Sat, 16 Jul 2022 00:46:28 +0530
Subject: [PATCH] Add support for phalcon5 on Linux and macOS

Fix get_pecl_version
---
 __tests__/extensions.test.ts             |  2 +-
 dist/index.js                            |  4 +--
 src/configs/brew_extensions              |  1 +
 src/extensions.ts                        | 12 ++++++---
 src/scripts/extensions/add_extensions.sh |  5 ++--
 src/scripts/extensions/phalcon.sh        | 34 ++++++++++++++++++++----
 6 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/__tests__/extensions.test.ts b/__tests__/extensions.test.ts
index eacb91f9..735eb07c 100644
--- a/__tests__/extensions.test.ts
+++ b/__tests__/extensions.test.ts
@@ -117,7 +117,7 @@ describe('Extension tests', () => {
       )
         ? `add_${extension}`
         : `add_brew_extension ${formula} ${prefix}`;
-      return [formula, '7.3', output];
+      return [formula, formula === 'phalcon3' ? '7.3' : '7.4', output];
     });
 
   it.each(data)(
diff --git a/dist/index.js b/dist/index.js
index aeba2ec2..f14ace44 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -247,7 +247,7 @@ async function addExtensionDarwin(extension_csv, version) {
             case /^(5\.[3-6]|7\.[0-4]|8\.[0-1])blackfire(-\d+\.\d+\.\d+)?$/.test(version_extension):
             case /^couchbase|^event|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(extension):
             case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
-            case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4/.test(version_extension):
+            case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4|(7\.4|8\.[0-2])phalcon5/.test(version_extension):
             case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
                 add_script += await utils.customPackage(ext_name, 'extensions', extension, 'darwin');
                 return;
@@ -362,7 +362,7 @@ async function addExtensionLinux(extension_csv, version) {
             case /^couchbase|^event|^gearman$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(extension):
             case /(?<!5\.[3-5])intl-[\d]+\.[\d]+$/.test(version_extension):
             case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
-            case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
+            case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$|^(7\.4|8\.[0-2])phalcon5$/.test(version_extension):
             case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
                 add_script += await utils.customPackage(ext_name, 'extensions', extension, 'linux');
                 return;
diff --git a/src/configs/brew_extensions b/src/configs/brew_extensions
index eaffba4c..a60238b2 100644
--- a/src/configs/brew_extensions
+++ b/src/configs/brew_extensions
@@ -18,6 +18,7 @@ pcov=pcov
 pecl_http=http
 phalcon3=phalcon
 phalcon4=phalcon
+phalcon5=phalcon
 propro=propro
 protobuf=protobuf
 psr=psr
diff --git a/src/extensions.ts b/src/extensions.ts
index 633aca56..a6b2fe46 100644
--- a/src/extensions.ts
+++ b/src/extensions.ts
@@ -35,7 +35,7 @@ export async function addExtensionDarwin(
       // match 5.3blackfire-(semver)...8.1blackfire-(semver)
       // match couchbase, event, geos, pdo_oci, oci8, http, pecl_http
       // match 5.3ioncube...7.4ioncube
-      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
+      // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, and 7.4phalcon5...8.2phalcon5
       case /^(5\.[3-6]|7\.[0-4]|8\.[0-1])blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
@@ -43,7 +43,9 @@ export async function addExtensionDarwin(
         extension
       ):
       case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
-      case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4/.test(version_extension):
+      case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4|(7\.4|8\.[0-2])phalcon5/.test(
+        version_extension
+      ):
       case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
         add_script += await utils.customPackage(
           ext_name,
@@ -255,7 +257,7 @@ export async function addExtensionLinux(
       // match 5.3pdo_cubrid...7.2php_cubrid, 5.3cubrid...7.4cubrid
       // match couchbase, geos, pdo_oci, oci8, http, pecl_http
       // match 5.3ioncube...7.4ioncube
-      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
+      // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, 7.4phalcon5...8.2phalcon5
       case /^(5\.[3-6]|7\.[0-4]|8\.[0-1])blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
@@ -267,7 +269,9 @@ export async function addExtensionLinux(
       ):
       case /(?<!5\.[3-5])intl-[\d]+\.[\d]+$/.test(version_extension):
       case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
-      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
+      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$|^(7\.4|8\.[0-2])phalcon5$/.test(
+        version_extension
+      ):
       case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
         add_script += await utils.customPackage(
           ext_name,
diff --git a/src/scripts/extensions/add_extensions.sh b/src/scripts/extensions/add_extensions.sh
index 587b745e..1507e66f 100644
--- a/src/scripts/extensions/add_extensions.sh
+++ b/src/scripts/extensions/add_extensions.sh
@@ -145,11 +145,12 @@ add_extension() {
 get_pecl_version() {
   local extension=$1
   stability="$(echo "$2" | grep -m 1 -Eio "(stable|alpha|beta|rc|snapshot|preview)")"
+  major_version=${3:-'[0-9]+'}
   pecl_rest='https://pecl.php.net/rest/r/'
   response=$(get -s -n "" "$pecl_rest$extension"/allreleases.xml)
-  pecl_version=$(echo "$response" | grep -m 1 -Eio "([0-9]+\.[0-9]+\.[0-9]+${stability}[0-9]+)")
+  pecl_version=$(echo "$response" | grep -m 1 -Eio "($major_version\.[0-9]+\.[0-9]+${stability}[0-9]+<)" | cut -d '<' -f 1)
   if [ ! "$pecl_version" ]; then
-    pecl_version=$(echo "$response" | grep -m 1 -Eo "([0-9]+\.[0-9]+\.[0-9]+)")
+    pecl_version=$(echo "$response" | grep -m 1 -Eo "($major_version\.[0-9]+\.[0-9]+)<" | cut -d '<' -f 1)
   fi
   echo "$pecl_version"
 }
diff --git a/src/scripts/extensions/phalcon.sh b/src/scripts/extensions/phalcon.sh
index 33c23a95..a1e27634 100644
--- a/src/scripts/extensions/phalcon.sh
+++ b/src/scripts/extensions/phalcon.sh
@@ -1,3 +1,15 @@
+# Helper function to get phalcon version
+get_phalcon_version() {
+  if [ "$extension" = "phalcon5" ]; then
+    semver="$(get_pecl_version phalcon stable 5)"
+    ([ -n "$semver" ] && echo "$semver") || get_pecl_version phalcon rc 5
+  elif [ "$extension" = "phalcon4" ]; then
+    echo '4.1.2'
+  elif [ "$extension" = "phalcon3" ]; then
+    echo '3.4.5'
+  fi
+}
+
 # Helper function to add phalcon.
 add_phalcon_helper() {
   status='Installed and enabled'
@@ -7,7 +19,7 @@ add_phalcon_helper() {
     packages=("php${version:?}-$extension")
     [ "$extension" = "phalcon4" ] && packages+=("php${version:?}-psr")
     add_ppa ondrej/php >/dev/null 2>&1 || update_ppa ondrej/php
-    check_package "${packages[0]}" && install_packages "${packages[@]}"
+    (check_package "${packages[0]}" && install_packages "${packages[@]}") || pecl_install "phalcon-$(get_phalcon_version)"
   fi
 }
 
@@ -44,15 +56,27 @@ add_phalcon4() {
   fi
 }
 
+# Function to add phalcon3.
+add_phalcon5() {
+  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 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
+  if [[ "$extension_major_version" =~ [3-5] ]]; then
+    add_phalcon"$extension_major_version" >/dev/null 2>&1
   fi
   add_extension_log "phalcon" "$status"
 }