friendica
/
php-json-ld
4
1
Fork 2
Code Issues Pull Requests Releases 5 Activity

Mark term as defined once IRI mapping is set.

This commit is contained in:
Dave Longley 2013-04-16 11:11:09 -04:00
parent 7df527661d
commit 5ed2f4ea35
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jsonld.php
View File

@ -1,7 +1,7 @@
<?php <?php
/** /**
* PHP implementation of the JSON-LD API. * PHP implementation of the JSON-LD API.
* Version: 0.0.29 * Version: 0.0.30
* *
* @author Dave Longley * @author Dave Longley
* *
@ -4408,7 +4408,7 @@ class JsonLdProcessor {
} }
// create new mapping // create new mapping
$mapping = new stdClass(); $mapping = $active_ctx->mappings->{$term} = new stdClass();
$mapping->reverse = false; $mapping->reverse = false;
if(property_exists($value, '@reverse')) { if(property_exists($value, '@reverse')) {
@ -4485,6 +4485,9 @@ class JsonLdProcessor {
} }
} }
// IRI mapping now defined
$defined->{$term} = true;
if(property_exists($value, '@type')) { if(property_exists($value, '@type')) {
$type = $value->{'@type'}; $type = $value->{'@type'};
if(!is_string($type)) { if(!is_string($type)) {
@ -4541,7 +4544,6 @@ class JsonLdProcessor {
$mapping->{'@language'} = $language; $mapping->{'@language'} = $language;
} }
// disallow aliasing @context and @preserve // disallow aliasing @context and @preserve
$id = $mapping->{'@id'}; $id = $mapping->{'@id'};
if($id === '@context' || $id === '@preserve') { if($id === '@context' || $id === '@preserve') {
@ -4549,10 +4551,6 @@ class JsonLdProcessor {
'Invalid JSON-LD syntax; @context and @preserve cannot be aliased.', 'Invalid JSON-LD syntax; @context and @preserve cannot be aliased.',
'jsonld.SyntaxError', array('context' => $local_ctx)); 'jsonld.SyntaxError', array('context' => $local_ctx));
} }
// define term mapping
$active_ctx->mappings->{$term} = $mapping;
$defined->{$term} = true;
} }
/** /**