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

Fix bugs w/remote doc errors and add FIXME for empty property issue.

Browse source
This commit is contained in:
Dave Longley 2014-04-24 15:42:17 -04:00
parent 31f9c15a1c
commit 57e3928ca2
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
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.3.3 * Version: 0.3.4
* *
* @author Dave Longley * @author Dave Longley
* *
@ -333,7 +333,7 @@ function jsonld_default_document_loader($url) {
break; break;
}; };
})); }));
$result = file_get_contents($url, false, $context); $result = @file_get_contents($url, false, $context);
if($result === false) { if($result === false) {
throw new JsonLdException( throw new JsonLdException(
'Could not retrieve a JSON-LD document from the URL: ' . $url, 'Could not retrieve a JSON-LD document from the URL: ' . $url,
@ -417,7 +417,7 @@ function jsonld_default_secure_document_loader($url) {
break; break;
}; };
})); }));
$result = file_get_contents($url, false, $context); $result = @file_get_contents($url, false, $context);
if($result === false) { if($result === false) {
throw new JsonLdException( throw new JsonLdException(
'Could not retrieve a JSON-LD document from the URL: ' + $url, 'Could not retrieve a JSON-LD document from the URL: ' + $url,
@ -955,7 +955,7 @@ class JsonLdProcessor {
} }
} catch(Exception $e) { } catch(Exception $e) {
throw new JsonLdException( throw new JsonLdException(
'Could not retrieve a JSON-LD document from the URL: ' . $url, 'Could not retrieve a JSON-LD document from the URL.',
'jsonld.LoadDocumentError', 'loading document failed', 'jsonld.LoadDocumentError', 'loading document failed',
array('remoteDoc' => $remote_doc), $e); array('remoteDoc' => $remote_doc), $e);
} }
@ -1112,9 +1112,9 @@ class JsonLdProcessor {
} }
} catch(Exception $e) { } catch(Exception $e) {
throw new JsonLdException( throw new JsonLdException(
'Could not retrieve a JSON-LD document from the URL: ' . $url, 'Could not retrieve a JSON-LD document from the URL.',
'jsonld.LoadDocumentError', 'loading document failed', 'jsonld.LoadDocumentError', 'loading document failed',
array('remoteDoc' => $remote_doc), $e); array('remoteDoc' => $remote_frame), $e);
} }
// preserve frame context // preserve frame context
@ -3578,6 +3578,10 @@ class JsonLdProcessor {
if($property === '@graph') { if($property === '@graph') {
// add graph subjects map entry // add graph subjects map entry
if(!property_exists($graphs, $name)) { if(!property_exists($graphs, $name)) {
// FIXME: temporary hack to avoid empty property bug
if(!$name) {
$name = '"';
}
$graphs->{$name} = new stdClass(); $graphs->{$name} = new stdClass();
} }
$g = ($graph === '@merged') ? $graph : $name; $g = ($graph === '@merged') ? $graph : $name;