MrPetovan/php-json-ld
1
0
Fork 0
forked from friendica/php-json-ld
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix bugs to pass expansion tests.

Browse source
This commit is contained in:
Dave Longley 2013-02-07 23:08:48 -05:00
parent 6fbdfaa3b6
commit a8ce5ba4a2
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
jsonld.php
View file

@ -1750,7 +1750,7 @@ class JsonLdProcessor {
// handle index container (skip if value is not an object) // handle index container (skip if value is not an object)
else if($container === '@index' && is_object($value)) { else if($container === '@index' && is_object($value)) {
$expand_index_map = function($active_property) use ( $expand_index_map = function($active_property) use (
$active_ctx, $active_property, $options, $value) { $active_ctx, $options, $value) {
$rval = array(); $rval = array();
$keys = array_keys((array)$value); $keys = array_keys((array)$value);
sort($keys); sort($keys);
@ -1779,7 +1779,7 @@ class JsonLdProcessor {
$next_active_property = null; $next_active_property = null;
} }
$expanded_value = $this->_expand( $expanded_value = $this->_expand(
$active_ctx, $active_property, $value, $options, $is_list); $active_ctx, $next_active_property, $value, $options, $is_list);
if($is_list && self::_isList($expanded_value)) { if($is_list && self::_isList($expanded_value)) {
throw new JsonLdException( throw new JsonLdException(
'Invalid JSON-LD syntax; lists of lists are not permitted.', 'Invalid JSON-LD syntax; lists of lists are not permitted.',
@ -1899,7 +1899,7 @@ class JsonLdProcessor {
!$options['keepFreeFloatingNodes'] && !$inside_list && !$options['keepFreeFloatingNodes'] && !$inside_list &&
($active_property === null || $expanded_active_property === '@graph')) { ($active_property === null || $expanded_active_property === '@graph')) {
// drop empty object or top-level @value // drop empty object or top-level @value
if($count === 0 || property_exists($rval, '@value')) { if($count === 0 || property_exists($rval, '@value')) {
$rval = null; $rval = null;
} }
else { else {
@ -1912,7 +1912,7 @@ class JsonLdProcessor {
break; break;
} }
} }
if(!$has_triples) { if(!$has_triples) {
$rval = null; $rval = null;
} }
} }