Merge branch 'VID-677'

.github/workflows/moodle-ci.yml

@@ -29,22 +29,16 @@ jobs:
       matrix:
         include:
           - php: '8.0'
-            moodle-branch: 'MOODLE_401_STABLE'
+            moodle-branch: 'master'
             database: 'pgsql'
           - php: '8.0'
-            moodle-branch: 'MOODLE_401_STABLE'
+            moodle-branch: 'master'
             database: 'mariadb'
           - php: '8.0'
-            moodle-branch: 'MOODLE_400_STABLE'
+            moodle-branch: 'MOODLE_402_STABLE'
             database: 'pgsql'
-          - php: '7.4'
-            moodle-branch: 'MOODLE_311_STABLE'
-            database: 'mariadb'
-          - php: '7.4'
-            moodle-branch: 'MOODLE_310_STABLE'
-            database: 'pgsql'
-          - php: '7.3'
-            moodle-branch: 'MOODLE_39_STABLE'
+          - php: '8.0'
+            moodle-branch: 'MOODLE_402_STABLE'
             database: 'mariadb'
 
     steps:
@@ -107,7 +101,7 @@ jobs:
         run: moodle-plugin-ci mustache
 
       - name: Grunt
-        if: ${{ matrix.moodle-branch == 'MOODLE_401_STABLE' }}
+        if: ${{ matrix.moodle-branch == 'MOODLE_402_STABLE' }}
         run: moodle-plugin-ci grunt
 
       - name: PHPUnit tests

classes/external/external.php

@@ -24,11 +24,7 @@
 
 namespace mod_videotime\external;
 
-defined('MOODLE_INTERNAL') || die();
-
-require_once($CFG->libdir.'/externallib.php');
-
-use external_api;
+use core_external\external_api;
 
 /**
  * Web service and ajax functions.

classes/external/get_videotime.php

@@ -24,14 +24,12 @@
 
 namespace mod_videotime\external;
 
-defined('MOODLE_INTERNAL') || die();
-
-use external_api;
+use core_external\external_api;
+use core_external\external_function_parameters;
+use core_external\external_single_structure;
+use core_external\external_value;
 use mod_videotime\videotime_instance;
 
-require_once($CFG->libdir.'/externallib.php');
-require_once($CFG->dirroot.'/mod/videotime/lib.php');
-
 /**
  * Get videotime instance object for cm.
  */
@@ -43,8 +41,8 @@ trait get_videotime {
      * @return external_function_parameters
      */
     public static function get_videotime_parameters() {
-        return new \external_function_parameters([
-            'cmid' => new \external_value(PARAM_INT, 'Course module ID', VALUE_REQUIRED)
+        return new external_function_parameters([
+            'cmid' => new external_value(PARAM_INT, 'Course module ID', VALUE_REQUIRED)
         ]);
     }
 

classes/external/view_videotime.php

@@ -26,10 +26,12 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-use external_api;
+use core_external\external_api;
+use core_external\external_function_parameters;
+use core_external\external_single_structure;
+use core_external\external_value;
 use mod_videotime\videotime_instance;
 
-require_once($CFG->libdir.'/externallib.php');
 require_once($CFG->dirroot.'/mod/videotime/lib.php');
 
 /**
@@ -43,8 +45,8 @@ trait view_videotime {
      * @return external_function_parameters
      */
     public static function view_videotime_parameters() {
-        return new \external_function_parameters([
-            'cmid' => new \external_value(PARAM_INT, 'Course module ID.')
+        return new external_function_parameters([
+            'cmid' => new external_value(PARAM_INT, 'Course module ID.')
         ]);
     }
 

classes/plugininfo/videotimeplugin.php

@@ -53,7 +53,7 @@ public function available_updates() {
                 $info = array(
                     'maturity' => MATURITY_STABLE,
                     'release' => '1.7.1',
-                    'version' => 2023011202,
+                    'version' => 2023050100,
                 );
                 break;
             case 'repository':

version.php

@@ -26,7 +26,6 @@
 
 $plugin->component = 'mod_videotime';
 $plugin->release = '1.7.3';
-$plugin->version = 2023011207;
-$plugin->incompatible = 402;
-$plugin->requires = 2015111610;
+$plugin->version = 2023050101;
+$plugin->requires = 2023042400;
 $plugin->maturity = MATURITY_STABLE;