Merge pull request #1725 from maths/dev

Release of STACK 4.12.0.

Author: sangwinc

.github/workflows/moodle-ci.yml

@@ -33,39 +33,40 @@ jobs:
         # We use a mix of SBCL and GCL.
         include:
           - php: '8.4'
-            moodle-branch: 'main'
+            moodle-branch: 'MOODLE_502_STABLE'
             database: 'pgsql'
             maxima: 'GCL'
-            moodle-app: true
+            moodle-app: false
           - php: '8.4'
             moodle-branch: 'MOODLE_501_STABLE'
             database: 'pgsql'
-            maxima: 'GCL'
-            moodle-app: true
+            maxima: 'SBCL'
+            moodle-app: false
           - php: '8.2'
             moodle-branch: 'MOODLE_500_STABLE'
             database: 'pgsql'
             maxima: 'SBCL'
-            moodle-app: true
+            moodle-app: false
           # Edinburgh is planning to run the setup below for 2025-26.
           - php: '8.2'
             moodle-branch: 'MOODLE_405_STABLE'
             database: 'mariadb'
             maxima: 'GCL'
-            moodle-app: true
-          - php: '7.4'
-            moodle-branch: 'MOODLE_401_STABLE'
+            moodle-app: false
+          # Note, Moodle 4.2 will run on PHP 8.0, but we require PHP 8.1 or newer.
+          - php: '8.1'
+            moodle-branch: 'MOODLE_402_STABLE'
             database: 'pgsql'
             maxima: 'GCL'
-            moodle-app: true
+            moodle-app: false
 
     steps:
       - name: Install Maxima (${{ matrix.maxima }})
         run: |
           maxima="${{ (matrix.maxima == 'SBCL' && 'sbcl') || 'gcl' }}"
           wget http://mirrors.kernel.org/ubuntu/pool/main/r/readline/libreadline7_7.0-3_amd64.deb \
-               https://sourceforge.net/projects/maxima/files/Maxima-Linux/5.42.2-Linux/maxima-common_5.42.2-1_all.deb \
-               https://sourceforge.net/projects/maxima/files/Maxima-Linux/5.42.2-Linux/maxima-${maxima}_5.42.2-1_amd64.deb
+               https://sourceforge.net/projects/maxima/files/Maxima-Linux-RPM/5.42.2-Linux/maxima-common_5.42.2-1_all.deb \
+               https://sourceforge.net/projects/maxima/files/Maxima-Linux-RPM/5.42.2-Linux/maxima-${maxima}_5.42.2-1_amd64.deb
 
           sudo locale-gen en_AU.UTF-8
           sudo apt-get install libtinfo5
@@ -119,11 +120,13 @@ jobs:
           sudo locale-gen en_AU.UTF-8
           echo "NVM_DIR=$HOME/.nvm" >> $GITHUB_ENV
 
-      - name: Install moodle-plugin-ci
+      - name: Install moodle-plugin-ci (full unit tests)
+        if: ${{ matrix.moodle-branch == 'main' }}
         run: |
           moodle-plugin-ci add-plugin maths/moodle-qbehaviour_dfexplicitvaildate
           moodle-plugin-ci add-plugin maths/moodle-qbehaviour_dfcbmexplicitvaildate
           moodle-plugin-ci add-plugin maths/moodle-qbehaviour_adaptivemultipart
+          moodle-plugin-ci add-plugin maths/moodle-qbank_importasversion
 
           moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1
 
@@ -145,57 +148,123 @@ jobs:
           # Try a command on the command line.
           # echo "1+1; quit();" | timeout --kill-after=100s 100s ${{ github.workspace }}/maxima_opt_auto -eval '(cl-user::run)' 
 
