Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3039730 by ndobromirov, Wim Leers, e0ipso, l0ke, webchick, xjm: Include paths are resolved for every resource in a resource collection, instead of once per unique resource type

merge-requests/1119/head
Alex Pott 2019-06-12 10:30:31 +03:00
parent 8b80368cac
commit c1b9f95417
No known key found for this signature in database
GPG Key ID: 31905460D4A69276
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/modules/jsonapi/src/IncludeResolver.php
View File

@ -176,11 +176,17 @@ class IncludeResolver {
$exploded_paths = array_map(function ($include_path) { $exploded_paths = array_map(function ($include_path) {
return array_map('trim', explode('.', $include_path)); return array_map('trim', explode('.', $include_path));
}, $include_paths); }, $include_paths);
$resolved_paths = []; $resolved_paths_per_resource_type = [];
/* @var \Drupal\jsonapi\JsonApiResource\ResourceIdentifierInterface $resource_object */ /* @var \Drupal\jsonapi\JsonApiResource\ResourceIdentifierInterface $resource_object */
foreach ($data as $resource_object) { foreach ($data as $resource_object) {
$resolved_paths = array_merge($resolved_paths, static::resolveInternalIncludePaths($resource_object->getResourceType(), $exploded_paths)); $resource_type = $resource_object->getResourceType();
$resource_type_name = $resource_type->getTypeName();
if (isset($resolved_paths_per_resource_type[$resource_type_name])) {
continue;
} }
$resolved_paths_per_resource_type[$resource_type_name] = static::resolveInternalIncludePaths($resource_type, $exploded_paths);
}
$resolved_paths = array_reduce($resolved_paths_per_resource_type, 'array_merge', []);
return static::buildTree($resolved_paths); return static::buildTree($resolved_paths);
} }