Revert "Merge pull request #121 from Lctrs/php_7_4"

This reverts commit 0e66e9eca1, reversing
changes made to b71c9e4e7c.

images/linux/scripts/installers/1804/php.sh

@@ -16,6 +16,7 @@ apt-add-repository ppa:ondrej/php -y
 # Install php7.1
 apt-fast install -y --no-install-recommends \
     php7.1 \
+    php7.1-amqp \
     php7.1-bcmath \
     php7.1-bz2 \
     php7.1-cgi \
@@ -57,6 +58,8 @@ apt-get remove --purge -yq php7.1-dev
 # Install php7.2
 apt-fast install -y --no-install-recommends \
     php7.2 \
+    php7.2-apcu \
+    php7.2-amqp \
     php7.2-bcmath \
     php7.2-bz2 \
     php7.2-cgi \
@@ -96,6 +99,8 @@ apt-fast install -y --no-install-recommends \
 # Install php7.3
 apt-fast install -y --no-install-recommends \
     php7.3 \
+    php7.3-apcu \
+    php7.3-amqp \
     php7.3-bcmath \
     php7.3-bz2 \
     php7.3-cgi \
@@ -132,47 +137,7 @@ apt-fast install -y --no-install-recommends \
     php7.3-xsl \
     php7.3-zip
 
-# Install php7.4
 apt-fast install -y --no-install-recommends \
-    php7.4 \
-    php7.4-bcmath \
-    php7.4-bz2 \
-    php7.4-cgi \
-    php7.4-cli \
-    php7.4-common \
-    php7.4-curl \
-    php7.4-dba \
-    php7.4-dev \
-    php7.4-enchant \
-    php7.4-fpm \
-    php7.4-gd \
-    php7.4-gmp \
-    php7.4-imap \
-    php7.4-interbase \
-    php7.4-intl \
-    php7.4-json \
-    php7.4-ldap \
-    php7.4-mbstring \
-    php7.4-mysql \
-    php7.4-odbc \
-    php7.4-opcache \
-    php7.4-pgsql \
-    php7.4-phpdbg \
-    php7.4-pspell \
-    php7.4-readline \
-    php7.4-snmp \
-    php7.4-soap \
-    php7.4-sqlite3 \
-    php7.4-sybase \
-    php7.4-tidy \
-    php7.4-xml \
-    php7.4-xmlrpc \
-    php7.4-xsl \
-    php7.4-zip
-
-apt-fast install -y --no-install-recommends \
-    php-amqp \
-    php-apcu \
     php-igbinary \
     php-memcache \
     php-memcached \
@@ -200,7 +165,7 @@ mv phpunit /usr/local/bin/phpunit
 
 # Run tests to determine that the software installed as expected
 echo "Testing to make sure that script performed as expected, and basic scenarios work"
-for cmd in php php7.1 php7.2 php7.3 php7.4 composer phpunit; do
+for cmd in php php7.1 php7.2 php7.3 composer phpunit; do
     if ! command -v $cmd; then
         echo "$cmd was not installed"
         exit 1
@@ -212,6 +177,5 @@ echo "Lastly, documenting what we added to the metadata file"
 DocumentInstalledItem "PHP 7.1 ($(php7.1 --version | head -n 1))"
 DocumentInstalledItem "PHP 7.2 ($(php7.2 --version | head -n 1))"
 DocumentInstalledItem "PHP 7.3 ($(php7.3 --version | head -n 1))"
-DocumentInstalledItem "PHP 7.4 ($(php7.4 --version | head -n 1))"
 DocumentInstalledItem "Composer  ($(composer --version))"
 DocumentInstalledItem "PHPUnit ($(phpunit --version))"