Skip to content

Commit

Permalink
Prepare for v4.0-r1.
Browse files Browse the repository at this point in the history
Signed-off-by: Luca Bösch <[email protected]>
  • Loading branch information
lucaboesch committed Jan 16, 2023
1 parent 528575e commit 54e9bbc
Show file tree
Hide file tree
Showing 25 changed files with 1,045 additions and 1,136 deletions.
143 changes: 143 additions & 0 deletions .github/workflows/moodle-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
name: Moodle Plugin CI

on: [push, pull_request]

jobs:
test:
runs-on: ubuntu-18.04

services:
postgres:
image: postgres:10.0
env:
POSTGRES_USER: 'postgres'
POSTGRES_HOST_AUTH_METHOD: 'trust'
ports:
- 5432:5432
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 3
mariadb:
image: mariadb:10.5
env:
MYSQL_USER: 'root'
MYSQL_ALLOW_EMPTY_PASSWORD: "true"
ports:
- 3306:3306
options: --health-cmd="mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 3

strategy:
fail-fast: false
matrix:
include:
- php: 7.3
moodle-branch: 'master'
database: pgsql
- php: 7.3
moodle-branch: 'master'
database: mariadb
- php: 7.4
moodle-branch: 'master'
database: pgsql
- php: 7.4
moodle-branch: 'master'
database: mariadb
- php: 7.3
moodle-branch: 'MOODLE_400_STABLE'
database: pgsql
- php: 7.3
moodle-branch: 'MOODLE_400_STABLE'
database: mariadb
- php: 7.4
moodle-branch: 'MOODLE_400_STABLE'
database: pgsql
- php: 7.4
moodle-branch: 'MOODLE_400_STABLE'
database: mariadb
- php: 8.0
# The following line is only needed if you're going to run php8 jobs and your
# plugin needs xmlrpc services.
extensions: xmlrpc-beta
moodle-branch: MOODLE_400_STABLE
database: pgsql
- php: 8.0
# The following line is only needed if you're going to run php8 jobs and your
# plugin needs xmlrpc services.
extensions: xmlrpc-beta
moodle-branch: MOODLE_400_STABLE
database: mariadb

steps:
- name: Check out repository code
uses: actions/checkout@v2
with:
path: plugin

- name: Setup PHP ${{ matrix.php }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: ${{ matrix.extensions }}
ini-values: max_input_vars=5000
coverage: none

- name: Initialise moodle-plugin-ci
run: |
composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3
echo $(cd ci/bin; pwd) >> $GITHUB_PATH
echo $(cd ci/vendor/bin; pwd) >> $GITHUB_PATH
sudo locale-gen en_AU.UTF-8
echo "NVM_DIR=$HOME/.nvm" >> $GITHUB_ENV
- name: Install moodle-plugin-ci
run: |
moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1
env:
DB: ${{ matrix.database }}
MOODLE_BRANCH: ${{ matrix.moodle-branch }}
CODECHECKER_IGNORE_NAMES: 'tc_colourpopup.php,tc_colourpopup.js'

- name: PHP Lint
if: ${{ always() }}
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() }}
run: moodle-plugin-ci phpcpd

- name: PHP Mess Detector
continue-on-error: true # This step will show errors but will not fail
if: ${{ always() }}
run: moodle-plugin-ci phpmd

- name: Moodle Code Checker
if: ${{ always() }}
run: moodle-plugin-ci codechecker
# run: moodle-plugin-ci codechecker --max-warnings 0

# - name: Moodle PHPDoc Checker
# if: ${{ always() }}
# run: moodle-plugin-ci phpdoc

- name: Validating
if: ${{ always() }}
run: moodle-plugin-ci validate

- name: Check upgrade savepoints
if: ${{ always() }}
run: moodle-plugin-ci savepoints

# - name: Mustache Lint
# if: ${{ always() }}
# run: moodle-plugin-ci mustache

# - name: Grunt
# if: ${{ always() }}
# run: moodle-plugin-ci grunt --max-lint-warnings 0

- name: PHPUnit tests
if: ${{ always() }}
run: moodle-plugin-ci phpunit

- name: Behat features
if: ${{ always() }}
run: moodle-plugin-ci behat --profile chrome

4 changes: 0 additions & 4 deletions backup/moodle2/backup_qtype_fileresponse_plugin.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/


defined('MOODLE_INTERNAL') || die();


/**
* Provides the information to backup fileresponse questions
*
Expand Down
4 changes: 0 additions & 4 deletions backup/moodle2/restore_qtype_fileresponse_plugin.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/


defined('MOODLE_INTERNAL') || die();


/**
* restore plugin class that provides the necessary information
* needed to restore one fileresponse qtype plugin
Expand Down
2 changes: 0 additions & 2 deletions db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

defined('MOODLE_INTERNAL') || die();

/**
* Upgrade code for the fileresponse question type.
* @param int $oldversion the version we are upgrading from.
Expand Down
4 changes: 0 additions & 4 deletions db/upgradelib.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/


defined('MOODLE_INTERNAL') || die();


/**
* Class for converting attempt data for fileresponse questions when upgrading
* attempts to the new question engine.
Expand Down
24 changes: 11 additions & 13 deletions edit_fileresponse_form.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/


defined('MOODLE_INTERNAL') || die();


/**
* Fileresponse question type editing form.
*
Expand All @@ -39,9 +35,11 @@ protected function definition_inner($mform) {
$qtype = question_bank::get_qtype('fileresponse');

/* Display the ?forcedownload=1 advice. */
$mform->addElement('static','advice', get_string('advice', 'qtype_fileresponse'),'<div style="width:496px;">'.get_string('questiontextforcedownload', 'qtype_fileresponse').'</div>');
$mform->addElement('static', 'advice', get_string('advice', 'qtype_fileresponse'),
'<div style="width:496px;">' . get_string('questiontextforcedownload', 'qtype_fileresponse') .
'</div>');

/* Fileresponse only accepts 'plain' as format */
/* fileresponse only accepts 'formatplain' as format */
$mform->setDefault('responseformat', 'plain');

$mform->addElement('header', 'responseoptions', get_string('responseoptions', 'qtype_fileresponse'));
Expand Down Expand Up @@ -102,13 +100,13 @@ protected function data_preprocessing($question) {
$draftid = file_get_submitted_draft_itemid('graderinfo');
$question->graderinfo = array();
$question->graderinfo['text'] = file_prepare_draft_area(
$draftid, // Draftid
$this->context->id, // context
'qtype_fileresponse', // component
'graderinfo', // filarea
!empty($question->id) ? (int) $question->id : null, // itemid
$this->fileoptions, // options
$question->options->graderinfo // text.
$draftid, // Draftid.
$this->context->id, // Context.
'qtype_fileresponse', // Component.
'graderinfo', // Filarea.
!empty($question->id) ? (int) $question->id : null, // Itemid.
$this->fileoptions, // Options.
$question->options->graderinfo // Text.
);
$question->graderinfo['format'] = $question->options->graderinfoformat;
$question->graderinfo['itemid'] = $draftid;
Expand Down
Loading

0 comments on commit 54e9bbc

Please sign in to comment.