+        env:
+          DB: ${{ matrix.database }}
+          MOODLE_BRANCH: ${{ matrix.moodle-branch }}
+
+      - name: Install moodle-plugin-ci (light unit tests & moodle app)
+        if: ${{ matrix.moodle-branch != 'main' &&  matrix.moodle-app == true}}
+        run: |
+          moodle-plugin-ci add-plugin maths/moodle-qbehaviour_dfexplicitvaildate
+          moodle-plugin-ci add-plugin maths/moodle-qbehaviour_dfcbmexplicitvaildate
+          moodle-plugin-ci add-plugin maths/moodle-qbehaviour_adaptivemultipart
+          moodle-plugin-ci add-plugin maths/moodle-qbank_importasversion
+
+          moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1
+
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_MAXIMAVERSION",       "5.42.2");'
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_MAXIMACOMMAND",       "maxima");'
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_MAXIMACOMMANDOPT",    "timeout --kill-after=10s 10s ${{ github.workspace }}/maxima_opt_auto -eval '\''(cl-user::run)'\''");'
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_MAXIMACOMMANDSERVER", "http://pool.home:8080/MaximaPool/MaximaPool");'
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_CASTIMEOUT",          "100");'
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_MAXIMALIBRARIES",     "stats, distrib, descriptive, simplex");'
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_CASPREPARSE", "true");'
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_PLATFORM",            "linux-optimised");'
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_CASRESULTSCACHE",     "db");'
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_PLOTCOMMAND",         "");'
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_CASDEBUGGING",        "0");'
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_CI_LIGHT",            "1");'
+
+          #cat ${{ github.workspace }}/moodle/config.php
+
+          cp ${{ github.workspace }}/moodledata/phpu_moodledata/stack/maxima_opt_auto ${{ github.workspace }}/maxima_opt_auto
+          # Try a command on the command line.
+          # echo "1+1; quit();" | timeout --kill-after=100s 100s ${{ github.workspace }}/maxima_opt_auto -eval '(cl-user::run)' 
+
+        env:
+          DB: ${{ matrix.database }}
+          MOODLE_BRANCH: ${{ matrix.moodle-branch }}
+          MOODLE_APP: 'true'
+
+      - name: Install moodle-plugin-ci (light unit tests & no moodle app)
+        if: ${{ matrix.moodle-branch != 'main' &&  matrix.moodle-app != true}}
+        run: |
+          moodle-plugin-ci add-plugin maths/moodle-qbehaviour_dfexplicitvaildate
+          moodle-plugin-ci add-plugin maths/moodle-qbehaviour_dfcbmexplicitvaildate
+          moodle-plugin-ci add-plugin maths/moodle-qbehaviour_adaptivemultipart
+          moodle-plugin-ci add-plugin maths/moodle-qbank_importasversion
+
+          moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1
+
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_MAXIMAVERSION",       "5.42.2");'
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_MAXIMACOMMAND",       "maxima");'
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_MAXIMACOMMANDOPT",    "timeout --kill-after=10s 10s ${{ github.workspace }}/maxima_opt_auto -eval '\''(cl-user::run)'\''");'
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_MAXIMACOMMANDSERVER", "http://pool.home:8080/MaximaPool/MaximaPool");'
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_CASTIMEOUT",          "100");'
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_MAXIMALIBRARIES",     "stats, distrib, descriptive, simplex");'
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_CASPREPARSE", "true");'
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_PLATFORM",            "linux-optimised");'
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_CASRESULTSCACHE",     "db");'
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_PLOTCOMMAND",         "");'
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_CASDEBUGGING",        "0");'
+          moodle-plugin-ci add-config 'define("QTYPE_STACK_TEST_CONFIG_CI_LIGHT",            "1");'
+
+          #cat ${{ github.workspace }}/moodle/config.php
+
+          cp ${{ github.workspace }}/moodledata/phpu_moodledata/stack/maxima_opt_auto ${{ github.workspace }}/maxima_opt_auto
+          # Try a command on the command line.
+          # echo "1+1; quit();" | timeout --kill-after=100s 100s ${{ github.workspace }}/maxima_opt_auto -eval '(cl-user::run)' 
 
         env:
           DB: ${{ matrix.database }}
           MOODLE_BRANCH: ${{ matrix.moodle-branch }}
-          MOODLE_APP: ${{ matrix.moodle-app }}
 
       - name: PHP Lint
-        if: ${{ always() }}
+        if: ${{ matrix.moodle-branch == 'main' || matrix.moodle-branch == 'MOODLE_502_STABLE'}}
         run: moodle-plugin-ci phplint
 
       - name: PHP Copy/Paste Detector
         continue-on-error: true # This step will show errors but will not fail.
-        if: ${{ always() }}
+        if: ${{ matrix.moodle-branch == 'main' || matrix.moodle-branch == 'MOODLE_502_STABLE'}}
         run: moodle-plugin-ci phpcpd
 
       - name: PHP Mess Detector
         continue-on-error: true # This step will show errors but will not fail.
-        if: ${{ always() }}
+        if: ${{ matrix.moodle-branch == 'main' || matrix.moodle-branch == 'MOODLE_502_STABLE'}}
         run: moodle-plugin-ci phpmd
 
       - name: Moodle Code Checker
         continue-on-error: true # Currently fails. We really ought to get this passing.
