Skip to content

Commit 92c8d9a

Browse files
authored
fix(Statement Object): Avoids use of reserved "Object" keyword in PHP. (#18 - Thanks @davidpesce)
1 parent 61a6aa2 commit 92c8d9a

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ vendor
66
composer.lock
77
composer.phar
88

9+
.idea/
10+
911
tests/assets/test.json

src/Element.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function setValue($new_value) {
6666

6767
/**
6868
* Gets all of the properties set on an $object or ($this->value).
69-
* @param Object
69+
* @param StatementObject
7070
* @return [string]
7171
*/
7272
protected function getSetProps($object = null) {

src/StatementBase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class StatementBase extends Element {
55
protected $props = [
66
'actor' => 'Locker\XApi\Actor',
77
'verb' => 'Locker\XApi\Verb',
8-
'object' => 'Locker\XApi\Object',
8+
'object' => 'Locker\XApi\StatementObject',
99
'result' => 'Locker\XApi\Result',
1010
'context' => 'Locker\XApi\Context',
1111
'timestamp' => 'Locker\XApi\Timestamp',

src/Object.php renamed to src/StatementObject.php

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

3-
class Object extends Blueprint {
3+
class StatementObject extends Blueprint {
44
protected $default_type = 'Activity';
55
protected $accepted_types = [
66
'Activity',

0 commit comments

Comments
 (0)