mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-29 19:50:14 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Huong Nguyen 2024-05-23 11:01:38 +07:00
commit 48bc966a59
No known key found for this signature in database
GPG Key ID: 40D88AB693A3E72A
7 changed files with 6 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/tool/cohortroles/classes/api.php
View File

@ -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.

2
admin/tool/cohortroles/tests/api_test.php
View File

@ -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);
}

2
admin/tool/cohortroles/tests/privacy/provider_test.php
View File

@ -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',

1
competency/classes/api.php
View File

@ -24,6 +24,7 @@
namespace core_competency;
defined('MOODLE_INTERNAL') || die();
use core\invalid_persistent_exception;
use stdClass;
use cm_info;
use context;

41
competency/classes/invalid_persistent_exception.php
View File

@ -1,41 +0,0 @@
<?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/>.
/**
* Invalid persistent exception.
*
* @package core_competency
* @copyright 2015 Frédéric Massart - FMCorz.net
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_competency;
defined('MOODLE_INTERNAL') || die();
debugging('The class core_competency\\invalid_persistent_exception is deprecated. ' .
'Please use core\\invalid_persistent_exception instead.');
/**
* Invalid persistent exception class.
*
* @package core_competency
* @copyright 2015 Frédéric Massart - FMCorz.net
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @deprecated since Moodle 3.3
*/
class invalid_persistent_exception extends \core\invalid_persistent_exception {
}

18
competency/classes/persistent.php
View File

@ -14,25 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Abstract class for core_competency objects saved to the DB.
*
* @package core_competency
* @copyright 2015 Damyon Wiese
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_competency;
defined('MOODLE_INTERNAL') || die();
// We need to alias the invalid_persistent_exception, because the persistent classes from
// core_competency used to throw a \core_competency\invalid_persistent_exception. They now
// fully inherit from \core\persistent which throws a core exception. Using class_alias
// ensures that previous try/catch statements still work. Also note that we always need
// need to alias, we cannot do it passively in the classloader because try/catch statements
// do not trigger a class loading. Note that for this trick to work, all the classes
// which were extending \core_competency\persistent still need to extend it or the alias
// won't be effective.
class_alias('core\\invalid_persistent_exception', 'core_competency\\invalid_persistent_exception');
/**
* Abstract class for core_competency objects saved to the DB.

4
competency/tests/external/external_test.php vendored
View File

@ -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());
}
}