Merge remote-tracking branch 'origin/dev' into iss1703

Author: sangwinc

.github/workflows/moodle-ci.yml

@@ -38,27 +38,27 @@ jobs:
             maxima: 'GCL'
             moodle-app: true
           - php: '8.4'
-            moodle-branch: 'MOODLE_501_STABLE'
+            moodle-branch: 'MOODLE_502_STABLE'
             database: 'pgsql'
             maxima: 'SBCL'
             moodle-app: true
           - 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
+            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 }})
@@ -151,10 +151,43 @@ jobs:
         env:
           DB: ${{ matrix.database }}
           MOODLE_BRANCH: ${{ matrix.moodle-branch }}
-          MOODLE_APP: ${{ matrix.moodle-app }}
 
-      - name: Install moodle-plugin-ci (light unit tests)
-        if: ${{ matrix.moodle-branch != 'main' }}
+      - 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
@@ -185,51 +218,50 @@ jobs:
         env:
           DB: ${{ matrix.database }}
           MOODLE_BRANCH: ${{ matrix.moodle-branch }}
-          MOODLE_APP: ${{ matrix.moodle-app }}
 
       - name: PHP Lint
-        if: ${{ matrix.moodle-branch == 'main' }}
+        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: ${{ matrix.moodle-branch == 'main' }}
+        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: ${{ matrix.moodle-branch == 'main' }}
+        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: ${{ matrix.moodle-branch == 'main' }}
+        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: ${{ matrix.moodle-branch == 'main' }}
+        if: ${{ matrix.moodle-branch == 'main' || matrix.moodle-branch == 'MOODLE_502_STABLE'}}
         run: moodle-plugin-ci phpdoc
 
       - name: Validating
-        if: ${{ matrix.moodle-branch == 'main' }}
+        if: ${{ matrix.moodle-branch == 'main' || matrix.moodle-branch == 'MOODLE_502_STABLE'}}
         run: moodle-plugin-ci validate
 
       - name: Check upgrade savepoints
-        if: ${{ matrix.moodle-branch == 'main' }}
+        if: ${{ matrix.moodle-branch == 'main' || matrix.moodle-branch == 'MOODLE_502_STABLE'}}
         run: moodle-plugin-ci savepoints
 
       - name: Mustache Lint
-        if: ${{ matrix.moodle-branch == 'main' }}
+        if: ${{ matrix.moodle-branch == 'main' || matrix.moodle-branch == 'MOODLE_502_STABLE'}}
         run: moodle-plugin-ci mustache
 
       - name: Grunt
-        if: ${{ matrix.moodle-branch == 'main' }}
+        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() }}
+        if: ${{ matrix.moodle-branch == 'main' || matrix.moodle-branch == 'MOODLE_405_STABLE'}}
+        #if: ${{ always() }}
         run: moodle-plugin-ci phpunit
 
       - name: Behat features

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.
 

api/config_sample.txt

@@ -95,8 +95,8 @@ $CFG->inputmustverify = 1;
 $CFG->inputshowvalidation = 1;
 
 // These should match the version of goemaxima in docker-compose.
-$CFG->stackmaximaversion = "2026010500";
-$CFG->version = "2026010500";
+$CFG->stackmaximaversion = "2026042200";
+$CFG->version = "2026042200";
 
 // Do not change this setting.
 $CFG->mathsdisplay = 'api';

api/controller/RenderController.php

