version update

.github/workflows/main.yml

@@ -30,11 +30,11 @@ jobs:
       fail-fast: false
       matrix:
         php: ['8.1']
-        moodle-branch: ['MOODLE_402_STABLE']
+        moodle-branch: ['MOODLE_402_STABLE', 'MOODLE_403_STABLE']
         database: ['mariadb', 'pgsql']
         include:
           - php: '8.2'
-            moodle-branch: 'MOODLE_403_STABLE'
+            moodle-branch: 'main'
             database: 'pgsql'
 
     name: ${{ matrix.moodle-branch }}  php ${{ matrix.php }}  ${{ matrix.database }}
@@ -58,14 +58,6 @@ jobs:
           repository: catalyst/moodle-local_aws
           path: extras/local_aws
 
-      - name: npm cache
-        uses: actions/cache@v3
-        with:
-          path: ~/.npm
-          key: node-${{ matrix.php }}-${{ matrix.moodle-branch }}-${{ matrix.database }}-cache
-          restore-keys: |
-            node-${{ matrix.php }}-${{ matrix.moodle-branch }}-${{ matrix.database }}-cache
-
       - name: composer
         run: |
            composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci
@@ -87,10 +79,6 @@ jobs:
         if: ${{ !cancelled() }}
         run: moodle-plugin-ci --ansi phplint
 
-      - name: phpcpd
-        if: ${{ !cancelled() }}
-        run: moodle-plugin-ci --ansi phpcpd
-
       - name: phpmd
         if: ${{ !cancelled() }}
         run: moodle-plugin-ci --ansi phpmd

classes/engine.php

