Merge pull request #105 from xAPI-vle/v1.5.0

V1.5.0

composer.json

@@ -14,9 +14,9 @@
     "require": {
         "php": "~5.5 || ^7.0.3",
         "rusticisoftware/tincan": "1.0.0",
-        "learninglocker/moodle-log-expander": "~1.4",
-        "learninglocker/moodle-xapi-translator": "~1.4",
-        "learninglocker/xapi-recipe-emitter": "~1.4"
+        "learninglocker/moodle-log-expander": "~1.5",
+        "learninglocker/moodle-xapi-translator": "~1.7",
+        "learninglocker/xapi-recipe-emitter": "~1.6"
     },
     "prefer-stable": true,
     "minimum-stability": "dev"

composer.lock

@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "bbbf2d0c51c17d472a593e583266c703",
+    "content-hash": "0db2954f2210c8f2a338a55357fc6a21",
     "packages": [
         {
             "name": "learninglocker/moodle-log-expander",
-            "version": "v1.4.0",
+            "version": "v1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/LearningLocker/Moodle-Log-Expander.git",
-                "reference": "86384c3737870e652e924b3aef979c932b23b5cb"
+                "reference": "8f69d9dd872b964dd4ba9aae8325a2319b18e562"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/LearningLocker/Moodle-Log-Expander/zipball/86384c3737870e652e924b3aef979c932b23b5cb",
-                "reference": "86384c3737870e652e924b3aef979c932b23b5cb",
+                "url": "https://api.github.com/repos/LearningLocker/Moodle-Log-Expander/zipball/8f69d9dd872b964dd4ba9aae8325a2319b18e562",
+                "reference": "8f69d9dd872b964dd4ba9aae8325a2319b18e562",
                 "shasum": ""
             },
             "require-dev": {
@@ -34,20 +34,20 @@
             "license": [
                 "GPL v3"
             ],
-            "time": "2017-06-01T14:57:00+00:00"
+            "time": "2017-06-08T19:54:20+00:00"
         },
         {
             "name": "learninglocker/moodle-xapi-translator",
-            "version": "v1.4.0",
+            "version": "v1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/LearningLocker/Moodle-xAPI-Translator.git",
-                "reference": "c2dc73df0009fbea92bcf15beddcb2a5c4a77338"
+                "reference": "5b35aed982c65e503ebc4f1982df9e68fbd2bc3f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/LearningLocker/Moodle-xAPI-Translator/zipball/c2dc73df0009fbea92bcf15beddcb2a5c4a77338",
-                "reference": "c2dc73df0009fbea92bcf15beddcb2a5c4a77338",
+                "url": "https://api.github.com/repos/LearningLocker/Moodle-xAPI-Translator/zipball/5b35aed982c65e503ebc4f1982df9e68fbd2bc3f",
+                "reference": "5b35aed982c65e503ebc4f1982df9e68fbd2bc3f",
                 "shasum": ""
             },
             "require-dev": {
@@ -64,20 +64,20 @@
             "license": [
                 "GPL v3"
             ],
-            "time": "2017-06-01T15:11:18+00:00"
+            "time": "2017-06-08T19:56:18+00:00"
         },
         {
             "name": "learninglocker/xapi-recipe-emitter",
-            "version": "v1.4.0",
+            "version": "v1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/LearningLocker/xAPI-Recipe-Emitter.git",
-                "reference": "dbd525f05d2376ce9fdbef592a927df3c3c39e4e"
+                "reference": "a27700453593a2257d2624652c9311b9c3b3fedf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/LearningLocker/xAPI-Recipe-Emitter/zipball/dbd525f05d2376ce9fdbef592a927df3c3c39e4e",
-                "reference": "dbd525f05d2376ce9fdbef592a927df3c3c39e4e",
+                "url": "https://api.github.com/repos/LearningLocker/xAPI-Recipe-Emitter/zipball/a27700453593a2257d2624652c9311b9c3b3fedf",
+                "reference": "a27700453593a2257d2624652c9311b9c3b3fedf",
                 "shasum": ""
             },
             "require": {
@@ -99,7 +99,7 @@
             "license": [
                 "GPL v3"
             ],
-            "time": "2017-06-01T14:49:52+00:00"
+            "time": "2017-06-05T20:04:40+00:00"
         },
         {
             "name": "namshi/jose",
@@ -1425,16 +1425,16 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.3.0",
+            "version": "v3.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "885db865f6b2b918404a1fae28f9ac640f71f994"
+                "reference": "9752a30000a8ca9f4b34b5227d15d0101b96b063"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/885db865f6b2b918404a1fae28f9ac640f71f994",
-                "reference": "885db865f6b2b918404a1fae28f9ac640f71f994",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/9752a30000a8ca9f4b34b5227d15d0101b96b063",
+                "reference": "9752a30000a8ca9f4b34b5227d15d0101b96b063",
                 "shasum": ""
             },
             "require": {
@@ -1476,7 +1476,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2017-05-28T10:56:20+00:00"
+            "time": "2017-06-02T22:05:06+00:00"
         },
         {
             "name": "webmozart/assert",

tests/TestCase.php

@@ -19,7 +19,7 @@ abstract class TestCase extends PhpUnitTestCase {
     public function setup() {
         $this->cfg = (object) [
             'wwwroot' => 'http://www.example.com',
-            'release' => '1.0.0',
+            'release' => '1.0.0'
         ];
         $this->xapi_controller = new xapi_controller(new xapi_repository(new xapi_remote_lrs('', '1.0.1', '', '')));
         $this->moodle_controller = new moodle_controller(new moodle_repository((object) [], $this->cfg));
@@ -32,6 +32,12 @@ abstract class TestCase extends PhpUnitTestCase {
         $moodle_events = $this->moodle_controller->createEvents([$input]);
         $this->assertNotNull($moodle_events, 'Check that the events exist in the expander controller.');
 
+        //Hack to add Moodle plugin config setting for sendmbox - need to make config function
+        $moodle_events = [array_merge(
+            $moodle_events[0],
+            ['sendmbox' => false]
+        )];
+
         $translator_events = $this->translator_controller->createEvents($moodle_events);
         $this->assertNotNull($translator_events, 'Check that the events exist in the translator controller.');
 
@@ -61,7 +67,7 @@ abstract class TestCase extends PhpUnitTestCase {
             'relateduserid' => '1',
             'courseid' => '1',
             'timecreated' => 1433946701,
-            'eventname' => '\core\event\course_viewed',
+            'eventname' => '\core\event\course_viewed'
         ];
     }
 }