Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-01 19:04:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

Cleaned code

Browse source
This commit is contained in:
Michael 2018-09-25 21:18:37 +00:00
parent 834422d52f
commit e91a1dfa8e
3 changed files with 53 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Util/JsonLD.php
View file

@ -40,25 +40,10 @@ class JsonLD
return $data;
}
private static function objectify($element)
{
if (is_array($element)) {
$keys = array_keys($element);
if (is_int(array_pop($keys))) {
return array_map('objectify', $element);
} else {
return (object)array_map('objectify', $element);
}
} else {
return $element;
}
}
public static function normalize($json)
{
jsonld_set_document_loader('Friendica\Util\JsonLD::documentLoader');
// $jsonobj = array_map('Friendica\Util\JsonLD::objectify', $json);
$jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
return jsonld_normalize($jsonobj, array('algorithm' => 'URDNA2015', 'format' => 'application/nquads'));

16
src/Util/LDSignature.php
View file

@ -82,25 +82,21 @@ class LDSignature
return array_merge($data, ['signature' => $options]);
}
private static function signable_data($data)
{
unset($data['signature']);
return $data;
}
private static function signable_options($options)
{
$newopts = ['@context' => 'https://w3id.org/identity/v1'];
if (!empty($options)) {
foreach ($options as $k => $v) {
if (!in_array($k, ['type', 'id', 'signatureValue'])) {
$newopts[$k] = $v;
}
}
}
return $newopts;
unset($options['type']);
unset($options['id']);
unset($options['signatureValue']);
return array_merge($newopts, $options);
}
private static function hash($obj)