From 464f2ea46096cae440cb91260370924a7713dc37 Mon Sep 17 00:00:00 2001
From: "Eloy Lafuente (stronk7)" <stronk7@moodle.org>
Date: Sun, 19 Dec 2021 11:41:52 +0100
Subject: [PATCH] MDL-73405 phpunit: dataset fixes

This was detected when working in the renaming of test names:
- Fix file name, it was incorrectly named .test.php, now _test.php.
- Add namespace and rename testcase name to match file name.
- Fix php80 deprecation message about optional and required params
  order.
---
 ...aset.test.php => phpunit_dataset_test.php} | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
 rename lib/phpunit/tests/{phpunit_dataset.test.php => phpunit_dataset_test.php} (98%)

diff --git a/lib/phpunit/tests/phpunit_dataset.test.php b/lib/phpunit/tests/phpunit_dataset_test.php
similarity index 98%
rename from lib/phpunit/tests/phpunit_dataset.test.php
rename to lib/phpunit/tests/phpunit_dataset_test.php
index fcb1c5619da..4bf4d772125 100644
--- a/lib/phpunit/tests/phpunit_dataset.test.php
+++ b/lib/phpunit/tests/phpunit_dataset_test.php
@@ -25,6 +25,10 @@
 
 declare(strict_types=1);
 
+namespace core;
+
+use advanced_testcase;
+use phpunit_dataset;
 use org\bovigo\vfs\vfsStream;
 
 /**
@@ -32,7 +36,7 @@ use org\bovigo\vfs\vfsStream;
  *
  * @coversDefaultClass phpunit_dataset
  */
-class core_phpunit_dataset_testcase extends advanced_testcase {
+class phpunit_dataset_test extends advanced_testcase {
 
 
     /**
@@ -48,7 +52,7 @@ class core_phpunit_dataset_testcase extends advanced_testcase {
         ];
 
         // We need public properties to check the basis.
-        $dsref = new ReflectionClass($ds);
+        $dsref = new \ReflectionClass($ds);
         $dstables = $dsref->getProperty('tables');
         $dstables->setAccessible(true);
         $dscolumns = $dsref->getProperty('columns');
@@ -152,7 +156,7 @@ class core_phpunit_dataset_testcase extends advanced_testcase {
         $ds = new phpunit_dataset();
 
         // We need public properties to check the basis.
-        $dsref = new ReflectionClass($ds);
+        $dsref = new \ReflectionClass($ds);
         $dstables = $dsref->getProperty('tables');
         $dstables->setAccessible(true);
         $dscolumns = $dsref->getProperty('columns');
@@ -245,7 +249,7 @@ class core_phpunit_dataset_testcase extends advanced_testcase {
         $ds = new phpunit_dataset();
 
         // We need public properties to check the basis.
-        $dsref = new ReflectionClass($ds);
+        $dsref = new \ReflectionClass($ds);
         $dstables = $dsref->getProperty('tables');
         $dstables->setAccessible(true);
         $dscolumns = $dsref->getProperty('columns');
@@ -391,7 +395,7 @@ class core_phpunit_dataset_testcase extends advanced_testcase {
         $ds = new phpunit_dataset();
 
         // We need public properties to check the basis.
-        $dsref = new ReflectionClass($ds);
+        $dsref = new \ReflectionClass($ds);
         $dstables = $dsref->getProperty('tables');
         $dstables->setAccessible(true);
         $dscolumns = $dsref->getProperty('columns');
@@ -485,7 +489,7 @@ class core_phpunit_dataset_testcase extends advanced_testcase {
         $ds = new phpunit_dataset();
 
         // We need public properties to check the basis.
-        $dsref = new ReflectionClass($ds);
+        $dsref = new \ReflectionClass($ds);
         $dstables = $dsref->getProperty('tables');
         $dstables->setAccessible(true);
         $dscolumns = $dsref->getProperty('columns');
@@ -656,7 +660,7 @@ class core_phpunit_dataset_testcase extends advanced_testcase {
         $ds = new phpunit_dataset();
 
         // We need public properties to check the basis.
-        $dsref = new ReflectionClass($ds);
+        $dsref = new \ReflectionClass($ds);
         $dstables = $dsref->getProperty('tables');
         $dstables->setAccessible(true);
         $dscolumns = $dsref->getProperty('columns');
@@ -785,7 +789,7 @@ class core_phpunit_dataset_testcase extends advanced_testcase {
      * @dataProvider to_database_provider
      * @covers ::to_database
      */
-    public function test_to_database(array $files, ?array $filter = [], ?string $exception, array $columns, array $rows) {
+    public function test_to_database(array $files, ?array $filter, ?string $exception, array $columns, array $rows) {
         global $DB;
 
         $this->resetAfterTest();