Merge pull request #8738 from annando/jsonld-tests

Added tests for JsonLD class
This commit is contained in:
Hypolite Petovan 2020-06-07 10:23:12 -04:00 committed by GitHub
commit 586eddbd1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 178 additions and 5 deletions

View file

@ -173,7 +173,7 @@ 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;
@ -191,12 +191,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;
}
}