From 62c560dff23eecd00fdec5ca2fd4aadacc6498ca Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 9 Apr 2024 16:13:42 +0800
Subject: [PATCH] MDL-81456 core: Correct namespace imports

---
 course/edit_form.php                      | 6 ++----
 course/lib.php                            | 6 ++----
 course/modlib.php                         | 6 ++----
 lib/moodlelib.php                         | 6 ++----
 lib/phpunit/classes/advanced_testcase.php | 6 ++----
 lib/phpunit/classes/util.php              | 6 ++----
 mod/quiz/classes/grade_calculator.php     | 6 ++----
 mod/quiz/classes/quiz_attempt.php         | 6 ++----
 mod/quiz/locallib.php                     | 6 ++----
 9 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/course/edit_form.php b/course/edit_form.php
index 2e60b3a9ab9..a6e1f2edecf 100644
--- a/course/edit_form.php
+++ b/course/edit_form.php
@@ -1,9 +1,7 @@
 <?php
 
-use core\{
-    di,
-    hook,
-};
+use core\di;
+use core\hook;
 
 defined('MOODLE_INTERNAL') || die;
 
diff --git a/course/lib.php b/course/lib.php
index a4a5a4da1ba..bdf844aa7a3 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -24,10 +24,8 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-use core\{
-    di,
-    hook,
-};
+use core\di;
+use core\hook;
 use core_course\external\course_summary_exporter;
 use core_courseformat\base as course_format;
 use core_courseformat\formatactions;
diff --git a/course/modlib.php b/course/modlib.php
index 9ec24d70cb0..abeac43a848 100644
--- a/course/modlib.php
+++ b/course/modlib.php
@@ -27,10 +27,8 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-use core\{
-    di,
-    hook,
-};
+use core\di;
+use core\hook;
 use core_courseformat\formatactions;
 use core_grades\component_gradeitems;
 
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 2bd1749730a..f9286c372a3 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -28,10 +28,8 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-use core\{
-    di,
-    hook,
-};
+use core\di;
+use core\hook;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/lib/phpunit/classes/advanced_testcase.php b/lib/phpunit/classes/advanced_testcase.php
index 6e4716ac78f..dca7c404c4f 100644
--- a/lib/phpunit/classes/advanced_testcase.php
+++ b/lib/phpunit/classes/advanced_testcase.php
@@ -14,10 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-use core\{
-    di,
-    hook,
-};
+use core\di;
+use core\hook;
 
 /**
  * Advanced PHPUnit test case customised for Moodle.
diff --git a/lib/phpunit/classes/util.php b/lib/phpunit/classes/util.php
index 527036ce5be..22454da39f5 100644
--- a/lib/phpunit/classes/util.php
+++ b/lib/phpunit/classes/util.php
@@ -23,10 +23,8 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-use core\{
-    di,
-    hook,
-};
+use core\di;
+use core\hook;
 
 require_once(__DIR__.'/../../testing/classes/util.php');
 require_once(__DIR__ . "/coverage_info.php");
diff --git a/mod/quiz/classes/grade_calculator.php b/mod/quiz/classes/grade_calculator.php
index 69a8158ad91..a67de2bd8e7 100644
--- a/mod/quiz/classes/grade_calculator.php
+++ b/mod/quiz/classes/grade_calculator.php
@@ -17,10 +17,8 @@
 namespace mod_quiz;
 
 use coding_exception;
-use core\{
-    di,
-    hook,
-};
+use core\di;
+use core\hook;
 use mod_quiz\event\quiz_grade_updated;
 use mod_quiz\hook\structure_modified;
 use question_engine_data_mapper;
diff --git a/mod/quiz/classes/quiz_attempt.php b/mod/quiz/classes/quiz_attempt.php
index 6b93de93761..99b9f2ec4c5 100644
--- a/mod/quiz/classes/quiz_attempt.php
+++ b/mod/quiz/classes/quiz_attempt.php
@@ -21,10 +21,8 @@ use block_contents;
 use cm_info;
 use coding_exception;
 use context_module;
-use core\{
-    di,
-    hook,
-};
+use core\di;
+use core\hook;
 use Exception;
 use html_writer;
 use mod_quiz\hook\attempt_state_changed;
diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php
index 7d60989a26b..41ed9e9ddf0 100644
--- a/mod/quiz/locallib.php
+++ b/mod/quiz/locallib.php
@@ -35,10 +35,8 @@ require_once($CFG->libdir . '/completionlib.php');
 require_once($CFG->libdir . '/filelib.php');
 require_once($CFG->libdir . '/questionlib.php');
 
-use core\{
-    di,
-    hook,
-};
+use core\di;
+use core\hook;
 use core_question\local\bank\condition;
 use mod_quiz\access_manager;
 use mod_quiz\event\attempt_submitted;