Merge branch 'master' into scorm-events

.travis.yml

 language: php
-php: 5.5
+php:
+    - 5.5
+    - 5.6
+    - 7.0
 install: composer install --no-interaction
 script: ./vendor/bin/phpunit

README.md

@@ -2,6 +2,7 @@
 > Emits events from the [Moodle](https://moodle.org/) Logstore as [xAPI](https://github.com/adlnet/xAPI-Spec/blob/master/xAPI.md) statements.
 
 [![Build Status](https://travis-ci.org/xAPI-vle/moodle-logstore_xapi.svg?branch=master)](https://travis-ci.org/xAPI-vle/moodle-logstore_xapi)
+[![Code Climate](https://codeclimate.com/github/xAPI-vle/moodle-logstore_xapi.png)](https://codeclimate.com/github/xAPI-vle/moodle-logstore_xapi)
 [![Moodle Plugin Directory](http://img.shields.io/badge/moodle-plugin-orange.svg)](https://moodle.org/plugins/view/logstore_xapi)
 [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/LearningLocker/learninglocker?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 

classes/log/store.php

@@ -154,12 +154,17 @@ class store extends php_obj implements log_writer {
      * @return xapi_repository
      */
     private function connect_xapi_repository() {
-        return new xapi_repository(new tincan_remote_lrs(
+        global $CFG;
+        $remote_lrs = new tincan_remote_lrs(
             $this->get_config('endpoint', ''),
             '1.0.1',
             $this->get_config('username', ''),
             $this->get_config('password', '')
-        ));
+        );
+        if (!empty($CFG->proxyhost)) {
+          $remote_lrs->setProxy($CFG->proxyhost.':'.$CFG->proxyport);
+        }
+        return new xapi_repository($remote_lrs);
     }
 
     /**

composer.json

@@ -12,10 +12,11 @@
         "learninglocker/statementfactory": "~0.0"
     },
     "require": {
-        "rusticisoftware/tincan": "0.40.0",
-        "learninglocker/moodle-log-expander": "~1.1",
-        "learninglocker/moodle-xapi-translator": "~1.1",
-        "learninglocker/xapi-recipe-emitter": "~1.1"
+        "php": "~5.5 || ^7.0.3",
+        "rusticisoftware/tincan": "1.0.0",
+        "learninglocker/moodle-log-expander": "~1.2",
+        "learninglocker/moodle-xapi-translator": "~1.2",
+        "learninglocker/xapi-recipe-emitter": "~1.2"
     },
     "prefer-stable": true,
     "minimum-stability": "dev"

docs/developers.md

@@ -8,7 +8,7 @@ This page contains documentation for developers (people who would like to contri
 ## Setup
 From the root directory of your Moodle installation run the script below.
 ```sh
-cd admin/tool/log/store; rm -rf xapi; git clone git@github.com:jlowe64/moodle-logstore_xapi.git xapi; php -r "readfile('https://getcomposer.org/installer');" | php; rm -rf vendor; php composer.phar install --prefer-source;
+cd admin/tool/log/store; rm -rf xapi; git clone git@github.com:xAPI-vle/moodle-logstore_xapi.git xapi; cd xapi; php -r "readfile('https://getcomposer.org/installer');" | php; rm -rf vendor; php composer.phar install --prefer-source;
 ```
 
 If you hadn't already installed the plugin, you'll need to login as an admin and navigate to "http://www.example.com/admin/index.php" (replacing “www.example.com” with your own domain). Once there you can follow on from step 6 of the [user installation guide](installation.md).

version.php

@@ -26,7 +26,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'logstore_xapi';
-$plugin->version = 2016060200;
-$plugin->release = '1.1.0';
+$plugin->version = 2017051600;
+$plugin->release = '1.2.0';
 $plugin->requires = 2014111000;
 $plugin->maturity = MATURITY_STABLE;