@@ -52,7 +52,7 @@ |
||
52 | 52 | */ |
53 | 53 | public function supportsNormalization($data, $format = null) |
54 | 54 | { |
55 | - return $data instanceof Extensions; |
|
55 | + return $data instanceof Extensions; |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | /** |
@@ -14,7 +14,6 @@ |
||
14 | 14 | use Xabbuh\XApi\Model\Activity; |
15 | 15 | use Xabbuh\XApi\Model\IRI; |
16 | 16 | use Xabbuh\XApi\Model\StatementObject; |
17 | -use Xabbuh\XApi\Model\Statement; |
|
18 | 17 | use Xabbuh\XApi\Model\StatementId; |
19 | 18 | use Xabbuh\XApi\Model\StatementReference; |
20 | 19 | use Xabbuh\XApi\Model\SubStatement; |
@@ -113,6 +113,9 @@ discard block |
||
113 | 113 | return 'Xabbuh\XApi\Model\Activity' === $type || 'Xabbuh\XApi\Model\StatementObject' === $type || 'Xabbuh\XApi\Model\Object' === $type || 'Xabbuh\XApi\Model\StatementReference' === $type || 'Xabbuh\XApi\Model\SubStatement' === $type; |
114 | 114 | } |
115 | 115 | |
116 | + /** |
|
117 | + * @param string $format |
|
118 | + */ |
|
116 | 119 | private function denormalizeActivity(array $data, $format = null, array $context = array()) |
117 | 120 | { |
118 | 121 | $definition = null; |
@@ -124,6 +127,9 @@ discard block |
||
124 | 127 | return new Activity(IRI::fromString($data['id']), $definition); |
125 | 128 | } |
126 | 129 | |
130 | + /** |
|
131 | + * @param string $format |
|
132 | + */ |
|
127 | 133 | private function denormalizeSubStatement(array $data, $format = null, array $context = array()) |
128 | 134 | { |
129 | 135 | $actor = $this->denormalizeData($data['actor'], 'Xabbuh\XApi\Model\Actor', $format, $context); |
@@ -84,10 +84,10 @@ |
||
84 | 84 | $actor = $this->denormalizeData($data['actor'], 'Xabbuh\XApi\Model\Actor', $format, $context); |
85 | 85 | $verb = $this->denormalizeData($data['verb'], 'Xabbuh\XApi\Model\Verb', $format, $context); |
86 | 86 | if (class_exists('Xabbuh\XApi\Model\StatementObject')) { |
87 | - $object = $this->denormalizeData($data['object'], 'Xabbuh\XApi\Model\StatementObject', $format, $context); |
|
88 | - } else { |
|
89 | - $object = $this->denormalizeData($data['object'], 'Xabbuh\XApi\Model\Object', $format, $context); |
|
90 | - } |
|
87 | + $object = $this->denormalizeData($data['object'], 'Xabbuh\XApi\Model\StatementObject', $format, $context); |
|
88 | + } else { |
|
89 | + $object = $this->denormalizeData($data['object'], 'Xabbuh\XApi\Model\Object', $format, $context); |
|
90 | + } |
|
91 | 91 | $result = null; |
92 | 92 | $authority = null; |
93 | 93 | $created = null; |