-        if: ${{ always() }}
+        if: ${{ matrix.moodle-branch == 'main' || matrix.moodle-branch == 'MOODLE_502_STABLE'}}
         run: moodle-plugin-ci codechecker --max-warnings 0
 
       - name: Moodle PHPDoc Checker
         continue-on-error: true # Currently fails. We really ought to get this passing.
-        if: ${{ always() }}
+        if: ${{ matrix.moodle-branch == 'main' || matrix.moodle-branch == 'MOODLE_502_STABLE'}}
         run: moodle-plugin-ci phpdoc
 
       - name: Validating
-        if: ${{ always() }}
+        if: ${{ matrix.moodle-branch == 'main' || matrix.moodle-branch == 'MOODLE_502_STABLE'}}
         run: moodle-plugin-ci validate
 
       - name: Check upgrade savepoints
-        if: ${{ always() }}
+        if: ${{ matrix.moodle-branch == 'main' || matrix.moodle-branch == 'MOODLE_502_STABLE'}}
         run: moodle-plugin-ci savepoints
 
       - name: Mustache Lint
-        if: ${{ always() }}
+        if: ${{ matrix.moodle-branch == 'main' || matrix.moodle-branch == 'MOODLE_502_STABLE'}}
         run: moodle-plugin-ci mustache
 
       - name: Grunt
-        if: ${{ matrix.moodle-branch == 'MOODLE_500_STABLE' }}
+        if: ${{ matrix.moodle-branch == 'main' || matrix.moodle-branch == 'MOODLE_502_STABLE'}}
         run: moodle-plugin-ci grunt
 
       - name: PHPUnit tests
+        #if: ${{ matrix.moodle-branch == 'main' || matrix.moodle-branch == 'MOODLE_405_STABLE'}}
         if: ${{ always() }}
         run: moodle-plugin-ci phpunit
 
       - name: Behat features
         if: ${{ always() }}
-        run: moodle-plugin-ci behat --profile chrome --auto-rerun 6
+        run: moodle-plugin-ci behat --profile chrome --auto-rerun 12
 

Readme.md

@@ -1,4 +1,4 @@
-# STACK 4.11.1
+# STACK 4.12.0
 
 STACK is an assessment system for mathematics, science and related disciplines.  STACK is a question type for the Moodle learning management system, and also the ILIAS learning management system.  STACK has an API for stand-alone integration into other 3rd party systems.
 

adminui/answertests.php

@@ -28,11 +28,11 @@
 
 define('NO_OUTPUT_BUFFERING', true);
 
-require_once(__DIR__.'/../../../../config.php');
-require_once($CFG->dirroot .'/course/lib.php');
+require_once(__DIR__ . '/../../../../config.php');
+require_once($CFG->dirroot . '/course/lib.php');
 require_once($CFG->libdir . '/questionlib.php');
-require_once($CFG->libdir .'/filelib.php');
-require_once($CFG->libdir .'/tablelib.php');
+require_once($CFG->libdir . '/filelib.php');
+require_once($CFG->libdir . '/tablelib.php');
 
 require_once(__DIR__ . '/../locallib.php');
 require_once(__DIR__ . '/../stack/options.class.php');
