From a0d916bc8689acffe8a305f36b24e6d58e6a339d Mon Sep 17 00:00:00 2001
From: "Eloy Lafuente (stronk7)" <stronk7@moodle.org>
Date: Tue, 20 Sep 2022 18:45:47 +0200
Subject: [PATCH] MDL-76055 libraries: Autoload phpxmlrpc and verify it works

Also, we can now safely remove Autoloader.php, because
Moodle PSR-4 autoloader has taken control, so document
and test it too.
---
 lib/classes/component.php       |  1 +
 lib/phpxmlrpc/Autoloader.php    | 36 ---------------------
 lib/phpxmlrpc/readme_moodle.txt |  2 ++
 lib/tests/phpxmlrpc_test.php    | 57 +++++++++++++++++++++++++++++++++
 4 files changed, 60 insertions(+), 36 deletions(-)
 delete mode 100644 lib/phpxmlrpc/Autoloader.php
 create mode 100644 lib/tests/phpxmlrpc_test.php

diff --git a/lib/classes/component.php b/lib/classes/component.php
index dece4396550..a7e8a6ce9a9 100644
--- a/lib/classes/component.php
+++ b/lib/classes/component.php
@@ -108,6 +108,7 @@ class core_component {
         'ZipStream' => 'lib/zipstream/src/',
         'MyCLabs\\Enum' => 'lib/php-enum/src',
         'Psr\\Http\\Message' => 'lib/http-message/src',
+        'PhpXmlRpc' => 'lib/phpxmlrpc',
     );
 
     /**
diff --git a/lib/phpxmlrpc/Autoloader.php b/lib/phpxmlrpc/Autoloader.php
deleted file mode 100644
index 40ec2190c23..00000000000
--- a/lib/phpxmlrpc/Autoloader.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace PhpXmlRpc;
-
-/**
- * In the unlikely event that you are not using Composer to manage class autoloading, here's an autoloader for this lib.
- * For usage, see any file in the demo/client directory
- */
-class Autoloader
-{
-    /**
-     * Registers PhpXmlRpc\Autoloader as an SPL autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not.
-     */
-    public static function register($prepend = false)
-    {
-        spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
-    }
-
-    /**
-     * Handles autoloading of classes.
-     *
-     * @param string $class A class name.
-     */
-    public static function autoload($class)
-    {
-        if (0 !== strpos($class, 'PhpXmlRpc\\')) {
-            return;
-        }
-
-        if (is_file($file = __DIR__ . str_replace(array('PhpXmlRpc\\', '\\'), '/', $class).'.php')) {
-            require $file;
-        }
-    }
-}
diff --git a/lib/phpxmlrpc/readme_moodle.txt b/lib/phpxmlrpc/readme_moodle.txt
index 28e0fae2bc3..957c0836a72 100644
--- a/lib/phpxmlrpc/readme_moodle.txt
+++ b/lib/phpxmlrpc/readme_moodle.txt
@@ -11,6 +11,8 @@ To update:
 - Download or checkout it.
 - Delete the contents on the lib/phpxmlrpc directory (but this file) completely.
 - Copy the /src directory contents of the library to lib/phpxmlrpc.
+- Remove the following files:
+  - Autoloader.php
 - Edit this file and update the release and commit details below.
 - Edit lib/thirdpartylibs.xml and update the information details too.
 
diff --git a/lib/tests/phpxmlrpc_test.php b/lib/tests/phpxmlrpc_test.php
new file mode 100644
index 00000000000..543e81b94b1
--- /dev/null
+++ b/lib/tests/phpxmlrpc_test.php
@@ -0,0 +1,57 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core;
+
+use PhpXmlRpc\Client;
+use PhpXmlRpc\Request;
+use PhpXmlRpc\Response;
+use PhpXmlRpc\Server;
+use PhpXmlRpc\Value;
+
+/**
+ * phpxmlrpc library unit tests.
+ *
+ * @package   core
+ * @category  test
+ * @copyright 2022 onwards Eloy Lafuente (stronk7) {@link https://stronk7.com}
+ * @license   https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class phpxmlrpc_test extends \basic_testcase {
+
+    /**
+     * Ensure PhpXmlRpc availability.
+     *
+     * This may seem silly, sure it is. But it's a good way to verify
+     * that the Moodle PSR-4 autoloader is working ok.
+     *
+     * @coversNothing
+     */
+    public function test_phpxmlrpc_availability() {
+        // All these classes need to be at hand.
+        $this->assertInstanceOf(\PhpXmlRpc\Client::class, new Client('https://example.com'));
+        $this->assertInstanceOf(\PhpXmlRpc\Request::class, new Request(''));
+        $this->assertInstanceOf(\PhpXmlRpc\Response::class, new Response(''));
+        $this->assertInstanceOf(\PhpXmlRpc\Server::class, new Server());
+        $this->assertInstanceOf(\PhpXmlRpc\Value::class, new Value());
+
+        // Worth checking that we have removed this.
+        $this->assertFileDoesNotExist(__DIR__ . '/../phpxmlrpc/Autoloader.php');
+
+        // We cannnot live without our beloved readme.
+        $this->assertFileExists(__DIR__ . '/../phpxmlrpc/readme_moodle.txt');
+    }
+}