X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FJsonLD.php;h=ddf8d93533ea121508dae2bfdace65f854c4edf5;hb=ee32459358c6ca818f368e55e49147e4dcdcc690;hp=600896715a5d2b2e4201d0bf37b6938b265e786a;hpb=c083ae047c4259dcfa1c61a3795679bbf1b08d8c;p=friendica.git

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index 600896715a..ddf8d93533 100644
--- 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,30 +47,37 @@ 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;
-	        }
-	}
-
+	/**
+	 * @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 = 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'));
+		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');
@@ -81,6 +95,17 @@ class JsonLD
 		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)) {