Fix error text and details.

This commit is contained in:
Dave Longley 2013-04-03 16:31:48 -04:00
parent e19abc3ff4
commit dd369c69d0

View file

@ -4280,7 +4280,7 @@ class JsonLdProcessor {
$preserve_index = (property_exists($value, '@index') && $preserve_index = (property_exists($value, '@index') &&
$container !== '@index'); $container !== '@index');
// if there's no @index to preserve ... // if there's no @index to preserve
if(!$preserve_index) { if(!$preserve_index) {
// matching @type or @language specified in context, compact value // matching @type or @language specified in context, compact value
if(self::_hasKeyValue($value, '@type', $type) || if(self::_hasKeyValue($value, '@type', $type) ||
@ -4411,7 +4411,7 @@ class JsonLdProcessor {
if($value === '@context' || $value === '@preserve') { if($value === '@context' || $value === '@preserve') {
throw new JsonLdException( throw new JsonLdException(
'Invalid JSON-LD syntax; @context and @preserve cannot be aliased.', 'Invalid JSON-LD syntax; @context and @preserve cannot be aliased.',
'jsonld.SyntaxError'); 'jsonld.SyntaxError', array('context' => $local_ctx));
} }
} }
@ -4460,8 +4460,7 @@ class JsonLdProcessor {
$id = $value->{'@id'}; $id = $value->{'@id'};
if(!is_string($id)) { if(!is_string($id)) {
throw new JsonLdException( throw new JsonLdException(
'Invalid JSON-LD syntax; @context @id value must be an array ' . 'Invalid JSON-LD syntax; @context @id value must be a string.',
'of strings or a string.',
'jsonld.SyntaxError', array('context' => $local_ctx)); 'jsonld.SyntaxError', array('context' => $local_ctx));
} }
// add @id to mapping // add @id to mapping