@@ -109,7 +109,6 @@
 
 $oldtest = '';
 foreach ($tests as $test) {
-
     $notests++;
 
     if ($oldtest != $test->name) {
@@ -128,7 +127,7 @@
     }
 
     set_time_limit(30);
-    list($passed, $error, $rawmark, $feedback, $ansnote, $expectednote, $trace)
+    [$passed, $error, $rawmark, $feedback, $ansnote, $expectednote, $trace]
         = stack_answertest_test_data::run_test($test);
     $allpassed = $allpassed && $passed;
 
@@ -187,14 +186,14 @@
     $took = (microtime(true) - $start);
     $rtook = round($took, 5);
     $pertest = round($took / $notests, 5);
-    echo '<p>'.stack_string('testsuitenotests', ['no' => $notests]);
-    echo '<br/>'.stack_string('testsuiteteststook', ['time' => $rtook]);
-    echo '<br/>'.stack_string('testsuiteteststookeach', ['time' => $pertest]);
+    echo '<p>' . stack_string('testsuitenotests', ['no' => $notests]);
+    echo '<br/>' . stack_string('testsuiteteststook', ['time' => $rtook]);
+    echo '<br/>' . stack_string('testsuiteteststookeach', ['time' => $pertest]);
     echo '</p>';
 
     $config = get_config('qtype_stack');
     echo html_writer::tag('p', stack_string('healthcheckcache_' . $config->casresultscache));
-    echo html_writer::tag('p',  stack_string('settingcasmaximaversion').': '.$config->maximaversion);
+    echo html_writer::tag('p', stack_string('settingcasmaximaversion') . ': ' . $config->maximaversion);
 }
 
 if ($anstest) {

adminui/bulktest.php

@@ -73,16 +73,24 @@
 echo $OUTPUT->heading($title);
 
 // Run the tests.
-list($allpassed, $failing) = $bulktester->run_all_tests_for_context(
-    $context, $categoryid, 'web', false, $skippreviouspasses, $addtags);
+[$allpassed, $failing] = $bulktester->run_all_tests_for_context(
+    $context,
+    $categoryid,
+    'web',
+    false,
+    $skippreviouspasses,
+    $addtags
+);
 
 // Display the final summary.
 $bulktester->print_overall_result($allpassed, $failing);
 
 // If we used the cache, report state.
 if (class_exists('stack_cas_connection_db_cache')) {
-    echo html_writer::tag('p', stack_string('healthcheckcachestatus',
-            stack_cas_connection_db_cache::entries_count($DB)));
+    echo html_writer::tag('p', stack_string(
+        'healthcheckcachestatus',
+        stack_cas_connection_db_cache::entries_count($DB)
+    ));
 }
 
 echo $OUTPUT->footer();

adminui/bulktestall.php

@@ -84,8 +84,9 @@
         echo $OUTPUT->heading(get_string('bulktesttitle', 'qtype_stack', $testcontext->get_context_name()));
         echo html_writer::tag('p', html_writer::link(
             new moodle_url('/question/type/stack/adminui/bulktestall.php', $urlparams),
-            stack_string('bulktestcontinuefromhere')));
-        list($passed, $failing) = $bulktester->run_all_tests_for_context($testcontext, null, 'web', false, $skippreviouspasses);
+            stack_string('bulktestcontinuefromhere')
+        ));
+        [$passed, $failing] = $bulktester->run_all_tests_for_context($testcontext, null, 'web', false, $skippreviouspasses);
         $allpassed = $allpassed && $passed;
         foreach ($failing as $key => $arrvals) {
             // Guard clause here to future proof any new fields from the bulk tester.

adminui/bulktestindex.php

@@ -24,7 +24,7 @@
 
 define('NO_OUTPUT_BUFFERING', true);
 
-require_once(__DIR__.'/../../../../config.php');
+require_once(__DIR__ . '/../../../../config.php');
 
 require_once($CFG->libdir . '/questionlib.php');
 require_once(__DIR__ . '/../locallib.php');
@@ -88,8 +88,11 @@
         $numquestions = $info['numquestions'];
 
         $testallurl = new moodle_url('/question/type/stack/adminui/bulktest.php', ['contextid' => $contextid]);
-        $testalllink = html_writer::link($testallurl,
-            get_string('bulktestallincontext', 'qtype_stack'), ['title' => get_string('testalltitle', 'qtype_stack')]);
+        $testalllink = html_writer::link(
+            $testallurl,
+            get_string('bulktestallincontext', 'qtype_stack'),
+            ['title' => get_string('testalltitle', 'qtype_stack')]
+        );
         $litext = $name . ' (' . $numquestions . ') ' . $testalllink;
 
         echo html_writer::start_tag('details');
@@ -99,12 +102,17 @@
         echo html_writer::start_tag('ul', ['class' => 'expandable']);
         foreach ($categories as $cat) {
             if ($cat->count > 0) {
-                $url = new moodle_url('/question/type/stack/adminui/bulktest.php',
-                    ['contextid' => $contextid, 'categoryid' => $cat->id]);
+                $url = new moodle_url(
+                    '/question/type/stack/adminui/bulktest.php',
+                    ['contextid' => $contextid, 'categoryid' => $cat->id]
+                );
                 $linktext = $cat->name . ' (' . $cat->count . ')';
                 $link = html_writer::link($url, $linktext);
-                echo html_writer::tag('li', $link,
-                    ['title' => get_string('testallincategory', 'qtype_stack')]);
+                echo html_writer::tag(
+                    'li',
+                    $link,
+                    ['title' => get_string('testallincategory', 'qtype_stack')]
+                );
             }
         }
         echo html_writer::end_tag('ul');
@@ -114,7 +122,9 @@
 
     if (has_capability('moodle/site:config', context_system::instance())) {
         echo html_writer::tag('p', html_writer::link(
-            new moodle_url('/question/type/stack/adminui/bulktestall.php'), get_string('bulktestrun', 'qtype_stack')));
+            new moodle_url('/question/type/stack/adminui/bulktestall.php'),
+            get_string('bulktestrun', 'qtype_stack')
+        ));
     }
 }