Merge branch 'MDL-81456-main' of https://github.com/andrewnicols/moodle

course/edit_form.php

@@ -1,9 +1,7 @@
 <?php
 
-use core\{
-    di,
-    hook,
-};
+use core\di;
+use core\hook;
 
 defined('MOODLE_INTERNAL') || die;
 

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;

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;
 

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();
 

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.

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");

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;

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;

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;