From 11d669e34b70fe1e6a85014bba7564ece4a98c51 Mon Sep 17 00:00:00 2001
From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com>
Date: Tue, 12 Apr 2022 20:29:43 +0200
Subject: [PATCH] [Ubuntu] remove php 7.1 from Bionic Beaver (#5390)

---
 images/linux/scripts/installers/php.sh  | 20 +++++---------------
 images/linux/toolsets/toolset-1804.json |  1 -
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh
index 01aebd79b..a2ebeeb2a 100644
--- a/images/linux/scripts/installers/php.sh
+++ b/images/linux/scripts/installers/php.sh
@@ -64,9 +64,11 @@ for version in $php_versions; do
         php$version-zip \
         php$version-zmq
 
-    if [[ $version == "5.6" || $version == "7.0" || $version == "7.1" ]]; then
-        apt-get install -y --no-install-recommends php$version-mcrypt php$version-recode
-    fi
+        apt-get install -y --no-install-recommends php$version-pcov
+
+        # Disable PCOV, as Xdebug is enabled by default
+        # https://github.com/krakjoe/pcov#interoperability
+        phpdismod -v $version pcov
 
     if [[ $version == "7.2" || $version == "7.3" ]]; then
         apt-get install -y --no-install-recommends php$version-recode
@@ -75,18 +77,6 @@ for version in $php_versions; do
     if [[ $version != "8.0" && $version != "8.1" ]]; then
         apt-get install -y --no-install-recommends php$version-xmlrpc php$version-json
     fi
-
-    if [[ $version != "5.6" && $version != "7.0" ]]; then
-        apt-get install -y --no-install-recommends php$version-pcov
-
-        # Disable PCOV, as Xdebug is enabled by default
-        # https://github.com/krakjoe/pcov#interoperability
-        phpdismod -v $version pcov
-    fi
-
-    if [[ $version = "7.0" || $version = "7.1" ]]; then
-        apt-get install -y --no-install-recommends php$version-sodium
-    fi
 done
 
 apt-get install -y --no-install-recommends php-pear
diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json
index 2ff083ce4..10523a614 100644
--- a/images/linux/toolsets/toolset-1804.json
+++ b/images/linux/toolsets/toolset-1804.json
@@ -285,7 +285,6 @@
     },
     "php": {
         "versions": [
-            "7.1",
             "7.2",
             "7.3",
             "7.4",