From 055d4a601e50966f8f53c62904a393a9de9af143 Mon Sep 17 00:00:00 2001 From: Torsten Blindert Date: Thu, 29 Nov 2018 11:21:05 +0100 Subject: [PATCH 1/3] BUGFIX: ResolveInfo:: is already an array in graphql-php --- src/Stitching/Errors.php | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/Stitching/Errors.php b/src/Stitching/Errors.php index 97b5797..10dbe1e 100755 --- a/src/Stitching/Errors.php +++ b/src/Stitching/Errors.php @@ -127,7 +127,7 @@ public function __construct(string $message, array $errors) $locatedError = Error::createLocatedError( $newError, $info->fieldNodes, - static::responsePathAsArray($info->path) + $info->path ); throw $locatedError; } @@ -141,23 +141,6 @@ public function __construct(string $message, array $errors) return $resultObject; } - /** - * @param mixed[]|null $path - * - * @return mixed[] - */ - public static function responsePathAsArray(?array $path) : array - { - $flattened = []; - $curr = $path; - while ($curr) { - $flattened[] = $curr['key']; - $curr = $curr['prev']; - } - - return array_reverse($flattened); - } - /** * @param Error[] $errors */ From e9e4e66f8342ff6f202bad19b695c2b36d22d9f7 Mon Sep 17 00:00:00 2001 From: Torsten Blindert Date: Thu, 29 Nov 2018 11:59:13 +0100 Subject: [PATCH 2/3] BUGFIX: Removed unused function --- src/Stitching/Errors.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Stitching/Errors.php b/src/Stitching/Errors.php index 10dbe1e..fc18373 100755 --- a/src/Stitching/Errors.php +++ b/src/Stitching/Errors.php @@ -11,7 +11,6 @@ use function array_keys; use function array_map; use function array_merge; -use function array_reverse; use function array_slice; use function count; use function implode; From 941ee7f752a57c79308ff8c3c37a8637166441f1 Mon Sep 17 00:00:00 2001 From: Torsten Blindert Date: Thu, 29 Nov 2018 12:05:42 +0100 Subject: [PATCH 3/3] BUGFIX: Fixed DefaultMergedResolver --- src/Stitching/DefaultMergedResolver.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Stitching/DefaultMergedResolver.php b/src/Stitching/DefaultMergedResolver.php index 400ae6e..39b08ac 100755 --- a/src/Stitching/DefaultMergedResolver.php +++ b/src/Stitching/DefaultMergedResolver.php @@ -29,7 +29,9 @@ public static function invoke($parent, array $args, $context, ResolveInfo $info) if ($errorResult['kind'] === 'OWN') { $error = Error::createLocatedError( - new Error($errorResult['error']->message, $info->fieldNodes, Errors::responsePathAsArray($info->path)) + new Error($errorResult['error']->message), + $info->fieldNodes, + $info->path ); throw $error; }