@@ -188,15 +188,17 @@ public function __invoke(Request $request, Response $response, array $args): Res
                     $renderresponse->questionrender
                 );
                 $renderresponse->questionsamplesolutiontext = str_replace(
-                    "id=\"{$iframe[2]}\"></div>", "id=\"{$iframe[2]}\">{$renderediframe}</div>",
+                    "id=\"{$iframe[2]}\"></div>",
+                    "id=\"{$iframe[2]}\">{$renderediframe}</div>",
                     $renderresponse->questionsamplesolutiontext
                 );
             }
             foreach ($renderresponse->questionassets as $name => $file) {
                 $renderresponse->questionrender = str_replace($name, "{$baseurl}/plots/{$file}", $renderresponse->questionrender);
                 $renderresponse->questionsamplesolutiontext = str_replace(
                     $name,
-                    "{$baseurl}/plots/{$file}", $renderresponse->questionsamplesolutiontext
+                    "{$baseurl}/plots/{$file}",
+                    $renderresponse->questionsamplesolutiontext
                 );
                 foreach ($renderresponse->questioninputs as $input) {
                     $input->samplesolutionrender = str_replace($name, "{$baseurl}/plots/{$file}", $input->samplesolutionrender);

api/docker/docker-compose.dev.yml

@@ -1,7 +1,7 @@
 version: "4.0"
 services:
   maxima:
-    image: mathinstitut/goemaxima:2026010500-latest
+    image: mathinstitut/goemaxima:2026042200-latest
     tmpfs:
       - "/tmp"
     restart: unless-stopped

api/docker/docker-compose.yml

@@ -1,7 +1,7 @@
 version: "4.0"
 services:
   maxima:
-    image: mathinstitut/goemaxima:2026010500-latest
+    image: mathinstitut/goemaxima:2026042200-latest
     tmpfs:
       - "/tmp"
     restart: unless-stopped

doc/en/Developer/Development_history.md

@@ -2,7 +2,7 @@
 
 For current and future plans, see [Development track](Development_track.md) and [Future plans](Future_plans.md).
 
-## Version 4.12.0
+## Version 4.12.0 (2026042200)
 
 Released April 2026.
 
@@ -39,10 +39,10 @@ __Changes and new features.__
 8. STACK library now imports whole quizzes - look for a `.json` file in the library.
 9. Add in support for [local stack libraries](../STACK_question_admin/Library/index.md) of questions in the `stack/sitelibrary` directory within the Moodle data directory.
 10. Change the *Generic feedback* defaults to use the common language strings.  __Users upgrading their site in place will need to change the settings in the plugin setting page to the new default.__
-11.The Generic feedback and decimals options have been removed from questions in the question library.  When importing library questions, the current site defaults will be used.
+11. The Generic feedback and decimals options have been removed from questions in the question library.  When importing library questions, the current site defaults will be used.
 12. Remove the German language packs locally (#1710).  Note, the API now includes language packs as a config option when you build the docker container.
 
-## Version 4.11.1
+## Version 4.11.1 (2026010500)
 
 Released January 2026.
 
@@ -53,7 +53,7 @@ This incremental release contains some minor, but useful, bug fixes.
 
 This release contains the [HELM materials](../STACK_question_admin/Library/HELM.md) as part of the STACK question library.  HELM question banks are managed using [Gitsync](https://github.com/maths/moodle-qbank_gitsync).
 
-## Version 4.11.0
+## Version 4.11.0 (2025102100)
 
 Released October 2025.
 
@@ -67,21 +67,21 @@ Improvements in documentation and minor bug fixes.
 6. Add in new flag `tex_plain_atoms` to control the display of atoms with [subscripts](../CAS/Subscripts.md).  Remove testing for changes on Maxima before 5.40.0.
 7. Add in the `Introductory-Mathematics` questions to the STACK library.  The library now has over 1600 STACK questions.
 
-## Version 4.10.0
+## Version 4.10.0 (2025073100)
 
 Released July 2025.
 
 1. Add in a `style` attribute to the JSXGraph block to load local CSS styles.
 2. Add in the `json` input type.  This better supports JSON for JSXGraph, and better debugging in the existing GeoGebra and Parsons blocks.
 3. Allow the bulk tester to add `[[todo]]` blocks to the question descriptions with the `addtags` option.
 
-## Version 4.9.1
+## Version 4.9.1 (2025040100)
 
 Released April 2025.
 
 Remove special characters in filenames (which break the .zip download).
 
-## Version 4.9.0
+## Version 4.9.0 (2025033100)
 
 Released March 2025.
 
@@ -96,25 +96,25 @@ Released March 2025.
 9. Remove support for the `win` platform (which hasn't been tested for many years).  See [issue #1379](https://github.com/maths/moodle-qtype_stack/issues/1379).
 10. Add in the [adapt block](../Authoring/Question_blocks/Dynamic_blocks.md) and associated dynamic blocks.
 
-## Version 4.8.5
+## Version 4.8.5 (2025030600)
 
 Released March 2025.
 
 Bring forward bug fixes to include in an official release.
 
-## Version 4.8.3
+## Version 4.8.3 (2025012100)
 
 Released January 2025.
 
 Bring forward bug fixes to include in an official release.  Update JSXGraph.
 
-## Version 4.8.1
+## Version 4.8.1 (2024111900)
 
 Released November 2024.
 
 Rename directories and files in the STACK library to avoid problems with the auto-generated .zip file.
 
-## Version 4.8.0
+## Version 4.8.0 (2024111500)
 
 Released November 2024.
 
@@ -129,8 +129,7 @@ Released November 2024.
 9. Improve Parsons blocks by (i) hashing for keys, and (ii) Add ability to log history of an attempt (for research).
 10. Add in a new [answer test based on a validator function](../Authoring/Answer_Tests/Other.md).
 
-
-## Version 4.7.0
+## Version 4.7.0 (2024072400)
 
 Released July 2024.
 
@@ -141,7 +140,7 @@ Released July 2024.
 5. Add in the "Deploy from n to m" feature to systematically deploy seeds.
 6. Restyle response analysis page.
 
-## Version 4.6.0
+## Version 4.6.0 (2024060300)
 
 Released June 2024.
 
@@ -157,12 +156,12 @@ This version will require moodle 4.0+. Moodle 3.x is no longer supported.
 8. Add in support for drag and drop matching problems, as [grid](../Specialist_tools/Drag_and_drop/Grid.md) and [grouping](../Specialist_tools/Drag_and_drop/Grouping.md).
 
 
-## Version 4.5.0-hf2
+## Version 4.5.0-hf2 (2024012900)
 
 Fix critical bug in Javascript.
 Released January 2024.
 
-## Version 4.5.0
+## Version 4.5.0 (2023121100)
 
 Released December 2023.
 

doc/en/Installation/STACK_versions.md

@@ -9,6 +9,7 @@ when releasing.
 
 Release | Version number | Supported Maxima versions
 --------|----------------|--------------------------
+4.12.0 | 2026042200 | 5.40.0, 5.41.0, 5.42.0, 5.42.1, 5.42.2, 5.43.0, 5.43.1, 5.43.2, 5.44.0, 5.46.0, 5.47.0
 4.11.1 | 2026010500 | 5.40.0, 5.41.0, 5.42.0, 5.42.1, 5.42.2, 5.43.0, 5.43.1, 5.43.2, 5.44.0, 5.46.0, 5.47.0
 4.11.0 | 2025102100 | 5.40.0, 5.41.0, 5.42.0, 5.42.1, 5.42.2, 5.43.0, 5.43.1, 5.43.2, 5.44.0, 5.46.0, 5.47.0
 4.10.0 | 2025073100 | 5.40.0, 5.41.0, 5.42.0, 5.42.1, 5.42.2, 5.43.0, 5.43.1, 5.43.2, 5.44.0, 5.46.0, 5.47.0