moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'mdl-59562' of https://github.com/Peterburnett/moodle

Browse source
This commit is contained in:
Andrew Nicols 2020-01-16 12:10:31 +08:00
commit 4aa4d44a41
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/classes/plugin_manager.php
View file

@ -927,9 +927,9 @@ class core_plugin_manager {
* *
* @param \core\plugininfo\base $plugin the plugin we are checking * @param \core\plugininfo\base $plugin the plugin we are checking
* @param int $branch the moodle branch to check support for * @param int $branch the moodle branch to check support for
* @return bool * @return string
*/ */
public function check_explicitly_supported($plugin, $branch) : bool { public function check_explicitly_supported($plugin, $branch) : string {
// Check for correctly formed supported. // Check for correctly formed supported.
if (isset($plugin->pluginsupported)) { if (isset($plugin->pluginsupported)) {
// Broken apart for readability. // Broken apart for readability.

4
lib/classes/plugininfo/base.php
View file

@ -254,7 +254,7 @@ abstract class base {
if (is_array($plugin->supported) && $isint && $isrange) { if (is_array($plugin->supported) && $isint && $isrange) {
$this->pluginsupported = $plugin->supported; $this->pluginsupported = $plugin->supported;
} else { } else {
throw new coding_exception('Incorrect syntax in $plugin->supported in '."$this->name"); throw new coding_exception('Incorrect syntax in plugin supported declaration in '."$this->name");
} }
} }
@ -262,7 +262,7 @@ abstract class base {
if ((ctype_digit($plugin->incompatible) || is_int($plugin->incompatible)) && (int) $plugin->incompatible > 0) { if ((ctype_digit($plugin->incompatible) || is_int($plugin->incompatible)) && (int) $plugin->incompatible > 0) {
$this->pluginincompatible = intval($plugin->incompatible); $this->pluginincompatible = intval($plugin->incompatible);
} else { } else {
throw new coding_exception('Incorrect syntax in $plugin->incompatible in '."$this->name"); throw new coding_exception('Incorrect syntax in plugin incompatible declaration in '."$this->name");
} }
} }

4
lib/tests/plugininfo/base_test.php
View file

@ -81,7 +81,7 @@ class base_testcase extends \advanced_testcase {
$pluginman->add_fake_plugin_info($plugininfo); $pluginman->add_fake_plugin_info($plugininfo);
$this->expectException(\coding_exception::class); $this->expectException(\coding_exception::class);
$this->expectExceptionMessage('Incorrect syntax in $plugin->supported in example'); $this->expectExceptionMessage('Incorrect syntax in plugin supported declaration in example');
$plugininfo->load_disk_version(); $plugininfo->load_disk_version();
} }
@ -147,7 +147,7 @@ class base_testcase extends \advanced_testcase {
$pluginman->add_fake_plugin_info($plugininfo); $pluginman->add_fake_plugin_info($plugininfo);
$this->expectException(\coding_exception::class); $this->expectException(\coding_exception::class);
$this->expectExceptionMessage('Incorrect syntax in $plugin->incompatible in example'); $this->expectExceptionMessage('Incorrect syntax in plugin incompatible declaration in example');
$plugininfo->load_disk_version(); $plugininfo->load_disk_version();
} }