Merge branch 'master' into scorm-events

composer.json

@@ -15,7 +15,7 @@
         "php": "~5.5 || ^7.0.3",
         "rusticisoftware/tincan": "1.0.0",
         "learninglocker/moodle-log-expander": "~1.2",
-        "learninglocker/moodle-xapi-translator": "~1.2",
+        "learninglocker/moodle-xapi-translator": "~1.3",
         "learninglocker/xapi-recipe-emitter": "~1.2"
     },
     "prefer-stable": true,

composer.lock

@@ -4,7 +4,7 @@
         "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": "9f1d73b30503f73e548b7336fbf13cd2",
+    "content-hash": "d0d38b13dfd48a9db6028f25a1dd7c10",
     "packages": [
         {
             "name": "learninglocker/moodle-log-expander",
@@ -38,16 +38,16 @@
         },
         {
             "name": "learninglocker/moodle-xapi-translator",
-            "version": "v1.2.1",
+            "version": "v1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/LearningLocker/Moodle-xAPI-Translator.git",
-                "reference": "b669e853189eec93e6d6ad1fba530cd6e2855a1d"
+                "reference": "504c7d09a8ab13143e7a3ea13092b1d15731c4c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/LearningLocker/Moodle-xAPI-Translator/zipball/b669e853189eec93e6d6ad1fba530cd6e2855a1d",
-                "reference": "b669e853189eec93e6d6ad1fba530cd6e2855a1d",
+                "url": "https://api.github.com/repos/LearningLocker/Moodle-xAPI-Translator/zipball/504c7d09a8ab13143e7a3ea13092b1d15731c4c7",
+                "reference": "504c7d09a8ab13143e7a3ea13092b1d15731c4c7",
                 "shasum": ""
             },
             "require-dev": {
@@ -64,7 +64,7 @@
             "license": [
                 "GPL v3"
             ],
-            "time": "2017-05-18T19:43:09+00:00"
+            "time": "2017-05-30T16:29:32+00:00"
         },
         {
             "name": "learninglocker/xapi-recipe-emitter",
@@ -1117,23 +1117,23 @@
         },
         {
             "name": "sebastian/diff",
-            "version": "1.4.1",
+            "version": "1.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
+                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
-                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4",
+                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": "^5.3.3 || ^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.8"
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
             },
             "type": "library",
             "extra": {
@@ -1165,7 +1165,7 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2015-12-08T07:14:41+00:00"
+            "time": "2017-05-22T07:24:03+00:00"
         },
         {
             "name": "sebastian/environment",
@@ -1425,16 +1425,16 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.2.8",
+            "version": "v3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "acec26fcf7f3031e094e910b94b002fa53d4e4d6"
+                "reference": "885db865f6b2b918404a1fae28f9ac640f71f994"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/acec26fcf7f3031e094e910b94b002fa53d4e4d6",
-                "reference": "acec26fcf7f3031e094e910b94b002fa53d4e4d6",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/885db865f6b2b918404a1fae28f9ac640f71f994",
+                "reference": "885db865f6b2b918404a1fae28f9ac640f71f994",
                 "shasum": ""
             },
             "require": {
@@ -1449,7 +1449,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.3-dev"
                 }
             },
             "autoload": {
@@ -1476,7 +1476,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2017-05-01T14:55:58+00:00"
+            "time": "2017-05-28T10:56:20+00:00"
         },
         {
             "name": "webmozart/assert",

version.php

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