Merge pull request #9345 from annando/issue-9344

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

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index 134374a02eff5a26e14cad937a51bccdbeb6fca9..2649e9073788147ef6e7117d1982892b501fbf53 100644 (file)
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -1,7 +1,24 @@
 <?php
 /**
- * @file src/Util/JsonLD.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Util;
 
 use Friendica\Core\Cache\Duration;
@@ -10,12 +27,12 @@ use Exception;
 use Friendica\DI;
 
 /**
- * @brief This class contain methods to work with JsonLD data
+ * This class contain methods to work with JsonLD data
  */
 class JsonLD
 {
        /**
-        * @brief Loader for LD-JSON validation
+        * Loader for LD-JSON validation
         *
         * @param $url
         *
@@ -51,7 +68,7 @@ class JsonLD
        }
 
        /**
-        * @brief Normalises a given JSON array
+        * Normalises a given JSON array
         *
         * @param array $json
         *
@@ -85,7 +102,7 @@ class JsonLD
        }
 
        /**
-        * @brief Compacts a given JSON array
+        * Compacts a given JSON array
         *
         * @param array $json
         *
@@ -105,7 +122,9 @@ class JsonLD
                        'ostatus' => (object)['@id' => 'http://ostatus.org#', '@type' => '@id'],
                        'dc' => (object)['@id' => 'http://purl.org/dc/terms/', '@type' => '@id'],
                        'toot' => (object)['@id' => 'http://joinmastodon.org/ns#', '@type' => '@id'],
-                       'litepub' => (object)['@id' => 'http://litepub.social/ns#', '@type' => '@id']];
+                       'litepub' => (object)['@id' => 'http://litepub.social/ns#', '@type' => '@id'],
+                       'sc' => (object)['@id' => 'http://schema.org#', '@type' => '@id'],
+                       'pt' => (object)['@id' => 'https://joinpeertube.org/ns#', '@type' => '@id']];
 
                // Preparation for adding possibly missing content to the context
                if (!empty($json['@context']) && is_string($json['@context'])) {
@@ -146,7 +165,7 @@ class JsonLD
        }
 
        /**
-        * @brief Fetches an element array from a JSON array
+        * Fetches an element array from a JSON array
         *
         * @param $array
         * @param $element
@@ -154,12 +173,8 @@ class JsonLD
         *
         * @return array fetched element
         */
-       public static function fetchElementArray($array, $element, $key = '@id')
+       public static function fetchElementArray($array, $element, $key = null)
        {
-               if (empty($array)) {
-                       return null;
-               }
-
                if (!isset($array[$element])) {
                        return null;
                }
@@ -172,12 +187,10 @@ class JsonLD
                $elements = [];
 
                foreach ($array[$element] as $entry) {
-                       if (!is_array($entry)) {
+                       if (!is_array($entry) || (is_null($key) && is_array($entry))) {
                                $elements[] = $entry;
-                       } elseif (isset($entry[$key])) {
+                       } elseif (!is_null($key) && isset($entry[$key])) {
                                $elements[] = $entry[$key];
-                       } elseif (!empty($entry) || !is_array($entry)) {
-                               $elements[] = $entry;
                        }
                }
 
@@ -185,7 +198,7 @@ class JsonLD
        }
 
        /**
-        * @brief Fetches an element from a JSON array
+        * Fetches an element from a JSON array
         *
         * @param $array
         * @param $element