From 5f93155c8c83b26c210a1571ad041b220d3745f3 Mon Sep 17 00:00:00 2001 From: Carlos Castillo Date: Tue, 11 Jun 2024 12:21:00 +0200 Subject: [PATCH] MDL-82133 reportbuilder: Move out RB exceptions to the L2 namespace --- .upgradenotes/MDL-82133-2024061206555177.yml | 10 ++++++++++ lib/db/renamedclasses.php | 4 ++++ .../{ => exception}/report_access_exception.php | 2 +- .../{ => exception}/source_invalid_exception.php | 2 +- .../{ => exception}/source_unavailable_exception.php | 2 +- .../classes/external/systemreports/can_view.php | 2 +- reportbuilder/classes/form/audience.php | 2 +- reportbuilder/classes/form/condition.php | 2 +- reportbuilder/classes/form/filter.php | 2 +- reportbuilder/classes/form/report.php | 2 +- reportbuilder/classes/form/schedule.php | 2 +- reportbuilder/classes/local/audiences/base.php | 2 +- reportbuilder/classes/manager.php | 1 + reportbuilder/classes/permission.php | 1 + reportbuilder/classes/system_report.php | 1 + reportbuilder/classes/system_report_factory.php | 1 + reportbuilder/download.php | 2 +- reportbuilder/tests/external/audiences/delete_test.php | 2 +- reportbuilder/tests/external/columns/add_test.php | 2 +- reportbuilder/tests/external/columns/delete_test.php | 2 +- reportbuilder/tests/external/columns/reorder_test.php | 2 +- reportbuilder/tests/external/columns/sort/get_test.php | 2 +- .../tests/external/columns/sort/reorder_test.php | 2 +- .../tests/external/columns/sort/toggle_test.php | 2 +- reportbuilder/tests/external/conditions/add_test.php | 2 +- .../tests/external/conditions/delete_test.php | 2 +- .../tests/external/conditions/reorder_test.php | 2 +- reportbuilder/tests/external/conditions/reset_test.php | 2 +- reportbuilder/tests/external/filters/add_test.php | 2 +- reportbuilder/tests/external/filters/delete_test.php | 2 +- reportbuilder/tests/external/filters/reorder_test.php | 2 +- reportbuilder/tests/external/filters/reset_test.php | 2 +- reportbuilder/tests/external/filters/set_test.php | 2 +- reportbuilder/tests/external/reports/delete_test.php | 2 +- reportbuilder/tests/external/reports/get_test.php | 2 +- reportbuilder/tests/external/reports/listing_test.php | 2 +- reportbuilder/tests/external/reports/retrieve_test.php | 2 +- reportbuilder/tests/external/reports/view_test.php | 2 +- reportbuilder/tests/external/schedules/delete_test.php | 2 +- reportbuilder/tests/external/schedules/send_test.php | 2 +- reportbuilder/tests/external/schedules/toggle_test.php | 2 +- .../tests/external/systemreports/retrieve_test.php | 2 +- reportbuilder/tests/manager_test.php | 1 + .../tests/output/audience_heading_editable_test.php | 2 +- .../tests/output/column_aggregation_editable_test.php | 2 +- .../tests/output/column_heading_editable_test.php | 2 +- .../tests/output/filter_heading_editable_test.php | 2 +- .../tests/output/report_name_editable_test.php | 2 +- .../tests/output/schedule_name_editable_test.php | 2 +- reportbuilder/tests/permission_test.php | 1 + reportbuilder/tests/system_report_factory_test.php | 1 + 51 files changed, 63 insertions(+), 42 deletions(-) create mode 100644 .upgradenotes/MDL-82133-2024061206555177.yml rename reportbuilder/classes/{ => exception}/report_access_exception.php (96%) rename reportbuilder/classes/{ => exception}/source_invalid_exception.php (96%) rename reportbuilder/classes/{ => exception}/source_unavailable_exception.php (96%) diff --git a/.upgradenotes/MDL-82133-2024061206555177.yml b/.upgradenotes/MDL-82133-2024061206555177.yml new file mode 100644 index 00000000000..ba82fd833b1 --- /dev/null +++ b/.upgradenotes/MDL-82133-2024061206555177.yml @@ -0,0 +1,10 @@ +issueNumber: MDL-82133 +notes: + core_reportbuilder: + - message: >- + The following classes have been moved to use the new exception API as a l2 namespace: + + - `core_reportbuilder\\report_access_exception` => `core_reportbuilder\\exception\\report_access_exception` + - `core_reportbuilder\\source_invalid_exception` => `core_reportbuilder\\exception\\source_invalid_exception` + - `core_reportbuilder\\source_unavailable_exception` => `core_reportbuilder\\exception\\source_unavailable_exception` + type: changed diff --git a/lib/db/renamedclasses.php b/lib/db/renamedclasses.php index 791f4191d56..afaff2205fc 100644 --- a/lib/db/renamedclasses.php +++ b/lib/db/renamedclasses.php @@ -49,4 +49,8 @@ $renamedclasses = [ 'core_question\\bank\\search\\condition' => 'core_question\\local\\bank\\condition', 'core_question\\bank\\search\\category_condition' => 'qbank_managecategories\\category_condition', 'core_question\\bank\\search\\hidden_condition' => 'qbank_deletequestion\\hidden_condition', + // Since Moodle 4.5. + 'core_reportbuilder\\report_access_exception' => 'core_reportbuilder\\exception\\report_access_exception', + 'core_reportbuilder\\source_invalid_exception' => 'core_reportbuilder\\exception\\source_invalid_exception', + 'core_reportbuilder\\source_unavailable_exception' => 'core_reportbuilder\\exception\\source_unavailable_exception', ]; diff --git a/reportbuilder/classes/report_access_exception.php b/reportbuilder/classes/exception/report_access_exception.php similarity index 96% rename from reportbuilder/classes/report_access_exception.php rename to reportbuilder/classes/exception/report_access_exception.php index 80e5c0ef88f..55208fc11c1 100644 --- a/reportbuilder/classes/report_access_exception.php +++ b/reportbuilder/classes/exception/report_access_exception.php @@ -16,7 +16,7 @@ declare(strict_types=1); -namespace core_reportbuilder; +namespace core_reportbuilder\exception; use moodle_exception; diff --git a/reportbuilder/classes/source_invalid_exception.php b/reportbuilder/classes/exception/source_invalid_exception.php similarity index 96% rename from reportbuilder/classes/source_invalid_exception.php rename to reportbuilder/classes/exception/source_invalid_exception.php index 6edd067a1f4..973bf015f30 100644 --- a/reportbuilder/classes/source_invalid_exception.php +++ b/reportbuilder/classes/exception/source_invalid_exception.php @@ -16,7 +16,7 @@ declare(strict_types=1); -namespace core_reportbuilder; +namespace core_reportbuilder\exception; use moodle_exception; diff --git a/reportbuilder/classes/source_unavailable_exception.php b/reportbuilder/classes/exception/source_unavailable_exception.php similarity index 96% rename from reportbuilder/classes/source_unavailable_exception.php rename to reportbuilder/classes/exception/source_unavailable_exception.php index dc439a691be..f7f53ef8bc1 100644 --- a/reportbuilder/classes/source_unavailable_exception.php +++ b/reportbuilder/classes/exception/source_unavailable_exception.php @@ -16,7 +16,7 @@ declare(strict_types=1); -namespace core_reportbuilder; +namespace core_reportbuilder\exception; use moodle_exception; diff --git a/reportbuilder/classes/external/systemreports/can_view.php b/reportbuilder/classes/external/systemreports/can_view.php index c953440eb4e..3035866d9c6 100644 --- a/reportbuilder/classes/external/systemreports/can_view.php +++ b/reportbuilder/classes/external/systemreports/can_view.php @@ -23,7 +23,7 @@ use core_external\external_multiple_structure; use core_external\external_single_structure; use core_external\external_function_parameters; use core_external\external_value; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\system_report_factory; /** diff --git a/reportbuilder/classes/form/audience.php b/reportbuilder/classes/form/audience.php index c9d97487665..2ea18652438 100644 --- a/reportbuilder/classes/form/audience.php +++ b/reportbuilder/classes/form/audience.php @@ -99,7 +99,7 @@ class audience extends dynamic_form { /** * Ensure current user is able to use this form * - * A {@see \core_reportbuilder\report_access_exception} will be thrown if they can't + * A {@see \core_reportbuilder\exception\report_access_exception} will be thrown if they can't */ protected function check_access_for_dynamic_submission(): void { $audience = $this->get_audience(); diff --git a/reportbuilder/classes/form/condition.php b/reportbuilder/classes/form/condition.php index 224cc529aff..0ee0a6475fe 100644 --- a/reportbuilder/classes/form/condition.php +++ b/reportbuilder/classes/form/condition.php @@ -59,7 +59,7 @@ class condition extends dynamic_form { /** * Ensure current user is able to use this form * - * A {@see \core_reportbuilder\report_access_exception} will be thrown if they can't + * A {@see \core_reportbuilder\exception\report_access_exception} will be thrown if they can't */ protected function check_access_for_dynamic_submission(): void { permission::require_can_edit_report($this->get_report()->get_report_persistent()); diff --git a/reportbuilder/classes/form/filter.php b/reportbuilder/classes/form/filter.php index 58860926e9d..890964ee16a 100644 --- a/reportbuilder/classes/form/filter.php +++ b/reportbuilder/classes/form/filter.php @@ -60,7 +60,7 @@ class filter extends dynamic_form { /** * Ensure current user is able to use this form * - * A {@see \core_reportbuilder\report_access_exception} will be thrown if they can't + * A {@see \core_reportbuilder\exception\report_access_exception} will be thrown if they can't */ protected function check_access_for_dynamic_submission(): void { $reportpersistent = $this->get_report()->get_report_persistent(); diff --git a/reportbuilder/classes/form/report.php b/reportbuilder/classes/form/report.php index 8d70cea0389..fa5dbc1d660 100644 --- a/reportbuilder/classes/form/report.php +++ b/reportbuilder/classes/form/report.php @@ -74,7 +74,7 @@ class report extends dynamic_form { /** * Ensure current user is able to use this form * - * A {@see \core_reportbuilder\report_access_exception} will be thrown if they can't + * A {@see \core_reportbuilder\exception\report_access_exception} will be thrown if they can't */ protected function check_access_for_dynamic_submission(): void { $report = $this->get_custom_report(); diff --git a/reportbuilder/classes/form/schedule.php b/reportbuilder/classes/form/schedule.php index 3169a03e2ae..a9be825e83f 100644 --- a/reportbuilder/classes/form/schedule.php +++ b/reportbuilder/classes/form/schedule.php @@ -62,7 +62,7 @@ class schedule extends dynamic_form { /** * Ensure current user is able to use this form * - * A {@see \core_reportbuilder\report_access_exception} will be thrown if they can't + * A {@see \core_reportbuilder\exception\report_access_exception} will be thrown if they can't */ protected function check_access_for_dynamic_submission(): void { $persistent = $this->get_report()->get_report_persistent(); diff --git a/reportbuilder/classes/local/audiences/base.php b/reportbuilder/classes/local/audiences/base.php index fba9d21f224..41f9a546002 100644 --- a/reportbuilder/classes/local/audiences/base.php +++ b/reportbuilder/classes/local/audiences/base.php @@ -25,7 +25,7 @@ use core\output\notification; use core_reportbuilder\external\custom_report_audience_cards_exporter; use core_reportbuilder\local\helpers\database; use core_reportbuilder\local\models\audience; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; /** * Audience base class diff --git a/reportbuilder/classes/manager.php b/reportbuilder/classes/manager.php index 51b7b06db14..2a51e62ec44 100644 --- a/reportbuilder/classes/manager.php +++ b/reportbuilder/classes/manager.php @@ -24,6 +24,7 @@ use core_plugin_manager; use stdClass; use core_reportbuilder\local\models\report; use core_reportbuilder\local\report\base; +use core_reportbuilder\exception\{source_invalid_exception, source_unavailable_exception}; /** * Report management class diff --git a/reportbuilder/classes/permission.php b/reportbuilder/classes/permission.php index edf588c24cd..8ca222f319a 100644 --- a/reportbuilder/classes/permission.php +++ b/reportbuilder/classes/permission.php @@ -20,6 +20,7 @@ namespace core_reportbuilder; use context; use context_system; +use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\helpers\audience; use core_reportbuilder\local\models\report; use core_reportbuilder\local\report\base; diff --git a/reportbuilder/classes/system_report.php b/reportbuilder/classes/system_report.php index ba2c9ade561..6ac6931e62d 100644 --- a/reportbuilder/classes/system_report.php +++ b/reportbuilder/classes/system_report.php @@ -20,6 +20,7 @@ namespace core_reportbuilder; use action_menu_filler; use coding_exception; +use core_reportbuilder\exception\report_access_exception; use html_writer; use stdClass; use core\output\checkbox_toggleall; diff --git a/reportbuilder/classes/system_report_factory.php b/reportbuilder/classes/system_report_factory.php index 36cbb4a15a0..d71bc26669c 100644 --- a/reportbuilder/classes/system_report_factory.php +++ b/reportbuilder/classes/system_report_factory.php @@ -21,6 +21,7 @@ namespace core_reportbuilder; use context; use core_reportbuilder\local\models\report; use core_reportbuilder\local\report\base; +use core_reportbuilder\exception\source_invalid_exception; /** * Factory class for creating system report instances diff --git a/reportbuilder/download.php b/reportbuilder/download.php index 249c8a4241d..cb05a3d1ac1 100644 --- a/reportbuilder/download.php +++ b/reportbuilder/download.php @@ -49,7 +49,7 @@ if ($reportpersistent->get('type') === \core_reportbuilder\local\report\base::TY $reportpersistent->get('area'), $reportpersistent->get('itemid'), $parameters); if (!$systemreport->can_be_downloaded()) { - throw new \core_reportbuilder\report_access_exception(); + throw new \core_reportbuilder\exception\report_access_exception(); } // Combine original report parameters with 'download' parameter. diff --git a/reportbuilder/tests/external/audiences/delete_test.php b/reportbuilder/tests/external/audiences/delete_test.php index 8d87c303092..3929132424d 100644 --- a/reportbuilder/tests/external/audiences/delete_test.php +++ b/reportbuilder/tests/external/audiences/delete_test.php @@ -23,7 +23,7 @@ use core_reportbuilder\local\models\audience; use core_reportbuilder_generator; use core_external\external_api; use externallib_advanced_testcase; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_user\reportbuilder\datasource\users; defined('MOODLE_INTERNAL') || die(); diff --git a/reportbuilder/tests/external/columns/add_test.php b/reportbuilder/tests/external/columns/add_test.php index f8ca3651dd1..6070772fb83 100644 --- a/reportbuilder/tests/external/columns/add_test.php +++ b/reportbuilder/tests/external/columns/add_test.php @@ -21,7 +21,7 @@ namespace core_reportbuilder\external\columns; use core_reportbuilder_generator; use core_external\external_api; use externallib_advanced_testcase; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\column; use core_user\reportbuilder\datasource\users; diff --git a/reportbuilder/tests/external/columns/delete_test.php b/reportbuilder/tests/external/columns/delete_test.php index 5ba8d9ab454..08312f29b6a 100644 --- a/reportbuilder/tests/external/columns/delete_test.php +++ b/reportbuilder/tests/external/columns/delete_test.php @@ -21,7 +21,7 @@ namespace core_reportbuilder\external\columns; use core_reportbuilder_generator; use core_external\external_api; use externallib_advanced_testcase; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\column; use core_user\reportbuilder\datasource\users; diff --git a/reportbuilder/tests/external/columns/reorder_test.php b/reportbuilder/tests/external/columns/reorder_test.php index ad727883b05..98d7e65b1e7 100644 --- a/reportbuilder/tests/external/columns/reorder_test.php +++ b/reportbuilder/tests/external/columns/reorder_test.php @@ -21,7 +21,7 @@ namespace core_reportbuilder\external\columns; use core_reportbuilder_generator; use core_external\external_api; use externallib_advanced_testcase; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\column; use core_user\reportbuilder\datasource\users; diff --git a/reportbuilder/tests/external/columns/sort/get_test.php b/reportbuilder/tests/external/columns/sort/get_test.php index 55dc1973471..f34952669c2 100644 --- a/reportbuilder/tests/external/columns/sort/get_test.php +++ b/reportbuilder/tests/external/columns/sort/get_test.php @@ -21,7 +21,7 @@ namespace core_reportbuilder\external\columns\sort; use core_reportbuilder_generator; use core_external\external_api; use externallib_advanced_testcase; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_user\reportbuilder\datasource\users; defined('MOODLE_INTERNAL') || die(); diff --git a/reportbuilder/tests/external/columns/sort/reorder_test.php b/reportbuilder/tests/external/columns/sort/reorder_test.php index 226cb2f21e1..54822407640 100644 --- a/reportbuilder/tests/external/columns/sort/reorder_test.php +++ b/reportbuilder/tests/external/columns/sort/reorder_test.php @@ -21,7 +21,7 @@ namespace core_reportbuilder\external\columns\sort; use core_reportbuilder_generator; use core_external\external_api; use externallib_advanced_testcase; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\column; use core_user\reportbuilder\datasource\users; diff --git a/reportbuilder/tests/external/columns/sort/toggle_test.php b/reportbuilder/tests/external/columns/sort/toggle_test.php index dd5bb53d4a4..c9c11b8124c 100644 --- a/reportbuilder/tests/external/columns/sort/toggle_test.php +++ b/reportbuilder/tests/external/columns/sort/toggle_test.php @@ -21,7 +21,7 @@ namespace core_reportbuilder\external\columns\sort; use core_reportbuilder_generator; use core_external\external_api; use externallib_advanced_testcase; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\column; use core_user\reportbuilder\datasource\users; diff --git a/reportbuilder/tests/external/conditions/add_test.php b/reportbuilder/tests/external/conditions/add_test.php index fc89ad9f472..fa932ac150a 100644 --- a/reportbuilder/tests/external/conditions/add_test.php +++ b/reportbuilder/tests/external/conditions/add_test.php @@ -21,7 +21,7 @@ namespace core_reportbuilder\external\conditions; use core_reportbuilder_generator; use core_external\external_api; use externallib_advanced_testcase; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\filter; use core_user\reportbuilder\datasource\users; diff --git a/reportbuilder/tests/external/conditions/delete_test.php b/reportbuilder/tests/external/conditions/delete_test.php index dc236aac8f0..2b487722ee7 100644 --- a/reportbuilder/tests/external/conditions/delete_test.php +++ b/reportbuilder/tests/external/conditions/delete_test.php @@ -21,7 +21,7 @@ namespace core_reportbuilder\external\conditions; use core_reportbuilder_generator; use core_external\external_api; use externallib_advanced_testcase; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\filter; use core_user\reportbuilder\datasource\users; diff --git a/reportbuilder/tests/external/conditions/reorder_test.php b/reportbuilder/tests/external/conditions/reorder_test.php index f87513d7893..47717cbf717 100644 --- a/reportbuilder/tests/external/conditions/reorder_test.php +++ b/reportbuilder/tests/external/conditions/reorder_test.php @@ -21,7 +21,7 @@ namespace core_reportbuilder\external\conditions; use core_reportbuilder_generator; use core_external\external_api; use externallib_advanced_testcase; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\filter; use core_user\reportbuilder\datasource\users; diff --git a/reportbuilder/tests/external/conditions/reset_test.php b/reportbuilder/tests/external/conditions/reset_test.php index de423e2a5f7..5c6a6e1fe39 100644 --- a/reportbuilder/tests/external/conditions/reset_test.php +++ b/reportbuilder/tests/external/conditions/reset_test.php @@ -22,7 +22,7 @@ use core_reportbuilder_generator; use core_external\external_api; use externallib_advanced_testcase; use core_reportbuilder\manager; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_user\reportbuilder\datasource\users; defined('MOODLE_INTERNAL') || die(); diff --git a/reportbuilder/tests/external/filters/add_test.php b/reportbuilder/tests/external/filters/add_test.php index 4e60a4aeca0..32114cec5b3 100644 --- a/reportbuilder/tests/external/filters/add_test.php +++ b/reportbuilder/tests/external/filters/add_test.php @@ -22,7 +22,7 @@ use core_reportbuilder\manager; use core_reportbuilder_generator; use core_external\external_api; use externallib_advanced_testcase; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\filter; use core_user\reportbuilder\datasource\users; diff --git a/reportbuilder/tests/external/filters/delete_test.php b/reportbuilder/tests/external/filters/delete_test.php index ec51832bf02..07a58d2be3f 100644 --- a/reportbuilder/tests/external/filters/delete_test.php +++ b/reportbuilder/tests/external/filters/delete_test.php @@ -21,7 +21,7 @@ namespace core_reportbuilder\external\filters; use core_reportbuilder_generator; use core_external\external_api; use externallib_advanced_testcase; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\filter; use core_user\reportbuilder\datasource\users; diff --git a/reportbuilder/tests/external/filters/reorder_test.php b/reportbuilder/tests/external/filters/reorder_test.php index a05c52dd2c3..3f7cef39221 100644 --- a/reportbuilder/tests/external/filters/reorder_test.php +++ b/reportbuilder/tests/external/filters/reorder_test.php @@ -21,7 +21,7 @@ namespace core_reportbuilder\external\filters; use core_reportbuilder_generator; use core_external\external_api; use externallib_advanced_testcase; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\filter; use core_user\reportbuilder\datasource\users; diff --git a/reportbuilder/tests/external/filters/reset_test.php b/reportbuilder/tests/external/filters/reset_test.php index 94a24d1fdfe..17e80be87df 100644 --- a/reportbuilder/tests/external/filters/reset_test.php +++ b/reportbuilder/tests/external/filters/reset_test.php @@ -20,7 +20,7 @@ namespace core_reportbuilder\external\filters; use core_reportbuilder_generator; use core_reportbuilder\manager; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_external\external_api; use externallib_advanced_testcase; use core_user\reportbuilder\datasource\users; diff --git a/reportbuilder/tests/external/filters/set_test.php b/reportbuilder/tests/external/filters/set_test.php index 758a92f372c..0703883180f 100644 --- a/reportbuilder/tests/external/filters/set_test.php +++ b/reportbuilder/tests/external/filters/set_test.php @@ -20,7 +20,7 @@ namespace core_reportbuilder\external\filters; use core_reportbuilder_generator; use core_reportbuilder\manager; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_external\external_api; use externallib_advanced_testcase; use core_user\reportbuilder\datasource\users; diff --git a/reportbuilder/tests/external/reports/delete_test.php b/reportbuilder/tests/external/reports/delete_test.php index 592c9f26332..d8788474e60 100644 --- a/reportbuilder/tests/external/reports/delete_test.php +++ b/reportbuilder/tests/external/reports/delete_test.php @@ -21,7 +21,7 @@ namespace core_reportbuilder\external\reports; use core_reportbuilder_generator; use core_external\external_api; use externallib_advanced_testcase; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\report; use core_user\reportbuilder\datasource\users; diff --git a/reportbuilder/tests/external/reports/get_test.php b/reportbuilder/tests/external/reports/get_test.php index db56fd7098e..a4214cea125 100644 --- a/reportbuilder/tests/external/reports/get_test.php +++ b/reportbuilder/tests/external/reports/get_test.php @@ -22,7 +22,7 @@ use context_system; use core_reportbuilder_generator; use core_external\external_api; use externallib_advanced_testcase; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_user\reportbuilder\datasource\users; defined('MOODLE_INTERNAL') || die(); diff --git a/reportbuilder/tests/external/reports/listing_test.php b/reportbuilder/tests/external/reports/listing_test.php index 99f32ce0ec4..36edd28882d 100644 --- a/reportbuilder/tests/external/reports/listing_test.php +++ b/reportbuilder/tests/external/reports/listing_test.php @@ -22,7 +22,7 @@ use context_system; use core_reportbuilder_generator; use core_external\external_api; use externallib_advanced_testcase; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\report; use core_user\reportbuilder\datasource\users; diff --git a/reportbuilder/tests/external/reports/retrieve_test.php b/reportbuilder/tests/external/reports/retrieve_test.php index 9c27cfa5337..44e89bd188f 100644 --- a/reportbuilder/tests/external/reports/retrieve_test.php +++ b/reportbuilder/tests/external/reports/retrieve_test.php @@ -21,7 +21,7 @@ namespace core_reportbuilder\external\reports; use core_reportbuilder_generator; use core_external\external_api; use externallib_advanced_testcase; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_user\reportbuilder\datasource\users; defined('MOODLE_INTERNAL') || die(); diff --git a/reportbuilder/tests/external/reports/view_test.php b/reportbuilder/tests/external/reports/view_test.php index a2b165de4fd..7ebb61ffeba 100644 --- a/reportbuilder/tests/external/reports/view_test.php +++ b/reportbuilder/tests/external/reports/view_test.php @@ -22,7 +22,7 @@ use core_reportbuilder_generator; use core_external\external_api; use externallib_advanced_testcase; use core_reportbuilder\event\report_viewed; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\report; use core_user\reportbuilder\datasource\users; diff --git a/reportbuilder/tests/external/schedules/delete_test.php b/reportbuilder/tests/external/schedules/delete_test.php index 3bfdea2f0f7..42ac60b754a 100644 --- a/reportbuilder/tests/external/schedules/delete_test.php +++ b/reportbuilder/tests/external/schedules/delete_test.php @@ -21,7 +21,7 @@ namespace core_reportbuilder\external\schedules; use core_reportbuilder_generator; use core_external\external_api; use externallib_advanced_testcase; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_user\reportbuilder\datasource\users; defined('MOODLE_INTERNAL') || die(); diff --git a/reportbuilder/tests/external/schedules/send_test.php b/reportbuilder/tests/external/schedules/send_test.php index 6ec59e27bce..fe42bc64548 100644 --- a/reportbuilder/tests/external/schedules/send_test.php +++ b/reportbuilder/tests/external/schedules/send_test.php @@ -21,7 +21,7 @@ namespace core_reportbuilder\external\schedules; use core_reportbuilder_generator; use core_external\external_api; use externallib_advanced_testcase; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\task\send_schedule; use core_user\reportbuilder\datasource\users; diff --git a/reportbuilder/tests/external/schedules/toggle_test.php b/reportbuilder/tests/external/schedules/toggle_test.php index b5bdc4f9493..dd561cd77fc 100644 --- a/reportbuilder/tests/external/schedules/toggle_test.php +++ b/reportbuilder/tests/external/schedules/toggle_test.php @@ -21,7 +21,7 @@ namespace core_reportbuilder\external\schedules; use core_reportbuilder_generator; use core_external\external_api; use externallib_advanced_testcase; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_user\reportbuilder\datasource\users; defined('MOODLE_INTERNAL') || die(); diff --git a/reportbuilder/tests/external/systemreports/retrieve_test.php b/reportbuilder/tests/external/systemreports/retrieve_test.php index 0a410ad6bf0..c9d1d2c5718 100644 --- a/reportbuilder/tests/external/systemreports/retrieve_test.php +++ b/reportbuilder/tests/external/systemreports/retrieve_test.php @@ -22,7 +22,7 @@ use core\context\system; use core_reportbuilder_generator; use core_external\external_api; use externallib_advanced_testcase; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\systemreports\reports_list; use core_user\reportbuilder\datasource\users; diff --git a/reportbuilder/tests/manager_test.php b/reportbuilder/tests/manager_test.php index 68d01b9eb4c..2d1b313f563 100644 --- a/reportbuilder/tests/manager_test.php +++ b/reportbuilder/tests/manager_test.php @@ -25,6 +25,7 @@ use core_user\reportbuilder\datasource\users; use stdClass; use core_reportbuilder\local\models\report; use core_reportbuilder\local\report\base; +use core_reportbuilder\exception\{source_invalid_exception, source_unavailable_exception}; defined('MOODLE_INTERNAL') || die(); diff --git a/reportbuilder/tests/output/audience_heading_editable_test.php b/reportbuilder/tests/output/audience_heading_editable_test.php index 266cb49b99a..675c2daf3c2 100644 --- a/reportbuilder/tests/output/audience_heading_editable_test.php +++ b/reportbuilder/tests/output/audience_heading_editable_test.php @@ -20,7 +20,7 @@ namespace core_reportbuilder\output; use advanced_testcase; use core_reportbuilder_generator; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_user\reportbuilder\datasource\users; /** diff --git a/reportbuilder/tests/output/column_aggregation_editable_test.php b/reportbuilder/tests/output/column_aggregation_editable_test.php index 1c7bf1dbd87..2670448bd52 100644 --- a/reportbuilder/tests/output/column_aggregation_editable_test.php +++ b/reportbuilder/tests/output/column_aggregation_editable_test.php @@ -20,7 +20,7 @@ namespace core_reportbuilder\output; use advanced_testcase; use core_reportbuilder_generator; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_user\reportbuilder\datasource\users; /** diff --git a/reportbuilder/tests/output/column_heading_editable_test.php b/reportbuilder/tests/output/column_heading_editable_test.php index 9f02bb10109..f7875b66c4a 100644 --- a/reportbuilder/tests/output/column_heading_editable_test.php +++ b/reportbuilder/tests/output/column_heading_editable_test.php @@ -20,7 +20,7 @@ namespace core_reportbuilder\output; use advanced_testcase; use core_reportbuilder_generator; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_user\reportbuilder\datasource\users; /** diff --git a/reportbuilder/tests/output/filter_heading_editable_test.php b/reportbuilder/tests/output/filter_heading_editable_test.php index f4d5d5af5e4..ebfbeb097cd 100644 --- a/reportbuilder/tests/output/filter_heading_editable_test.php +++ b/reportbuilder/tests/output/filter_heading_editable_test.php @@ -20,7 +20,7 @@ namespace core_reportbuilder\output; use advanced_testcase; use core_reportbuilder_generator; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_user\reportbuilder\datasource\users; /** diff --git a/reportbuilder/tests/output/report_name_editable_test.php b/reportbuilder/tests/output/report_name_editable_test.php index 78aac9d72c9..62f5bde700a 100644 --- a/reportbuilder/tests/output/report_name_editable_test.php +++ b/reportbuilder/tests/output/report_name_editable_test.php @@ -20,7 +20,7 @@ namespace core_reportbuilder\output; use advanced_testcase; use core_reportbuilder_generator; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_user\reportbuilder\datasource\users; /** diff --git a/reportbuilder/tests/output/schedule_name_editable_test.php b/reportbuilder/tests/output/schedule_name_editable_test.php index 639626de94a..6be13abfa9f 100644 --- a/reportbuilder/tests/output/schedule_name_editable_test.php +++ b/reportbuilder/tests/output/schedule_name_editable_test.php @@ -20,7 +20,7 @@ namespace core_reportbuilder\output; use advanced_testcase; use core_reportbuilder_generator; -use core_reportbuilder\report_access_exception; +use core_reportbuilder\exception\report_access_exception; use core_user\reportbuilder\datasource\users; /** diff --git a/reportbuilder/tests/permission_test.php b/reportbuilder/tests/permission_test.php index f0806880b89..6f4e70d24e8 100644 --- a/reportbuilder/tests/permission_test.php +++ b/reportbuilder/tests/permission_test.php @@ -20,6 +20,7 @@ namespace core_reportbuilder; use advanced_testcase; use context_system; +use core_reportbuilder\exception\report_access_exception; use core_reportbuilder_generator; use Throwable; use core_user\reportbuilder\datasource\users; diff --git a/reportbuilder/tests/system_report_factory_test.php b/reportbuilder/tests/system_report_factory_test.php index 96245be9cac..ae8102ea892 100644 --- a/reportbuilder/tests/system_report_factory_test.php +++ b/reportbuilder/tests/system_report_factory_test.php @@ -21,6 +21,7 @@ namespace core_reportbuilder; use advanced_testcase; use context_system; use stdClass; +use core_reportbuilder\exception\{source_invalid_exception, source_unavailable_exception}; /** * Unit tests for the system report factory class