From b40fad605b804f38b3a43eec78cbb626944f9162 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 15 May 2024 23:42:08 +0800
Subject: [PATCH] MDL-81914 core_competency: Stop using a deprecated class

---
 admin/tool/cohortroles/classes/api.php                 | 2 +-
 admin/tool/cohortroles/tests/api_test.php              | 2 +-
 admin/tool/cohortroles/tests/privacy/provider_test.php | 2 +-
 competency/classes/api.php                             | 1 +
 competency/tests/external/external_test.php            | 4 ++--
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/admin/tool/cohortroles/classes/api.php b/admin/tool/cohortroles/classes/api.php
index 335272c99f0..3044ba69a97 100644
--- a/admin/tool/cohortroles/classes/api.php
+++ b/admin/tool/cohortroles/classes/api.php
@@ -25,7 +25,7 @@ namespace tool_cohortroles;
 
 use stdClass;
 use context_system;
-use core_competency\invalid_persistent_exception;
+use core\invalid_persistent_exception;
 
 /**
  * Class for doing things with cohort roles.
diff --git a/admin/tool/cohortroles/tests/api_test.php b/admin/tool/cohortroles/tests/api_test.php
index 08ca2061e22..04d412e6c63 100644
--- a/admin/tool/cohortroles/tests/api_test.php
+++ b/admin/tool/cohortroles/tests/api_test.php
@@ -71,7 +71,7 @@ class api_test extends \advanced_testcase {
             'roleid' => -8,
             'cohortid' => $this->cohort->id
         );
-        $this->expectException(\core_competency\invalid_persistent_exception::class);
+        $this->expectException(\core\invalid_persistent_exception::class);
         api::create_cohort_role_assignment($params);
     }
 
diff --git a/admin/tool/cohortroles/tests/privacy/provider_test.php b/admin/tool/cohortroles/tests/privacy/provider_test.php
index deb05db61fa..ab7fdfa7a75 100644
--- a/admin/tool/cohortroles/tests/privacy/provider_test.php
+++ b/admin/tool/cohortroles/tests/privacy/provider_test.php
@@ -354,7 +354,7 @@ class provider_test extends \core_privacy\tests\provider_testcase {
      * @param int $nocohortroles    The number of tool_cohortroles to create for the user.
      * @param string $rolename      The name of the role to be created.
      * @param string $roleshortname The short name of the role to be created.
-     * @throws \core_competency\invalid_persistent_exception
+     * @throws \core\invalid_persistent_exception
      * @throws coding_exception
      */
     protected function setup_test_scenario_data($userid, $context, $nocohortroles, $rolename = 'Sausage Roll',
diff --git a/competency/classes/api.php b/competency/classes/api.php
index dccc12f3403..69c0afeb8a7 100644
--- a/competency/classes/api.php
+++ b/competency/classes/api.php
@@ -24,6 +24,7 @@
 namespace core_competency;
 defined('MOODLE_INTERNAL') || die();
 
+use core\invalid_persistent_exception;
 use stdClass;
 use cm_info;
 use context;
diff --git a/competency/tests/external/external_test.php b/competency/tests/external/external_test.php
index 04ad174dc1f..982ba040814 100644
--- a/competency/tests/external/external_test.php
+++ b/competency/tests/external/external_test.php
@@ -24,10 +24,10 @@
 
 namespace core_competency\external;
 
+use core\invalid_persistent_exception;
 use core_competency\api;
 use core_competency\course_competency_settings;
 use core_competency\external;
-use core_competency\invalid_persistent_exception;
 use core_competency\plan;
 use core_competency\plan_competency;
 use core_competency\related_competency;
@@ -620,7 +620,7 @@ class external_test extends externallib_advanced_testcase {
         try {
             $result = $this->update_competency_framework($f2->get('id'), 4, true);
             $this->fail('The scale cannot be changed once used.');
-        } catch (\core\invalid_persistent_exception $e) {
+        } catch (invalid_persistent_exception $e) {
             $this->assertMatchesRegularExpression('/scaleid/', $e->getMessage());
         }
     }