diff --git a/admin/classes/reportbuilder/local/entities/task_log.php b/admin/classes/reportbuilder/local/entities/task_log.php index b276d591496..8cc6cdf2bfc 100644 --- a/admin/classes/reportbuilder/local/entities/task_log.php +++ b/admin/classes/reportbuilder/local/entities/task_log.php @@ -46,12 +46,14 @@ class task_log extends base { protected const FAILED = 1; /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { - return ['task_log' => 'tl']; + protected function get_default_tables(): array { + return [ + 'task_log', + ]; } /** diff --git a/admin/roles/classes/reportbuilder/local/entities/role.php b/admin/roles/classes/reportbuilder/local/entities/role.php index 34a699349c6..e83516c6f70 100644 --- a/admin/roles/classes/reportbuilder/local/entities/role.php +++ b/admin/roles/classes/reportbuilder/local/entities/role.php @@ -34,14 +34,14 @@ use core_reportbuilder\local\report\{column, filter}; class role extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { + protected function get_default_tables(): array { return [ - 'context' => 'rctx', - 'role' => 'r', + 'context', + 'role', ]; } diff --git a/badges/classes/reportbuilder/local/entities/badge.php b/badges/classes/reportbuilder/local/entities/badge.php index 4f5f42b1b2b..820a5c2ffcb 100644 --- a/badges/classes/reportbuilder/local/entities/badge.php +++ b/badges/classes/reportbuilder/local/entities/badge.php @@ -44,16 +44,16 @@ require_once("{$CFG->libdir}/badgeslib.php"); class badge extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { + protected function get_default_tables(): array { return [ - 'badge' => 'b', - 'context' => 'bctx', - 'tag_instance' => 'bti', - 'tag' => 'bt', + 'badge', + 'context', + 'tag_instance', + 'tag', ]; } diff --git a/badges/classes/reportbuilder/local/entities/badge_issued.php b/badges/classes/reportbuilder/local/entities/badge_issued.php index fd5df1d0bd8..4fb3a73463d 100644 --- a/badges/classes/reportbuilder/local/entities/badge_issued.php +++ b/badges/classes/reportbuilder/local/entities/badge_issued.php @@ -34,12 +34,14 @@ use core_reportbuilder\local\report\{column, filter}; class badge_issued extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { - return ['badge_issued' => 'bi']; + protected function get_default_tables(): array { + return [ + 'badge_issued', + ]; } /** diff --git a/blog/classes/reportbuilder/local/entities/blog.php b/blog/classes/reportbuilder/local/entities/blog.php index fa771641171..43ceb049a5e 100644 --- a/blog/classes/reportbuilder/local/entities/blog.php +++ b/blog/classes/reportbuilder/local/entities/blog.php @@ -38,15 +38,15 @@ use core_reportbuilder\local\report\{column, filter}; class blog extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { + protected function get_default_tables(): array { return [ - 'post' => 'bp', - 'tag_instance' => 'bti', - 'tag' => 'bt', + 'post', + 'tag_instance', + 'tag', ]; } diff --git a/cohort/classes/reportbuilder/local/entities/cohort.php b/cohort/classes/reportbuilder/local/entities/cohort.php index aae80cc9e36..d3e5b5517c5 100644 --- a/cohort/classes/reportbuilder/local/entities/cohort.php +++ b/cohort/classes/reportbuilder/local/entities/cohort.php @@ -42,14 +42,14 @@ use core_reportbuilder\local\report\filter; class cohort extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { + protected function get_default_tables(): array { return [ - 'cohort' => 'c', - 'context' => 'chctx', + 'cohort', + 'context', ]; } diff --git a/cohort/classes/reportbuilder/local/entities/cohort_member.php b/cohort/classes/reportbuilder/local/entities/cohort_member.php index 3d82cad7a28..3e16e994420 100644 --- a/cohort/classes/reportbuilder/local/entities/cohort_member.php +++ b/cohort/classes/reportbuilder/local/entities/cohort_member.php @@ -35,12 +35,14 @@ use core_reportbuilder\local\report\filter; class cohort_member extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { - return ['cohort_members' => 'cm']; + protected function get_default_tables(): array { + return [ + 'cohort_members', + ]; } /** diff --git a/comment/classes/reportbuilder/local/entities/comment.php b/comment/classes/reportbuilder/local/entities/comment.php index 8ae7d1d7443..659035e8b8d 100644 --- a/comment/classes/reportbuilder/local/entities/comment.php +++ b/comment/classes/reportbuilder/local/entities/comment.php @@ -38,14 +38,14 @@ use core_reportbuilder\local\report\{column, filter}; class comment extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { + protected function get_default_tables(): array { return [ - 'comments' => 'c', - 'context' => 'cmctx', + 'comments', + 'context', ]; } diff --git a/course/classes/reportbuilder/local/entities/access.php b/course/classes/reportbuilder/local/entities/access.php index 3b38073bb56..ee493be2f4c 100644 --- a/course/classes/reportbuilder/local/entities/access.php +++ b/course/classes/reportbuilder/local/entities/access.php @@ -36,12 +36,15 @@ use stdClass; class access extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { - return ['user_lastaccess' => 'ula', 'user' => 'u']; + protected function get_default_tables(): array { + return [ + 'user_lastaccess', + 'user', + ]; } /** diff --git a/course/classes/reportbuilder/local/entities/completion.php b/course/classes/reportbuilder/local/entities/completion.php index 0c21c4ab70d..38e9629598e 100644 --- a/course/classes/reportbuilder/local/entities/completion.php +++ b/course/classes/reportbuilder/local/entities/completion.php @@ -42,17 +42,17 @@ use stdClass; class completion extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { + protected function get_default_tables(): array { return [ - 'course_completion' => 'ccomp', - 'course' => 'c', - 'grade_grades' => 'gg', - 'grade_items' => 'gi', - 'user' => 'u', + 'course_completion', + 'course', + 'grade_grades' , + 'grade_items', + 'user', ]; } diff --git a/course/classes/reportbuilder/local/entities/course_category.php b/course/classes/reportbuilder/local/entities/course_category.php index 54e02e52210..965baf83035 100644 --- a/course/classes/reportbuilder/local/entities/course_category.php +++ b/course/classes/reportbuilder/local/entities/course_category.php @@ -40,14 +40,14 @@ use core_reportbuilder\local\report\filter; class course_category extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { + protected function get_default_tables(): array { return [ - 'context' => 'ccctx', - 'course_categories' => 'cc', + 'context', + 'course_categories', ]; } diff --git a/course/classes/reportbuilder/local/entities/enrolment.php b/course/classes/reportbuilder/local/entities/enrolment.php index 0d2ee75f7ac..b0ba4a47291 100644 --- a/course/classes/reportbuilder/local/entities/enrolment.php +++ b/course/classes/reportbuilder/local/entities/enrolment.php @@ -42,12 +42,15 @@ use stdClass; class enrolment extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { - return ['user_enrolments' => 'ue', 'enrol' => 'e']; + protected function get_default_tables(): array { + return [ + 'user_enrolments', + 'enrol', + ]; } /** diff --git a/enrol/classes/reportbuilder/local/entities/enrol.php b/enrol/classes/reportbuilder/local/entities/enrol.php index 7d6f4eff505..e3d8236029f 100644 --- a/enrol/classes/reportbuilder/local/entities/enrol.php +++ b/enrol/classes/reportbuilder/local/entities/enrol.php @@ -34,13 +34,13 @@ use core_reportbuilder\local\report\{column, filter}; class enrol extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { + protected function get_default_tables(): array { return [ - 'enrol' => 'e', + 'enrol', ]; } diff --git a/files/classes/reportbuilder/local/entities/file.php b/files/classes/reportbuilder/local/entities/file.php index a598567668c..489fe73ef29 100644 --- a/files/classes/reportbuilder/local/entities/file.php +++ b/files/classes/reportbuilder/local/entities/file.php @@ -41,14 +41,14 @@ use core_reportbuilder\local\report\{column, filter}; class file extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { + protected function get_default_tables(): array { return [ - 'files' => 'f', - 'context' => 'fctx', + 'files', + 'context', ]; } diff --git a/grade/report/summary/classes/local/entities/grade_items.php b/grade/report/summary/classes/local/entities/grade_items.php index 1733a0c0df3..38c7951f625 100644 --- a/grade/report/summary/classes/local/entities/grade_items.php +++ b/grade/report/summary/classes/local/entities/grade_items.php @@ -59,12 +59,14 @@ class grade_items extends base { } /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { - return ['grade_items' => 'gi']; + protected function get_default_tables(): array { + return [ + 'grade_items', + ]; } /** diff --git a/group/classes/reportbuilder/local/entities/group.php b/group/classes/reportbuilder/local/entities/group.php index caeb2825969..ad0097ca1c5 100644 --- a/group/classes/reportbuilder/local/entities/group.php +++ b/group/classes/reportbuilder/local/entities/group.php @@ -44,14 +44,14 @@ require_once("{$CFG->libdir}/grouplib.php"); class group extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { + protected function get_default_tables(): array { return [ - 'context' => 'gctx', - 'groups' => 'g', + 'context', + 'groups', ]; } diff --git a/group/classes/reportbuilder/local/entities/group_member.php b/group/classes/reportbuilder/local/entities/group_member.php index 0139bee11ef..8eea70e2d4d 100644 --- a/group/classes/reportbuilder/local/entities/group_member.php +++ b/group/classes/reportbuilder/local/entities/group_member.php @@ -34,13 +34,13 @@ use core_reportbuilder\local\report\{column, filter}; class group_member extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { + protected function get_default_tables(): array { return [ - 'groups_members' => 'gm', + 'groups_members', ]; } diff --git a/group/classes/reportbuilder/local/entities/grouping.php b/group/classes/reportbuilder/local/entities/grouping.php index 5dcea958553..39570820bc0 100644 --- a/group/classes/reportbuilder/local/entities/grouping.php +++ b/group/classes/reportbuilder/local/entities/grouping.php @@ -37,14 +37,14 @@ use core_reportbuilder\local\report\{column, filter}; class grouping extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { + protected function get_default_tables(): array { return [ - 'context' => 'ggctx', - 'groupings' => 'gg', + 'context', + 'groupings', ]; } diff --git a/lib/classes/reportbuilder/local/entities/context.php b/lib/classes/reportbuilder/local/entities/context.php index 2e085109a66..9acf790ee68 100644 --- a/lib/classes/reportbuilder/local/entities/context.php +++ b/lib/classes/reportbuilder/local/entities/context.php @@ -36,12 +36,14 @@ use stdClass; class context extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { - return ['context' => 'ctx']; + protected function get_default_tables(): array { + return [ + 'context', + ]; } /** diff --git a/mod/lti/classes/reportbuilder/local/entities/tool_types.php b/mod/lti/classes/reportbuilder/local/entities/tool_types.php index 82d719cdb6b..4780f4156e6 100644 --- a/mod/lti/classes/reportbuilder/local/entities/tool_types.php +++ b/mod/lti/classes/reportbuilder/local/entities/tool_types.php @@ -35,12 +35,15 @@ use core_reportbuilder\local\report\filter; class tool_types extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { - return ['lti_types' => 'tt', 'lti' => 'ti']; + protected function get_default_tables(): array { + return [ + 'lti_types', + 'lti', + ]; } /** diff --git a/notes/classes/reportbuilder/local/entities/note.php b/notes/classes/reportbuilder/local/entities/note.php index d8b421c45e6..0bc05b30fb1 100644 --- a/notes/classes/reportbuilder/local/entities/note.php +++ b/notes/classes/reportbuilder/local/entities/note.php @@ -40,12 +40,14 @@ require_once("{$CFG->dirroot}/notes/lib.php"); class note extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { - return ['post' => 'np']; + protected function get_default_tables(): array { + return [ + 'post', + ]; } /** diff --git a/report/configlog/classes/reportbuilder/local/entities/config_change.php b/report/configlog/classes/reportbuilder/local/entities/config_change.php index 5d3665c131f..adfcc9870e9 100644 --- a/report/configlog/classes/reportbuilder/local/entities/config_change.php +++ b/report/configlog/classes/reportbuilder/local/entities/config_change.php @@ -36,12 +36,14 @@ use core_reportbuilder\local\filters\text; class config_change extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { - return ['config_log' => 'cl']; + protected function get_default_tables(): array { + return [ + 'config_log', + ]; } /** diff --git a/reportbuilder/classes/local/entities/course.php b/reportbuilder/classes/local/entities/course.php index 787264c6360..20f8b67b5e3 100644 --- a/reportbuilder/classes/local/entities/course.php +++ b/reportbuilder/classes/local/entities/course.php @@ -50,16 +50,16 @@ require_once($CFG->dirroot . '/course/lib.php'); class course extends base { /** - * Database tables that this entity uses and their default aliases. + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { + protected function get_default_tables(): array { return [ - 'course' => 'c', - 'context' => 'cctx', - 'tag_instance' => 'cti', - 'tag' => 'ct', + 'course', + 'context', + 'tag_instance', + 'tag', ]; } diff --git a/reportbuilder/classes/local/entities/user.php b/reportbuilder/classes/local/entities/user.php index 5b7c3299a04..dc5ff943322 100644 --- a/reportbuilder/classes/local/entities/user.php +++ b/reportbuilder/classes/local/entities/user.php @@ -50,16 +50,16 @@ use core_reportbuilder\local\report\filter; class user extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { + protected function get_default_tables(): array { return [ - 'user' => 'u', - 'context' => 'uctx', - 'tag_instance' => 'uti', - 'tag' => 'ut', + 'user', + 'context', + 'tag_instance', + 'tag', ]; } diff --git a/tag/classes/reportbuilder/local/entities/collection.php b/tag/classes/reportbuilder/local/entities/collection.php index 05c8f81ea7e..4bfb55de4a6 100644 --- a/tag/classes/reportbuilder/local/entities/collection.php +++ b/tag/classes/reportbuilder/local/entities/collection.php @@ -36,12 +36,14 @@ use core_reportbuilder\local\report\{column, filter}; class collection extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { - return ['tag_coll' => 'tc']; + protected function get_default_tables(): array { + return [ + 'tag_coll', + ]; } /** diff --git a/tag/classes/reportbuilder/local/entities/instance.php b/tag/classes/reportbuilder/local/entities/instance.php index d1e89cd44cf..46cceeaa8be 100644 --- a/tag/classes/reportbuilder/local/entities/instance.php +++ b/tag/classes/reportbuilder/local/entities/instance.php @@ -40,14 +40,14 @@ use core_reportbuilder\local\report\{column, filter}; class instance extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { + protected function get_default_tables(): array { return [ - 'tag_instance' => 'ti', - 'context' => 'tictx', + 'tag_instance', + 'context', ]; } diff --git a/tag/classes/reportbuilder/local/entities/tag.php b/tag/classes/reportbuilder/local/entities/tag.php index ebc9395e5cf..e132c6a0104 100644 --- a/tag/classes/reportbuilder/local/entities/tag.php +++ b/tag/classes/reportbuilder/local/entities/tag.php @@ -38,12 +38,14 @@ use core_reportbuilder\local\report\{column, filter}; class tag extends base { /** - * Database tables that this entity uses and their default aliases + * Database tables that this entity uses * - * @return array + * @return string[] */ - protected function get_default_table_aliases(): array { - return ['tag' => 't']; + protected function get_default_tables(): array { + return [ + 'tag', + ]; } /**