Skip to content

Commit

Permalink
Merge pull request #1 from grp-attestoodle/compatibilite311
Browse files Browse the repository at this point in the history
Assure la compatibilité avec Moodle 3.11
  • Loading branch information
poleumdev authored May 26, 2021
2 parents d1329d2 + 77f4f6d commit 347c139
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 24 deletions.
32 changes: 14 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,41 +1,34 @@
# Source : https://github.com/blackboard-open-source/moodle-plugin-ci/blob/master/.travis.dist.yml

language: php

sudo: true

addons:
firefox: "47.0.1"
postgresql: "9.4"
apt:
packages:
- openjdk-8-jre-headless
postgresql: "9.6"

services:
- mysql
- postgresql
- docker

cache:
directories:
- $HOME/.composer/cache
- $HOME/.npm

php:
- 7.0
- 7.1
- 7.2
- 7.3
- 7.4

env:
global:
- MOODLE_BRANCH=MOODLE_35_STABLE
- MOODLE_BRANCH=MOODLE_39_STABLE
matrix:
- DB=pgsql
- DB=mysqli

services:
- mysql

before_install:
- phpenv config-rm xdebug.ini
- nvm install 8.9
- nvm use 8.9
- cd ../..
- composer create-project -n --no-dev --prefer-dist blackboard-open-source/moodle-plugin-ci ci ^2
- composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3
- export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH"

install:
Expand All @@ -50,3 +43,6 @@ script:
- moodle-plugin-ci savepoints
- moodle-plugin-ci mustache
- moodle-plugin-ci grunt
- moodle-plugin-ci phpdoc
- moodle-plugin-ci phpunit
- moodle-plugin-ci behat --dump
4 changes: 1 addition & 3 deletions client/testmethode.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
/*
* Imports of class files.
*/
$toolpath = dirname(__FILE__);

$username = optional_param('username', 'rv0', PARAM_ALPHANUM);

$context = context_system::instance();
Expand All @@ -41,7 +39,7 @@
require_login();

// Always create trainings.
$urlact = new moodle_url($toolpath . '/testmethode.php', ['username' => $username]);
$urlact = new moodle_url('/local/wsattestoodle/client/testmethode.php', ['username' => $username]);
$PAGE->set_url($urlact);

$PAGE->set_title("TEST");
Expand Down
3 changes: 1 addition & 2 deletions client/testws.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,10 @@
$resp = xmlrpc_decode($curl->post($serverurl, $post));
}

$toolpath = dirname(__FILE__);
$context = context_system::instance();
$PAGE->set_context($context);
require_login();
$urlact = new moodle_url($toolpath . '/testmethode.php', []);
$urlact = new moodle_url('/local/wsattestoodle/client/testmethode.php', []);
$PAGE->set_url($urlact);
$PAGE->set_title("TEST");

Expand Down
2 changes: 1 addition & 1 deletion version.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

$plugin->component = 'local_wsattestoodle';
$plugin->release = '0.1.1';
$plugin->version = 2019111501;
$plugin->version = 2021052101;
$plugin->requires = 2017051500;
$plugin->maturity = MATURITY_STABLE;
$plugin->dependencies = [
Expand Down

0 comments on commit 347c139

Please sign in to comment.