From 8b4003caa0866a6b657114ae1c52e37d227b8407 Mon Sep 17 00:00:00 2001
From: Ryan Smith <0ryansmith1994@gmail.com>
Date: Mon, 17 Aug 2015 12:36:18 +0100
Subject: [PATCH] Fixes validation for groups.

---
 src/Group.php          |  6 ++---
 src/Members.php        |  2 +-
 tests/assets/test.json | 56 +++++++++++++-----------------------------
 3 files changed, 21 insertions(+), 43 deletions(-)

diff --git a/src/Group.php b/src/Group.php
index 745fccd..f52e512 100644
--- a/src/Group.php
+++ b/src/Group.php
@@ -13,9 +13,9 @@ protected function identifierError($used_identifiers) {
   }
 
   protected function validateIdentifiers($used_identifiers) {
-    $members = $this->getProp('members') ?: null;
-    $members = $members !== null ? $members->getValue() : null;
+    $members = $this->getPropValue('member') ?: null;
     $validateIdentifiers = parent::validateIdentifiers($used_identifiers);
-    return $validateIdentifiers && $members === null;
+    $validateMembers = $members === null || count($members) === 0;
+    return $validateIdentifiers && $validateMembers;
   }
 }
diff --git a/src/Members.php b/src/Members.php
index d1ca180..13607b3 100644
--- a/src/Members.php
+++ b/src/Members.php
@@ -1,5 +1,5 @@
 <?php namespace Locker\XApi;
 
 class Members extends Collection {
-  protected $member_type = 'Locker\XApi\Actor';
+  protected $member_type = 'Locker\XApi\Agent';
 }
diff --git a/tests/assets/test.json b/tests/assets/test.json
index 9e06028..07e9051 100644
--- a/tests/assets/test.json
+++ b/tests/assets/test.json
@@ -1,42 +1,20 @@
 {
-  "id": "710cc790-9d8d-11e4-bd06-0800200c9a66",
-  "actor": {
-    "objectType": "Agent",
-    "mbox": "mailto:duy.nguyen@go1.com.au",
-    "name": "quanvm"
-  },
-  "verb": {
-    "id": "http://adlnet.gov/expapi/verbs/experienced",
-    "display": {"en-us": "experienced"}
-  },
-  "context": {
-    "contextActivities": {
-      "parent": {
-        "id": "http://tincanapi.com/GolfExample_TCAPI",
-        "objectType": "Activity"
-      },
-      "grouping": [{
-        "id": "http://tincanapi.com/GolfExample_TCAPI",
-        "objectType": "Activity"
-      }]
+    "actor": {
+        "objectType": "Group",
+        "account": {
+            "homePage": "http://myaccount.bmj.com",
+            "name": "hrl"
+        },
+        "member": [
+        ]
+    },
+    "verb": {
+        "id": "http:\/\/adlnet.gov\/expapi\/verbs\/completed",
+        "display": {
+            "en-GB": "completed"
+        }
+    },
+    "object": {
+        "id": "http:\/\/localhost\/moodle\/mod\/quiz\/attempt.php?attempt=48"
     }
-  },
-  "object": {
-    "id": "http://tincanapi.com/GolfExample_TCAPI/Playing/Scoring.html",
-    "objectType": "Activity",
-    "definition": {
-      "name": {
-        "en-US": "Scoring"
-      },
-      "description": {
-        "en-US": "An overview of how to score a round of golf."
-      },
-      "type": "http:///activitystrea.ms/schema/1.0/badge"
-    }
-  },
-  "authority": {
-    "name": "",
-    "mbox": "mailto:quan@ll.com",
-    "objectType": "Agent"
-  }
 }