Merge branch 'MDL-70898-311' of git://github.com/marinaglancy/moodle …

…into MOODLE_311_STABLE
moodle · Mar 1, 2021 · 81761af · 81761af
2 parents 241cf14 + dbb31d1
commit 81761af
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/analytics/classes/default_bulk_actions.php b/analytics/classes/default_bulk_actions.php
@@ -116,7 +116,7 @@ public static function not_useful() {
      *
      * @return array
      */
-    private static final function bulk_action_base_attrs() {
+    private static function bulk_action_base_attrs() {
         return [
             'disabled' => 'disabled',
             'data-toggle' => 'action',

diff --git a/backup/util/ui/classes/copy/copy.php b/backup/util/ui/classes/copy/copy.php
@@ -95,7 +95,7 @@ public function __construct(\stdClass $formdata) {
      * @param \stdClass $formdata Data from the validated course copy form.
      * @return array $keptroles The roles to keep.
      */
-    private final function get_enrollment_roles(\stdClass $formdata): array {
+    private function get_enrollment_roles(\stdClass $formdata): array {
         $keptroles = array();
 
         foreach ($formdata as $key => $value) {
@@ -114,7 +114,7 @@ private final function get_enrollment_roles(\stdClass $formdata): array {
      * @return \stdClass $copydata Data required for course copy operations.
      * @throws \moodle_exception If one of the required copy fields is missing
      */
-    private final function get_copy_data(\stdClass $formdata): \stdClass {
+    private function get_copy_data(\stdClass $formdata): \stdClass {
         $copydata = new \stdClass();
 
         foreach ($this->copyfields as $field) {