Skip to content

Commit a30a556

Browse files
committed
Merge pull request #5 from LearningLocker/issue/groups
Fixes validation for groups.
2 parents efe3030 + 72e0031 commit a30a556

File tree

3 files changed

+22
-13
lines changed

3 files changed

+22
-13
lines changed

src/Group.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ protected function identifierError($used_identifiers) {
1313
}
1414

1515
protected function validateIdentifiers($used_identifiers) {
16-
$members = $this->getProp('members') ?: null;
17-
$members = $members !== null ? $members->getValue() : null;
16+
$members = $this->getPropValue('member') ?: null;
1817
$validateIdentifiers = parent::validateIdentifiers($used_identifiers);
19-
return $validateIdentifiers && $members === null;
18+
$validateMembers = $members === null || count($members) === 0;
19+
return $validateIdentifiers && $validateMembers;
2020
}
2121
}

src/Members.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php namespace Locker\XApi;
22

33
class Members extends Collection {
4-
protected $member_type = 'Locker\XApi\Actor';
4+
protected $member_type = 'Locker\XApi\Agent';
55
}

tests/assets/test.json

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
{
2-
"actor":{
3-
"mbox":"mailto:[email protected]"
4-
},
5-
"verb":{
6-
"id":"http://adlnet.gov/expapi/verbs/voided"
7-
},
8-
"object":{
9-
"id":"http://kiem.curatr3.com/courses/mentoropleiding"
10-
}
2+
"actor": {
3+
"objectType": "Group",
4+
"account": {
5+
"homePage": "http://myaccount.bmj.com",
6+
"name": "hrl"
7+
},
8+
"member": [
9+
]
10+
},
11+
"verb": {
12+
"id": "http:\/\/adlnet.gov\/expapi\/verbs\/completed",
13+
"display": {
14+
"en-GB": "completed"
15+
}
16+
},
17+
"object": {
18+
"id": "http:\/\/localhost\/moodle\/mod\/quiz\/attempt.php?attempt=48"
19+
}
1120
}

0 commit comments

Comments
 (0)