From 2c8067907c7388793d0df3c006a26bf9261ee46b Mon Sep 17 00:00:00 2001
From: "Eloy Lafuente (stronk7)" <stronk7@moodle.org>
Date: Wed, 27 Jan 2021 19:01:15 +0100
Subject: [PATCH] Adding xmlrpc-beta now that 1.0.0RC2 has been released

Link: https://pecl.php.net/package/xmlrpc

Note: RC1 had a packaging bug making it unusable, see https://bugs.php.net/bug.php?id=80618

Also, bump to 8.0.1
---
 Dockerfile                       | 2 +-
 root/tmp/setup/php-extensions.sh | 9 ++-------
 tests/fixtures/test.php          | 4 ++--
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 96efb75..f347404 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.0-apache-buster
+FROM php:8.0.1-apache-buster
 
 ADD root/ /
 # Fix the original permissions of /tmp, the PHP default upload tmp dir.
diff --git a/root/tmp/setup/php-extensions.sh b/root/tmp/setup/php-extensions.sh
index eaa26e9..9ae4cea 100755
--- a/root/tmp/setup/php-extensions.sh
+++ b/root/tmp/setup/php-extensions.sh
@@ -63,13 +63,8 @@ docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/
 docker-php-ext-install -j$(nproc) ldap
 
 # Memcached, MongoDB, Redis, APCu, igbinary, solr, uuid.
-pecl install memcached mongodb redis apcu igbinary solr uuid
-docker-php-ext-enable memcached mongodb redis apcu igbinary solr uuid
-
-# xmlrpc -- not existing as of 8.0.0 release (not yet @ PECL, https://php.watch/versions/  8.0#xmlrpc)
-# (once available add it to the previous pecl command)
-#pecl install xmlrpc
-#docker-php-ext-enable xmlrpc
+pecl install memcached mongodb redis apcu igbinary solr uuid xmlrpc-beta
+docker-php-ext-enable memcached mongodb redis apcu igbinary solr uuid xmlrpc
 
 echo 'apc.enable_cli = On' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini
 
diff --git a/tests/fixtures/test.php b/tests/fixtures/test.php
index 8211e6e..75a602a 100644
--- a/tests/fixtures/test.php
+++ b/tests/fixtures/test.php
@@ -16,10 +16,10 @@
     'sodium',
     'solr',
     'sqlsrv',
+    'uuid',
     'xsl',
-    // 'xmlrpc', -- not existing as of 8.0.0 release (not yet @ PECL, https://php.watch/versions/8.0#xmlrpc)
+    'xmlrpc',
     'zip',
-    'uuid'
 ];
 
 $buffer = '';;