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",