Skip to content

Commit

Permalink
Code cleanup and support for 4.4
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastsg committed Sep 30, 2024
1 parent a297885 commit 558001a
Show file tree
Hide file tree
Showing 92 changed files with 1,820 additions and 2,840 deletions.
145 changes: 60 additions & 85 deletions .github/workflows/moodle-ci.yml
Original file line number Diff line number Diff line change
@@ -1,138 +1,113 @@
name: Moodle plugin CI
name: Moodle Plugin CI

on: [push, pull_request]

jobs:
test:
runs-on: 'ubuntu-latest'
strategy:
fail-fast: false
matrix:
include:
- php: '8.1'
moodle-branch: 'MOODLE_402_STABLE'
database: 'mariadb'
- php: '8.1'
moodle-branch: 'MOODLE_402_STABLE'
database: 'mariadb'
- php: '8.0'
moodle-branch: 'MOODLE_402_STABLE'
database: 'mariadb'
- php: '8.0'
moodle-branch: 'MOODLE_402_STABLE'
database: 'mariadb'
- php: '8.1'
moodle-branch: 'MOODLE_401_STABLE'
database: 'mariadb'
- php: '8.1'
moodle-branch: 'MOODLE_401_STABLE'
database: 'mariadb'
- php: '8.0'
moodle-branch: 'MOODLE_401_STABLE'
database: 'mariadb'
- php: '8.0'
moodle-branch: 'MOODLE_401_STABLE'
database: 'mariadb'
- php: '7.4'
moodle-branch: 'MOODLE_401_STABLE'
database: 'mariadb'
- php: '7.4'
moodle-branch: 'MOODLE_401_STABLE'
database: 'mariadb'
- php: '7.4'
moodle-branch: 'MOODLE_400_STABLE'
database: 'mariadb'
- php: '7.4'
moodle-branch: 'MOODLE_400_STABLE'
database: 'mariadb'
runs-on: ubuntu-22.04

services:
postgres:
image: postgres
image: postgres:13
env:
POSTGRES_USER: 'postgres'
POSTGRES_HOST_AUTH_METHOD: 'trust'
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 3
ports:
- 5432:5432
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 3

mariadb:
image: mariadb:10.5
image: mariadb:10
env:
MYSQL_USER: 'root'
MYSQL_ALLOW_EMPTY_PASSWORD: "true"
MYSQL_CHARACTER_SET_SERVER: "utf8mb4"
MYSQL_COLLATION_SERVER: "utf8mb4_unicode_ci"
ports:
- 3306:3306
options: --health-cmd="mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 3

strategy:
fail-fast: false
matrix:
php: ['8.0']
moodle-branch: ['MOODLE_403_STABLE', 'MOODLE_404_STABLE']
database: [pgsql, mariadb]

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

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

- name: Deploy moodle-plugin-ci
- name: Initialise moodle-plugin-ci
run: |
composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3
# Add dirs to $PATH
composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^4
echo $(cd ci/bin; pwd) >> $GITHUB_PATH
echo $(cd ci/vendor/bin; pwd) >> $GITHUB_PATH
# PHPUnit depends on en_AU.UTF-8 locale
sudo locale-gen en_AU.UTF-8
- name: Install Moodle
# Need explicit IP to stop mysql client fail on attempt to use unix socket.
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 }}
IGNORE_NAMES: 'mobile_*.mustache'
IGNORE_PATHS: 'templates/local/mobile'

- name: phplint
if: ${{ always() }}
- name: PHP Lint
if: ${{ !cancelled() }}
run: moodle-plugin-ci phplint

- name: phpcpd
if: ${{ always() }}
run: moodle-plugin-ci phpcpd || true
- name: PHP Copy/Paste Detector
continue-on-error: true # This step will show errors but will not fail
if: ${{ !cancelled() }}
run: moodle-plugin-ci phpcpd

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

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

- name: validate
if: ${{ always() }}
- name: Moodle PHPDoc Checker
if: ${{ !cancelled() }}
run: moodle-plugin-ci phpdoc --max-warnings 0

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

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

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

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

- name: phpunit
if: ${{ always() }}
run: moodle-plugin-ci phpunit
- name: PHPUnit tests
if: ${{ !cancelled() }}
run: moodle-plugin-ci phpunit --fail-on-warning

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

- name: Mark cancelled jobs as failed.
if: ${{ cancelled() }}
run: exit 1
51 changes: 0 additions & 51 deletions .travis.yml

This file was deleted.

8 changes: 3 additions & 5 deletions action.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,14 @@
$cmid = capquiz_urls::require_course_module_id_param();
$cm = get_coursemodule_from_id('capquiz', $cmid, 0, false, MUST_EXIST);
require_login($cm->course, false, $cm);

$context = \context_module::instance($cmid);
require_capability('mod/capquiz:instructor', $context);

$action = required_param('action', PARAM_TEXT);

$cmid = capquiz_urls::require_course_module_id_param();
$capquiz = new capquiz($cmid);
if ($capquiz) {
capquiz_urls::set_page_url($capquiz, capquiz_urls::$urlasync);
capquiz_action_performer::perform($action, $capquiz);
}
capquiz_urls::set_page_url($capquiz, capquiz_urls::$urlasync);
capquiz_action_performer::perform($action, $capquiz);

capquiz_urls::redirect_to_dashboard();
Loading

0 comments on commit 558001a

Please sign in to comment.