From 1fd26e45c81c7859121cc2fdbc0630e06a55872b Mon Sep 17 00:00:00 2001
From: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Sun, 2 Jan 2022 19:07:31 +0530
Subject: [PATCH] Refactor INI directives to configs

---
 src/configs/ini/jit.ini    |  3 +++
 src/configs/ini/php.ini    |  2 ++
 src/configs/ini/xdebug.ini |  1 +
 src/scripts/unix.sh        | 10 +++++-----
 src/scripts/win32.ps1      | 15 +++++++++++----
 5 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 src/configs/ini/jit.ini
 create mode 100644 src/configs/ini/php.ini
 create mode 100644 src/configs/ini/xdebug.ini

diff --git a/src/configs/ini/jit.ini b/src/configs/ini/jit.ini
new file mode 100644
index 00000000..0fe03506
--- /dev/null
+++ b/src/configs/ini/jit.ini
@@ -0,0 +1,3 @@
+opcache.enable=1
+opcache.jit_buffer_size=256M
+opcache.jit=1235
diff --git a/src/configs/ini/php.ini b/src/configs/ini/php.ini
new file mode 100644
index 00000000..494cfc81
--- /dev/null
+++ b/src/configs/ini/php.ini
@@ -0,0 +1,2 @@
+date.timezone=UTC
+memory_limit=-1
diff --git a/src/configs/ini/xdebug.ini b/src/configs/ini/xdebug.ini
new file mode 100644
index 00000000..cea362e7
--- /dev/null
+++ b/src/configs/ini/xdebug.ini
@@ -0,0 +1 @@
+xdebug.mode=coverage
diff --git a/src/scripts/unix.sh b/src/scripts/unix.sh
index 9b021dee..fb8839bf 100644
--- a/src/scripts/unix.sh
+++ b/src/scripts/unix.sh
@@ -83,11 +83,11 @@ self_hosted_setup() {
 
 # Function to configure PHP
 configure_php() {
-  (
-    echo -e "date.timezone=UTC\nmemory_limit=-1"
-    [[ "$version" =~ $jit_versions ]] && echo -e "opcache.enable=1\nopcache.jit_buffer_size=256M\nopcache.jit=1235"
-    [[ "$version" =~ $xdebug3_versions ]] && echo -e "xdebug.mode=coverage"
-  ) | sudo tee -a "${pecl_file:-${ini_file[@]}}" >/dev/null
+  ini_config_dir="${dist:?}"/../src/configs/ini
+  ini_files=("$ini_config_dir"/php.ini)
+  [[ "$version" =~ $jit_versions ]] && ini_files+=("$ini_config_dir"/jit.ini)
+  [[ "$version" =~ $xdebug3_versions ]] && ini_files+=("$ini_config_dir"/xdebug.ini)
+  cat "${ini_files[@]}" | sudo tee -a "${pecl_file:-${ini_file[@]}}" >/dev/null 2>&1
 }
 
 # Function to get PHP version in semver format.
diff --git a/src/scripts/win32.ps1 b/src/scripts/win32.ps1
index 591cf048..082678c0 100644
--- a/src/scripts/win32.ps1
+++ b/src/scripts/win32.ps1
@@ -129,6 +129,15 @@ Function Add-PhpCAInfo {
   }
 }
 
+# Function to set PHP config.
+Function Add-PhpConfig {
+  $ini_config_dir = "$dist\..\src\configs\ini"
+  $ini_files = @("$ini_config_dir\php.ini")
+  $version -match $jit_versions -and ($ini_files += ("$ini_config_dir\jit.ini")) > $null 2>&1
+  $version -match $xdebug3_versions -and ($ini_files += ("$ini_config_dir\xdebug.ini")) > $null 2>&1
+  Get-Content -Path $ini_files | Add-Content -Path $php_dir\php.ini
+}
+
 # Variables
 $tick = ([char]8730)
 $cross = ([char]10007)
@@ -141,6 +150,7 @@ $current_profile = "$env:TEMP\setup-php.ps1"
 $ProgressPreference = 'SilentlyContinue'
 $jit_versions = '8.[0-9]'
 $nightly_versions = '8.[2-9]'
+$xdebug3_versions = "7.[2-4]|8.[0-9]"
 $enable_extensions = ('openssl', 'curl', 'mbstring')
 
 $arch = 'x64'
@@ -217,9 +227,6 @@ if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version
   } catch { }
 } else {
   Set-PhpIniKey -Key 'extension_dir' -Value $ext_dir -Path $php_dir
-  if($version -match $jit_versions) {
-    ('opcache.enable=1', 'opcache.jit_buffer_size=256M', 'opcache.jit=1235') | ForEach-Object { $p=$_.split('='); Set-PhpIniKey -Key $p[0] -Value $p[1] -Path $php_dir }
-  }
   if($env:update -eq 'true') {
     Update-Php $php_dir >$null 2>&1
     $status = "Updated to"
@@ -233,7 +240,6 @@ if($installed.MajorMinorVersion -ne $version) {
   Add-Log $cross "PHP" "Could not setup PHP $version"
   exit 1
 }
-('date.timezone=UTC', 'memory_limit=-1', 'xdebug.mode=coverage') | ForEach-Object { $p=$_.split('='); Set-PhpIniKey -Key $p[0] -Value $p[1] -Path $php_dir }
 if($version -lt "5.5") {
   ('libeay32.dll', 'ssleay32.dll') | ForEach-Object { Invoke-WebRequest -Uri "$php_builder/releases/download/openssl-1.0.2u/$_" -OutFile $php_dir\$_ >$null 2>&1 }
 } else {
@@ -241,6 +247,7 @@ if($version -lt "5.5") {
 }
 Enable-PhpExtension -Extension $enable_extensions -Path $php_dir
 Add-PhpCAInfo
+Add-PhpConfig
 Copy-Item -Path $dist\..\src\configs\pm\*.json -Destination $env:RUNNER_TOOL_CACHE
 Write-Output "::set-output name=php-version::$($installed.FullVersion)"
 Add-Log $tick "PHP" "$status PHP $($installed.FullVersion)$extra_version"