[T19] Fixes for totara19

tests/auth_test.php

@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace auth_saml2;
-
 /**
  * Unit tests for auth class.
  *
@@ -27,7 +25,7 @@
  * @copyright   2021 Moodle Pty Ltd <[email protected]>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class auth_saml2_test extends \core_phpunit\testcase {
+class auth_saml2_auth_test extends \core_phpunit\testcase {
     /**
      * Set up
      */
@@ -100,7 +98,7 @@ protected function get_mocked_auth(): \auth_saml2\auth {
         // exception message. This is needed to check $msg argument and stop
         // execution like original method does.
         $auth = $this->getMockBuilder(\auth_saml2\auth::class)
-            ->setMethods(['error_page'])->getMock();
+            ->onlyMethods(['error_page'])->getMock();
 
         $auth->expects($this->once())
             ->method('error_page')
@@ -800,7 +798,7 @@ public function test_should_login_redirect($cfg, $config, $param, $multiidp, $se
      *
      * @return array of testcases
      */
-    public function provider_should_login_redirect(): array {
+    public static function provider_should_login_redirect(): array {
         $midp = (new \moodle_url('/auth/saml2/selectidp.php'))->out();
         return [
             // Login normal, dual login on.
@@ -967,7 +965,7 @@ public function test_check_whitelisted_ip_redirect($saml, $remoteip, $whitelist,
      *
      * @return array
      */
-    public function provider_check_whitelisted_ip_redirect(): array {
+    public static function provider_check_whitelisted_ip_redirect(): array {
         return [
             'saml off, no ip, no redirect'              => ['off', '1.2.3.4', '', false],
             'saml not specified, junk, no redirect'     => [null, '1.2.3.4', 'qwer1234!@#qwer', false],
@@ -982,7 +980,7 @@ public function provider_check_whitelisted_ip_redirect(): array {
      *
      * @return array
      */
-    public function provider_is_access_allowed(): array {
+    public static function provider_is_access_allowed(): array {
         return [
             '' => [[
                 ['uid' => 'test'], // User don't have groups attribute.
@@ -1206,7 +1204,7 @@ public function test_update_custom_user_profile_fields($attributes): void {
      *
      * @return array of testcases
      */
-    public function provider_update_custom_user_profile_fields(): array {
+    public static function provider_update_custom_user_profile_fields(): array {
         return [
             [['testfield' => ['Test data']]],
             [['secondfield' => ['A different string']]],
@@ -1253,7 +1251,7 @@ public function test_missing_user_custom_profile_fields($attributes): void {
      *
      * @return array of testcases
      */
-    public function provider_missing_user_custom_profile_fields(): array {
+    public static function provider_missing_user_custom_profile_fields(): array {
         return array(
             array(['missingfield' => array('Test data')]),
             array(['secondfield' => array('A different string')]),
@@ -1292,7 +1290,7 @@ public function test_invalid_map_user_profile_fields($mapping, $attributes): voi
      *
      * @return array of testcases
      */
-    public function provider_invalid_map_user_profile_fields(): array {
+    public static function provider_invalid_map_user_profile_fields(): array {
         return [
             [
                 ['field' => 'userame', 'mapping' => 'invalid'],

tests/form_regenerate_test.php

@@ -30,7 +30,7 @@
  * @package    auth_saml2
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class auth_saml2_form_regenerate_testcase extends \core_phpunit\testcase {
+class auth_saml2_form_regenerate_test extends \core_phpunit\testcase {
     public function test_regenerate_certificate_form() {
         global $CFG, $DB, $USER;
         $this->resetAfterTest();

tests/generator_test.php

@@ -26,7 +26,7 @@
  * @copyright   2021 Moodle Pty Ltd <[email protected]>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class generator_testcase extends \core_phpunit\testcase {
+class generator_test extends \core_phpunit\testcase {
     /**
      * Set up
      */

tests/group_rule_test.php

@@ -30,7 +30,7 @@
  * @copyright  Catalyst IT
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class auth_saml2_group_rule_test_testcase extends \core_phpunit\testcase {
+class auth_saml2_group_rule_test extends \core_phpunit\testcase {
 
     /**
      * Test we can get list of rules from config string.

tests/locallib_test.php

@@ -34,7 +34,7 @@
  * @copyright  Brendan Heywood <[email protected]>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class auth_saml2_locallib_testcase extends \core_phpunit\testcase {
+class auth_saml2_locallib_test extends \core_phpunit\testcase {
     /**
      * Regression test for Issue 132.
      */

tests/metadata_fetcher_test.php

@@ -31,7 +31,7 @@
  * @copyright  Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class auth_saml2_metadata_fetcher_testcase extends \core_phpunit\testcase {
+class auth_saml2_metadata_fetcher_test extends \core_phpunit\testcase {
 
     /** @var \Prophecy\Prophet */
     protected $prophet;
@@ -50,6 +50,7 @@ public function setUp(): void {
      */
     protected function tearDown(): void {
         $this->prophet = null; // Required for Totara 12+ support (see issue #578).
+        parent::tearDown();
     }
 
     public function test_fetch_metadata_404() {

tests/metadata_parser_test.php

@@ -31,7 +31,7 @@
  * @copyright  Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class auth_saml2_metadata_parser_testcase extends \core_phpunit\testcase {
+class auth_saml2_metadata_parser_test extends \core_phpunit\testcase {
 
     public function test_parse_metadata() {
         $xml = file_get_contents(__DIR__ . '/fixtures/metadata.xml');

tests/metadata_refresh_test.php

@@ -32,7 +32,7 @@
  * @copyright  Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class auth_saml2_metadata_refresh_testcase extends \core_phpunit\testcase {
+class auth_saml2_metadata_refresh_test extends \core_phpunit\testcase {
 
     /** @var \Prophecy\Prophet */
     protected $prophet;
@@ -52,6 +52,7 @@ public function setUp(): void {
      */
     protected function tearDown(): void {
         $this->prophet = null;  // Required for Totara 12+ support (see issue #578).
+        parent::tearDown();
     }
 
     public function test_metadata_refresh_disabled() {

tests/metadata_writer_test.php

@@ -31,7 +31,7 @@
  * @copyright  Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class auth_saml2_metadata_writer_testcase extends \core_phpunit\testcase {
+class auth_saml2_metadata_writer_test extends \core_phpunit\testcase {
 
     public function test_write_default_path() {
         global $CFG;

tests/redis_store_test.php

@@ -31,7 +31,7 @@
  * @copyright  Copyright (c) 2017 Blackboard Inc. (http://www.blackboard.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class auth_saml2_redis_store_testcase extends \core_phpunit\testcase {
+class auth_saml2_redis_store_test extends \core_phpunit\testcase {
 
     /**
      * @var null|\Redis

tests/simplesamlphp_upgrade_test.php

@@ -28,7 +28,7 @@
  * @package    auth_saml2
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class auth_saml2_simplesamlphp_upgrade_testcase extends \core_phpunit\testcase {
+class auth_saml2_simplesamlphp_upgrade_test extends \core_phpunit\testcase {
 
     /**
      * Test to ensure that composer files are removed from compiled extlib/simplesamlphp.

tests/ssl_algorithm_test.php

@@ -24,7 +24,7 @@
  * @copyright  Catalyst IT
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class auth_saml2_ssl_algorithms_test extends \core_phpunit\testcase {
+class auth_saml2_ssl_algorithm_test extends \core_phpunit\testcase {
     public function test_default_saml_signature_algorithm_is_valid_saml_signature_algorithm() {
         $this->assertTrue(array_key_exists(ssl_algorithms::get_default_saml_signature_algorithm(),
             ssl_algorithms::get_valid_saml_signature_algorithms()));

tests/user_fields_test.php

@@ -130,7 +130,7 @@ public function test_get_supported_fields_with_profile_fields() {
      * Test data for self::test_is_custom_profile_field().
      * @return array
      */
-    public function is_custom_profile_field_data_provider(): array {
+    public static function is_custom_profile_field_data_provider(): array {
         return [
             ['profile_field_test', true],
             ['profiletest', false],
@@ -159,7 +159,7 @@ public function test_is_custom_profile_field($value, bool $expected) {
      * Test data for self::test_get_short_name().
      * @return array
      */
-    public function get_short_name_data_provider(): array {
+    public static function get_short_name_data_provider(): array {
         return [
             ['profile_field_test', 'test'],
             ['profile_field_profile_field_test', 'profile_field_test'],