Align PR #2314 to master with only intended one-line NodeList changes

Author: spawnia

composer.json

@@ -29,46 +29,51 @@
         "php": "^8",
         "ext-json": "*",
         "haydenpierce/class-finder": "^0.4 || ^0.5",
-        "illuminate/auth": "^9 || ^10",
-        "illuminate/bus": "^9 || ^10",
-        "illuminate/contracts": "^9 || ^10",
-        "illuminate/http": "^9 || ^10",
-        "illuminate/pagination": "^9 || ^10",
-        "illuminate/queue": "^9 || ^10",
-        "illuminate/routing": "^9 || ^10",
-        "illuminate/support": "^9 || ^10",
-        "illuminate/validation": "^9 || ^10",
-        "laragraph/utils": "^1.5",
-        "thecodingmachine/safe": "^1 || ^2",
+        "illuminate/auth": "^9 || ^10 || ^11 || ^12",
+        "illuminate/bus": "^9 || ^10 || ^11 || ^12",
+        "illuminate/contracts": "^9 || ^10 || ^11 || ^12",
+        "illuminate/http": "^9 || ^10 || ^11 || ^12",
+        "illuminate/pagination": "^9 || ^10 || ^11 || ^12",
+        "illuminate/queue": "^9 || ^10 || ^11 || ^12",
+        "illuminate/routing": "^9 || ^10 || ^11 || ^12",
+        "illuminate/support": "^9 || ^10 || ^11 || ^12",
+        "illuminate/validation": "^9 || ^10 || ^11 || ^12",
+        "laragraph/utils": "^1.5 || ^2",
+        "thecodingmachine/safe": "^1 || ^2 || ^3",
         "webonyx/graphql-php": "dev-nodelist-array-access as 15.1.1"
     },
     "require-dev": {
-        "algolia/algoliasearch-client-php": "^3 || ^4",
+        "algolia/algoliasearch-client-php": "^3",
         "bensampo/laravel-enum": "^5 || ^6",
-        "dms/phpunit-arraysubset-asserts": "^0.4",
         "ergebnis/composer-normalize": "^2.2.2",
-        "laravel/framework": "^9 || ^10",
+        "fakerphp/faker": "^1.21",
+        "google/protobuf": "^3.21",
+        "larastan/larastan": "^2.9.14 || ^3.0.4",
+        "laravel/framework": "^9 || ^10 || ^11 || ^12",
         "laravel/legacy-factories": "^1.1.1",
-        "laravel/lumen-framework": "^9 || ^10 || dev-master",
+        "laravel/pennant": "^1",
         "laravel/scout": "^8 || ^9 || ^10",
-        "mll-lab/graphql-php-scalars": "^6",
+        "mattiasgeniar/phpunit-query-count-assertions": "^1.1",
+        "mll-lab/graphql-php-scalars": "^6.4.1",
         "mll-lab/php-cs-fixer-config": "^5",
         "mockery/mockery": "^1.5",
-        "nesbot/carbon": "^2.62.1",
-        "nunomaduro/larastan": "^2",
-        "orchestra/testbench": "^7.7 || ^8.8",
+        "nesbot/carbon": "^2.62.1 || ^3.8.4",
+        "orchestra/testbench": "^7.50 || ^8.32 || ^9.10 || ^10.1",
         "phpbench/phpbench": "^1.2.6",
-        "phpstan/phpstan": "^1.8.4",
-        "phpstan/phpstan-mockery": "^0.12 || ^1.1",
-        "phpstan/phpstan-phpunit": "^0.12 || ^1.1.1",
-        "phpunit/phpunit": "^9.5.24",
+        "phpstan/extension-installer": "^1",
+        "phpstan/phpstan": "^1.12.18 || ^2",
+        "phpstan/phpstan-mockery": "^1.1.3 || ^2",
+        "phpstan/phpstan-phpunit": "^1.1.1 || ^2",
+        "phpunit/phpunit": "^9.6.4 || ^10 || ^11 || ^12",
         "predis/predis": "^1.1 || ^2.1",
         "pusher/pusher-php-server": "^5 || ^6 || ^7.0.2",
-        "rector/rector": "^0.12.23",
+        "rector/rector": "^1 || ^2",
         "thecodingmachine/phpstan-safe-rule": "^1.2"
     },
     "suggest": {
-        "bensampo/laravel-enum": "Convenient enum definitions that can easily be registered in your Schema",
+        "ext-protobuf": "Improve protobuf serialization performance (used for tracing)",
+        "google/protobuf": "Required when using the tracing driver federated-tracing",
+        "laravel/pennant": "Required for the @feature directive",
         "laravel/scout": "Required for the @search directive",
         "mll-lab/graphql-php-scalars": "Useful scalar types, required for @whereConditions",
         "mll-lab/laravel-graphiql": "A graphical interactive in-browser GraphQL IDE - integrated with Laravel",
@@ -91,23 +96,22 @@
         "allow-plugins": {
             "composer/package-versions-deprecated": true,
             "ergebnis/composer-normalize": true,
-            "kylekatarnls/update-helper": true
+            "kylekatarnls/update-helper": true,
+            "phpstan/extension-installer": true
         },
         "sort-packages": true
     },
     "extra": {
         "laravel": {
-            "aliases": {
-                "graphql": "Nuwave\\Lighthouse\\GraphQL"
-            },
             "providers": [
                 "Nuwave\\Lighthouse\\LighthouseServiceProvider",
+                "Nuwave\\Lighthouse\\Async\\AsyncServiceProvider",
                 "Nuwave\\Lighthouse\\Auth\\AuthServiceProvider",
+                "Nuwave\\Lighthouse\\Bind\\BindServiceProvider",
                 "Nuwave\\Lighthouse\\Cache\\CacheServiceProvider",
                 "Nuwave\\Lighthouse\\GlobalId\\GlobalIdServiceProvider",
                 "Nuwave\\Lighthouse\\OrderBy\\OrderByServiceProvider",
                 "Nuwave\\Lighthouse\\Pagination\\PaginationServiceProvider",
-                "Nuwave\\Lighthouse\\Scout\\ScoutServiceProvider",
                 "Nuwave\\Lighthouse\\SoftDeletes\\SoftDeletesServiceProvider",
                 "Nuwave\\Lighthouse\\Testing\\TestingServiceProvider",
                 "Nuwave\\Lighthouse\\Validation\\ValidationServiceProvider"

tests/Unit/Schema/ResolverProviderTest.php

@@ -12,10 +12,9 @@
 
 final class ResolverProviderTest extends TestCase
 {
-    /** @var \Nuwave\Lighthouse\Schema\ResolverProvider */
-    protected $resolverProvider;
+    protected ResolverProvider $resolverProvider;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -54,13 +53,13 @@ public function testThrowsIfRootFieldHasNoResolver(): void
         $this->resolverProvider->provideResolver($fieldValue);
     }
 
-    protected function constructFieldValue(string $fieldDefinition, string $parentTypeName = RootType::QUERY): FieldValue
+    private function constructFieldValue(string $fieldDefinition, string $parentTypeName = RootType::QUERY): FieldValue
     {
-        $queryType = Parser::objectTypeDefinition(/** @lang GraphQL */ "
+        $queryType = Parser::objectTypeDefinition(/** @lang GraphQL */ <<<GRAPHQL
         type {$parentTypeName} {
             {$fieldDefinition}
         }
-        ");
+        GRAPHQL);
 
         $typeValue = new TypeValue($queryType);