Merge branch 'MDL-86016-main' of https://github.com/andrewnicols/moodle

public/admin/tool/xmldb/tests/behat/reconcile_xmldb_files.feature

@@ -1,12 +0,0 @@
-@tool @tool_xmldb
-Feature: The Reconcile XMLDB files report works and all the files are ok
-  In order to ensure that all the XMLDB Editor xml files are generated properly
-  As a developer
-  I need to be able to run the Reconcile XMLDB files report and verify that everything is ok
-
-  Scenario: The Reconcile XMLDB files reports that all files are ok
-    Given I log in as "admin"
-    And I navigate to "Development > XMLDB editor" in site administration
-    When I follow "[Reconcile XMLDB files]"
-    Then I should see "Look for XMLDB files needing reconciling"
-    And I should see "All files are OK. No reconciling is needed."

public/lib/tests/db/plugin_checks_test.php

@@ -52,7 +52,10 @@ final class plugin_checks_test extends \core\tests\plugin_checks_testcase {
         $xmldb = new \xmldb_file($file);
         $xmldb->loadXMLStructure();
         $xmlcontents = $xmldb->getStructure()->xmlOutput();
-        $this->assertSame($xmlcontents, $rawcontents,
-            "Unexpected install.xml format detected, reconciliation needed in $file");
+        $this->assertXmlStringEqualsXmlString(
+            $rawcontents,
+            $xmlcontents,
+            "XMLDB structure does not match the install.xml file in $file",
+        );
     }
 }