Review changes

webonyx · Dec 2, 2024 · e0f9753 · e0f9753
1 parent 39e07e4
commit e0f9753
Show file tree

Hide file tree

Showing 2 changed files with 199 additions and 62 deletions.
diff --git a/src/Type/Definition/ResolveInfo.php b/src/Type/Definition/ResolveInfo.php
@@ -168,7 +168,6 @@ public function __construct(
      * $this->fieldName up to $depth levels.
      *
      * Example:
-     * query MyQuery{
      * {
      *   root {
      *     id,
@@ -186,8 +185,8 @@ public function __construct(
      * [
      *     'id' => true,
      *     'nested' => [
-     *         nested1 => true,
-     *         nested2 => true
+     *         'nested1' => true,
+     *         'nested2' => true
      *     ]
      * ]
      *
@@ -225,16 +224,15 @@ public function getFieldSelection(int $depth = 0): array
      * containing the subfield of this field/alias. Each of those field have the same structure as described above.
      *
      * Example:
-     * query MyQuery{
      * {
      *   root {
-     *     id,
+     *     id
      *     nested {
-     *      nested1(myArg:1)
-     *      nested1Bis:nested1
+     *      nested1(myArg: 1)
+     *      nested1Bis: nested1
      *     }
      *     alias1:nested {
-     *       nested1(myArg:2, mySecondAg:"test")
+     *       nested1(myArg: 2, mySecondAg: "test")
      *     }
      *   }
      * }
@@ -245,36 +243,36 @@ public function getFieldSelection(int $depth = 0): array
      *     'id' => [
      *          'aliases' => [
      *              'id' => [
-     *                  [args] => []
+     *                  'args' => []
      *              ]
      *          ]
      *      ],
      *      'nested' => [
      *           'aliases' => [
      *               'nested' => [
-     *                  ['args'] => [],
-     *                  ['fields'] => [
+     *                  'args' => [],
+     *                  'fields' => [
      *                      'nested1' => [
      *                          'aliases' => [
      *                              'nested1' => [
-     *                                  ['args'] => [
+     *                                  'args' => [
      *                                      'myArg' => 1
      *                                  ]
      *                              ],
      *                              'nested1Bis' => [
-     *                                  ['args'] => []
+     *                                  'args' => []
      *                              ]
      *                          ]
      *                      ]
      *                  ]
      *               ],
      *               'alias1' => [
-     *                  ['args'] => [],
-     *                  ['fields'] => [
+     *                  'args' => [],
+     *                  'fields' => [
      *                       'nested1' => [
      *                           'aliases' => [
      *                               'nested1' => [
-     *                                   ['args'] => [
+     *                                   'args' => [
      *                                       'myArg' => 2,
      *                                       'mySecondAg' => "test"
      *                                   ]
@@ -292,18 +290,17 @@ public function getFieldSelection(int $depth = 0): array
      * You still can alias the union type fields with the same name in order to extract their corresponding args.
      *
      * Example:
-     *  query MyQuery{
      *  {
      *    root {
-     *      id,
+     *      id
      *      unionPerson {
      *        ...on Child {
      *          name
-     *          birthdate(format:"d/m/Y")
+     *          birthdate(format: "d/m/Y")
      *        }
      *        ...on Adult {
-     *          adultName:name
-     *          adultBirthDate:birthdate(format:"Y-m-d")
+     *          adultName: name
+     *          adultBirthDate:birthdate(format: "Y-m-d")
      *          job
      *        }
      *      }
@@ -411,7 +408,10 @@ private function foldSelectionWithAlias(SelectionSetNode $selectionSet, int $des
                 assert($parentType instanceof HasFieldsType, 'ensured by query validation and the check above which excludes union types');
 
                 $fieldDef = $parentType->getField($fieldName);
-                $fieldType = Type::getNamedType($fieldDef->getType());
+                $fieldType = $fieldDef->getType();
+                if ($fieldType instanceof WrappingType) {
+                    $fieldType = $fieldType->getInnermostType();
+                }
                 $fields[$fieldName]['aliases'][$aliasName]['args'] = Values::getArgumentValues($fieldDef, $selectionNode, $this->variableValues);
 
                 if ($descend > 0 && $selectionNode->selectionSet !== null) {