From 46161660dc3b7a39164aa6f382f40ae37d5e42c5 Mon Sep 17 00:00:00 2001
From: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Thu, 28 Nov 2019 15:58:33 +0530
Subject: [PATCH] Bump to 7.4.0 stable on linux

---
 README.md            |  2 +-
 src/scripts/linux.sh | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index c17b5d30..f325eece 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ Setup PHP with required extensions, php.ini configuration and composer in [GitHu
 |7.1|`Stable`|`Security fixes only`|
 |7.2|`Stable`|`Active`|
 |7.3|`Stable`|`Active`|
-|7.4|`RC6`|`Active`|
+|7.4|`Stable`|`Active`|
 
 ## :cloud: OS/Platform Support
 
diff --git a/src/scripts/linux.sh b/src/scripts/linux.sh
index c775a32b..31b1e044 100644
--- a/src/scripts/linux.sh
+++ b/src/scripts/linux.sh
@@ -25,11 +25,7 @@ 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
-		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"-dev php"$1"-xml curl php"$1"-curl >/dev/null 2>&1
-		fi
+    sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y php"$1" curl php"$1"-curl >/dev/null 2>&1
 		status="Installed PHP$version"
 	fi
 
@@ -45,9 +41,7 @@ ext_dir=$(php -i | grep "extension_dir => /usr" | sed -e "s|.*=> s*||")
 sudo chmod 777 "$ini_file"
 add_log "$tick" "PHP" "$status"
 if [ "$2" = "true" ]; then
-  if [ "$1" != "7.4" ]; then
-    sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y php"$1"-dev php"$1"-xml >/dev/null 2>&1
-  fi
+  sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y php"$1"-dev php"$1"-xml >/dev/null 2>&1
   sudo update-alternatives --set php-config /usr/bin/php-config"$1" >/dev/null 2>&1
   sudo update-alternatives --set phpize /usr/bin/phpize"$1" >/dev/null 2>&1
   wget https://github.com/pear/pearweb_phars/raw/master/install-pear-nozlib.phar >/dev/null 2>&1