From bc0d6076118a92825d7bb105bbbd30d275e6a64f Mon Sep 17 00:00:00 2001
From: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Sun, 19 Sep 2021 07:02:01 +0530
Subject: [PATCH] Fix cache support for phalcon4

---
 src/scripts/ext/phalcon.sh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/scripts/ext/phalcon.sh b/src/scripts/ext/phalcon.sh
index 981294a7..0ec06940 100644
--- a/src/scripts/ext/phalcon.sh
+++ b/src/scripts/ext/phalcon.sh
@@ -15,7 +15,7 @@ add_phalcon3() {
     if [ "$phalcon_version" != "$extension_major_version" ]; then
       add_phalcon_helper
     else
-      echo "extension=phalcon.so" | sudo tee -a "$phalcon_ini_file"
+      enable_extension phalcon extension
     fi
   else
     add_phalcon_helper
@@ -24,16 +24,14 @@ add_phalcon3() {
 
 # Function to add phalcon4.
 add_phalcon4() {
-  if shared_extension phalcon && ! php -m | grep -i -q -w psr; then
-    echo "extension=psr.so" | sudo tee -a "${ini_file:?}"
-  fi
+  enable_extension psr extension
   if shared_extension phalcon; then
-    if php -m | grep -i -q -w psr; then
+    if check_extension psr; then
       phalcon_version=$(php -d="extension=phalcon" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
       if [ "$phalcon_version" != "$extension_major_version" ]; then
         add_phalcon_helper
       else
-        echo "extension=phalcon.so" | sudo tee -a "$phalcon_ini_file"
+        enable_extension phalcon extension
       fi
     else
       add_phalcon_helper
@@ -47,7 +45,6 @@ add_phalcon4() {
 add_phalcon() {
   extension=$1
   status='Enabled'
-  phalcon_ini_file="${pecl_file:-${ini_file[@]}}"
   extension_major_version=${extension: -1}
   if [ "$extension_major_version" = "4" ]; then
     add_phalcon4 >/dev/null 2>&1