From eae890b1b28e0cfed87e7988eea455d4118be3d9 Mon Sep 17 00:00:00 2001
From: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Fri, 29 Nov 2019 10:14:53 +0530
Subject: [PATCH 1/3] Fix phpdbg version

---
 src/scripts/linux.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/linux.sh b/src/scripts/linux.sh
index 31b1e044..81e0c8b2 100644
--- a/src/scripts/linux.sh
+++ b/src/scripts/linux.sh
@@ -29,7 +29,7 @@ if [ "$existing_version" != "$1" ]; then
 		status="Installed PHP$version"
 	fi
 
-	for tool in php phar phar.phar php-cgi php-config phpize; do
+	for tool in php phar phar.phar php-cgi php-config phpize phpdbg; do
 		if [ -e "/usr/bin/$tool$1" ]; then
 			sudo update-alternatives --set $tool /usr/bin/"$tool$1" >/dev/null 2>&1
 		fi

From aad33a8e3512778861c41ae7db215aca93325f69 Mon Sep 17 00:00:00 2001
From: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Fri, 29 Nov 2019 10:52:07 +0530
Subject: [PATCH 2/3] Update Update-PhpCAInfo command in win32.ps1

---
 src/scripts/win32.ps1 | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/scripts/win32.ps1 b/src/scripts/win32.ps1
index 0ba5b11e..593cbecd 100644
--- a/src/scripts/win32.ps1
+++ b/src/scripts/win32.ps1
@@ -44,16 +44,7 @@ else {
 
 Set-PhpIniKey -Key 'date.timezone' -Value 'UTC' -Path $php_dir
 Enable-PhpExtension -Extension openssl, curl -Path $php_dir
-try {
-  Update-PhpCAInfo -Path $php_dir -Source CurrentUser
-}
-catch {
-  try {
-    Update-PhpCAInfo -Path $php_dir -Source Curl
-  } catch {
-    Update-PhpCAInfo -Path $php_dir -Source Curl -SkipChecksumCheck
-  }
-}
+Update-PhpCAInfo -Path $php_dir -Source CurrentUser
 if ([Version]$installed.Version -ge '7.4') {
   Copy-Item "$dir\..\src\ext\php_pcov.dll" -Destination "$($installed.ExtensionsPath)\php_pcov.dll"
 }

From c4a64dff616ddeefa5440b5959a515c9ad9802a0 Mon Sep 17 00:00:00 2001
From: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Fri, 29 Nov 2019 11:41:25 +0530
Subject: [PATCH 3/3] Install phpdbg with PHP7.4

---
 src/scripts/linux.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/scripts/linux.sh b/src/scripts/linux.sh
index 81e0c8b2..eab758d8 100644
--- a/src/scripts/linux.sh
+++ b/src/scripts/linux.sh
@@ -25,7 +25,11 @@ sudo mkdir -p /run/php
 find /etc/apt/sources.list.d -type f -name 'ondrej-ubuntu-php*.list' -exec sudo DEBIAN_FRONTEND=noninteractive apt-fast update -o Dir::Etc::sourcelist="{}" ';' >/dev/null 2>&1
 if [ "$existing_version" != "$1" ]; then
 	if [ ! -e "/usr/bin/php$1" ]; then
-    sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y php"$1" curl php"$1"-curl >/dev/null 2>&1
+		if [ "$1" != "7.4" ]; then
+		  sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y php"$1" curl php"$1"-curl >/dev/null 2>&1
+		else
+		  sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y php"$1" php"$1"-phpdbg php"$1"-xml curl php"$1"-curl >/dev/null 2>&1
+		fi
 		status="Installed PHP$version"
 	fi