diff --git a/media/classes/manager.php b/media/classes/manager.php index 39bca4cf118..2b24d866f90 100644 --- a/media/classes/manager.php +++ b/media/classes/manager.php @@ -138,19 +138,10 @@ final class core_media_manager { } /** - * Setup page requirements. - * - * This should must only be called once per page request. - * - * @deprecated Moodle 3.3, The setup is now done in ::instance() so there is no need to call this - * @param moodle_page $page The page we are going to add requirements to. - * @see core_media_manager::instance() - * @todo MDL-57632 final deprecation + * @deprecated since Moodle 3.3. The setup is now done in ::instance() so there is no need to call this. */ - public function setup($page) { - debugging('core_media_manager::setup() is deprecated.' . - 'You only need to call core_media_manager::instance() now', DEBUG_DEVELOPER); - // No need to call ::instance from here, because the instance has already be set up. + public function setup() { + throw new coding_exception('core_media_manager::setup() can not be used any more because it is done in ::instance()'); } /** diff --git a/media/upgrade.txt b/media/upgrade.txt index 8e1594cf438..b49be628a77 100644 --- a/media/upgrade.txt +++ b/media/upgrade.txt @@ -1,8 +1,11 @@ This files describes API changes in /media/ plugins, information provided here is intended especially for developers. -=== 3.6 === +=== 3.8 === +* The final deprecation of core_media_manager::setup() means that this function will no longer be called. +The setup is now done in ::instance() so there is no need to call this. +=== 3.6 === * The following functions have been finally deprecated and can not be used anymore: * core_media_player::is_enabled() * core_media_player::compare_by_rank()