@@ -186,7 +186,7 @@ public function translate_section($sectionid): string {
      * @return string
      */
     public function translate_module($moduleid): string {
-        global $CFG, $DB;
+        global $CFG;
         require_once($CFG->libdir . '/questionlib.php');
         $modinfo = get_fast_modinfo($this->course->id, -1);
         $cm = $modinfo->cms[$moduleid];
@@ -218,31 +218,29 @@ public function translate_module($moduleid): string {
             case 'quiz':
                 $s .= $this->add_records('quiz_sections', 'quizid', $cm->instance, ['heading']);
                 $s .= $this->add_records('quiz_feedback', 'quizid', $cm->instance);
-                $slots = $CFG->version < 2022020300 ? $DB->get_records('quiz_slots', ['quizid' => $cm->instance]) :
-                     \mod_quiz\question\bank\qbank_helper::get_question_structure($cm->instance, $context);
-                foreach ($slots as $slot) {
-                    $sid = $slot->questionid;
-                    if (!is_integer($sid)) {
-                        continue;
+                $questions = \mod_quiz\question\bank\qbank_helper::get_question_structure($cm->instance, $context);
+                foreach ($questions as $question) {
+                    if ($question->questionid) {
+                        $sid = $question->questionid;
+                        $s .= $this->add_records('question', 'id', $sid);
+                        $s .= $this->add_records('question_answers', 'question', $sid);
+                        $s .= $this->add_records('question_hints', 'questionid', $sid);
+                        $s .= $this->add_records('question_order', 'question', $sid);
+                        $s .= $this->add_records('question_order_sub', 'question', $sid);
+                        $q = \question_bank::load_question($sid);
+                        $qt = get_class($q->qtype);
+                        // Brute force collect feedback.
+                        $s .= $this->add_records($qt, 'questionid', $sid);
+                        $s .= $this->add_records($qt . '_options' , 'questionid', $sid);
+                        $s .= $this->add_records($qt . '_answers' , 'questionid', $sid);
+                        $s .= $this->add_records($qt . '_subquestions' , 'questionid', $sid);
+                        $qt = str_ireplace('qtype', 'question', $qt);
+                        $s .= $this->add_records($qt, 'questionid', $sid);
+                        $s .= $this->add_records($qt, 'question', $sid);
+                        $s .= $this->add_records($qt . '_options' , 'questionid', $sid);
+                        $s .= $this->add_records($qt . '_answers' , 'questionid', $sid);
+                        $s .= $this->add_records($qt . '_subquestions' , 'questionid', $sid);
                     }
-                    $s .= $this->add_records('question', 'id', $sid);
-                    $s .= $this->add_records('question_answers', 'question', $sid);
-                    $s .= $this->add_records('question_hints', 'questionid', $sid);
-                    $s .= $this->add_records('question_order', 'question', $sid);
-                    $s .= $this->add_records('question_order_sub', 'question', $sid);
-                    $q = \question_bank::load_question($sid);
-                    $qt = get_class($q->qtype);
-                    // Brute force collect feedback.
-                    $s .= $this->add_records($qt, 'questionid', $sid);
-                    $s .= $this->add_records($qt . '_options' , 'questionid', $sid);
-                    $s .= $this->add_records($qt . '_answers' , 'questionid', $sid);
-                    $s .= $this->add_records($qt . '_subquestions' , 'questionid', $sid);
-                    $qt = str_ireplace('qtype', 'question', $qt);
-                    $s .= $this->add_records($qt, 'questionid', $sid);
-                    $s .= $this->add_records($qt, 'question', $sid);
-                    $s .= $this->add_records($qt . '_options' , 'questionid', $sid);
-                    $s .= $this->add_records($qt . '_answers' , 'questionid', $sid);
-                    $s .= $this->add_records($qt . '_subquestions' , 'questionid', $sid);
                 }
                 break;
         }

engine/aws/tests/other_test.php

@@ -33,7 +33,7 @@
  * @author    Renaat Debleu <info@eWallah.net>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class other_test extends \advanced_testcase {
+final class other_test extends \advanced_testcase {
 
     /** @var \stdClass course */
     private $course;

engine/aws/tests/privacy/privacy_test.php

@@ -35,7 +35,7 @@
  * @author    Renaat Debleu <info@eWallah.net>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class privacy_test extends provider_testcase {
+final class privacy_test extends provider_testcase {
 
     /**
      * Test returning metadata.

engine/aws/version.php

@@ -26,9 +26,9 @@
 defined('MOODLE_INTERNAL') || die;
 
 $plugin->component = 'translateengine_aws';
-$plugin->requires = 2022112800;
-$plugin->supported = [401, 403];
+$plugin->requires = 2023042400;
+$plugin->version = 2024031000;
+$plugin->supported = [402, 403];
 $plugin->maturity = MATURITY_STABLE;
-$plugin->release = 'v4.0.2';
-$plugin->version = 2024010200;
+$plugin->release = 'v4.2.1';
 $plugin->dependencies = ['tool_translate' => ANY_VERSION];

engine/deepl/tests/other_test.php

@@ -33,7 +33,7 @@
  * @author    Renaat Debleu <info@eWallah.net>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class other_test extends \advanced_testcase {
+final class other_test extends \advanced_testcase {
 
     /** @var \stdClass course */
     private $course;

engine/deepl/tests/privacy/privacy_test.php

@@ -35,7 +35,7 @@
  * @author    Renaat Debleu <info@eWallah.net>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class privacy_test extends provider_testcase {
+final class privacy_test extends provider_testcase {
 
     /**
      * Test returning metadata.

engine/deepl/version.php

@@ -27,8 +27,8 @@
 
 $plugin->component = 'translateengine_deepl';
 $plugin->dependencies = ['tool_translate' => ANY_VERSION];
-$plugin->requires = 2022112800;
-$plugin->supported = [401, 403];
+$plugin->requires = 2023042400;
+$plugin->version = 2024031000;
+$plugin->supported = [402, 403];
 $plugin->maturity = MATURITY_STABLE;
-$plugin->release = 'v4.0.2';
-$plugin->version = 2024010200;
+$plugin->release = 'v4.2.1';

engine/google/tests/other_test.php

@@ -33,7 +33,7 @@
  * @author    Renaat Debleu <info@eWallah.net>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class other_test extends \advanced_testcase {
+final class other_test extends \advanced_testcase {
 
     /** @var \stdClass course */
     private $course;

engine/google/tests/privacy/privacy_test.php

@@ -35,7 +35,7 @@
  * @author    Renaat Debleu <info@eWallah.net>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class privacy_test extends provider_testcase {
+final class privacy_test extends provider_testcase {
 
     /**
      * Test returning metadata.

engine/google/version.php

@@ -27,8 +27,8 @@
 
 $plugin->component = 'translateengine_google';
 $plugin->dependencies = ['tool_translate' => ANY_VERSION];
-$plugin->requires = 2022112800;
-$plugin->supported = [401, 403];
+$plugin->requires = 2023042400;
+$plugin->version = 2024031000;
+$plugin->supported = [402, 403];
 $plugin->maturity = MATURITY_STABLE;
-$plugin->release = 'v4.0.2';
-$plugin->version = 2024010200;
+$plugin->release = 'v4.2.1';

lang/en/tool_translate.php

@@ -45,3 +45,4 @@
 $string['translate'] = 'Translate';
 $string['translate:translate'] = 'Translate a course';
 $string['words'] = 'Words';
+$string['subplugintype_translateengine'] = 'Translate engine';

tests/event/event_test.php

@@ -38,7 +38,7 @@
  * @author    Renaat Debleu <info@eWallah.net>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class event_test extends advanced_testcase {
+final class event_test extends advanced_testcase {
 
     /**
      * Test the tool viewed event.

tests/include_test.php

@@ -33,7 +33,7 @@
  * @author    Renaat Debleu <info@eWallah.net>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class include_test extends \advanced_testcase {
+final class include_test extends \advanced_testcase {
 
     /**
      * Test the adminmanageplugins.

tests/library_test.php

@@ -36,7 +36,7 @@
  * @author    Renaat Debleu <info@eWallah.net>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class library_test extends advanced_testcase {
+final class library_test extends advanced_testcase {
 
     /**
      * Test the library.

tests/other_test.php

@@ -38,7 +38,7 @@
  * @author    Renaat Debleu <info@eWallah.net>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class other_test extends advanced_testcase {
+final class other_test extends advanced_testcase {
 
     /** @var \stdClass course */
     private $course;
@@ -190,7 +190,7 @@ public function test_engine(): void {
         $engine->sourcelang = 'en';
         $engine->targetlang = 'fr';
         $this->assertStringContainsString('Course with id', $engine->translate_other());
-        $this->assertEquals('Topic with id 1 translated', $engine->translate_section(1));
+        $this->assertStringContainsString('with id 1 translated', $engine->translate_section(1));
         $this->assertStringContainsString('Module with id', $engine->translate_module($book->cmid));
         $this->assertStringContainsString('Module with id', $engine->translate_module($lesson->cmid));
         $this->assertStringContainsString('Module with id', $engine->translate_module($page->cmid));

tests/output/table_test.php

@@ -37,7 +37,7 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @coversDefaultClass \tool_translate\translation_table
  */
-class table_test extends advanced_testcase {
+final class table_test extends advanced_testcase {
 
     /**
      * Setup testcase.
@@ -73,6 +73,7 @@ public function test_table(): void {
         $glossarygenerator->create_content($glossary, ['concept' => 'Custom concept']);
         $gen->create_module('choice', ['course' => $course->id]);
         $gen->create_module('forum', ['course' => $course->id]);
+        $gen->create_module('resource', ['course' => $course->id]);
 
         ob_start();
         $table = new translation_table($course);

tests/privacy/privacy_test.php

@@ -36,7 +36,7 @@
  * @author    Renaat Debleu <info@eWallah.net>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class privacy_test extends provider_testcase {
+final class privacy_test extends provider_testcase {
 
     /**
      * Test returning metadata.

version.php

@@ -26,9 +26,9 @@
 defined('MOODLE_INTERNAL') || die;
 
 $plugin->component = 'tool_translate';
-$plugin->requires = 2022112800;
-$plugin->supported = [401, 403];
+$plugin->requires = 2023042400;
+$plugin->supported = [402, 403];
 $plugin->maturity = MATURITY_STABLE;
-$plugin->release = 'v4.0.2';
-$plugin->version = 2024010200;
+$plugin->release = 'v4.2.1';
+$plugin->version = 2024031000;
 $plugin->dependencies = ['local_aws' => ANY_VERSION];