Merge pull request #5833 from MrPetovan/develop

[friendica.git] / src / Util / JsonLD.php

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index 8fd9f90cb4d292852547502093a341aacc824b62..ddf8d93533ea121508dae2bfdace65f854c4edf5 100644 (file)
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -5,13 +5,20 @@
 namespace Friendica\Util;
 
 use Friendica\Core\Cache;
-use digitalbazaar\jsonld as DBJsonLD;
+use Exception;
 
 /**
  * @brief This class contain methods to work with JsonLD data
  */
 class JsonLD
 {
+       /**
+        * @brief Loader for LD-JSON validation
+        *
+        * @param $url
+        *
+        * @return the loaded data
+        */
        public static function documentLoader($url)
        {
                $recursion = 0;
@@ -40,15 +47,37 @@ class JsonLD
                return $data;
        }
 
+       /**
+        * @brief Normalises a given JSON array
+        *
+        * @param array $json
+        *
+        * @return normalized JSON string
+        */
        public static function normalize($json)
        {
                jsonld_set_document_loader('Friendica\Util\JsonLD::documentLoader');
 
-               $jsonobj = json_decode(json_encode($json));
+               $jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
 
-               return jsonld_normalize($jsonobj, array('algorithm' => 'URDNA2015', 'format' => 'application/nquads'));
+               try {
+                       $normalized = jsonld_normalize($jsonobj, array('algorithm' => 'URDNA2015', 'format' => 'application/nquads'));
+               }
+               catch (Exception $e) {
+                       $normalized = false;
+                       logger('normalise error:' . print_r($e, true), LOGGER_DEBUG);
+               }
+
+               return $normalized;
        }
 
+       /**
+        * @brief Compacts a given JSON array
+        *
+        * @param array $json
+        *
+        * @return comacted JSON array
+        */
        public static function compact($json)
        {
                jsonld_set_document_loader('Friendica\Util\JsonLD::documentLoader');
@@ -59,13 +88,24 @@ class JsonLD
                        'vcard' => (object)['@id' => 'http://www.w3.org/2006/vcard/ns#', '@type' => '@id'],
                        'uuid' => (object)['@id' => 'http://schema.org/identifier', '@type' => '@id']];
 
-               $jsonobj = json_decode(json_encode($json));
+               $jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
 
                $compacted = jsonld_compact($jsonobj, $context);
 
-               return json_decode(json_encode($compacted), true);
+               return json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true);
        }
 
+       /**
+        * @brief Fetches an element from a JSON array
+        *
+        * @param $array
+        * @param $element
+        * @param $key
+        * @param $type
+        * @param $type_value
+        *
+        * @return fetched element
+        */
        public static function fetchElement($array, $element, $key, $type = null, $type_value = null)
        {
                if (empty($array)) {