Restore PR #2314 files to d5c128a state after merging master

spawnia · spawnia · commit 4909d776edf8 · 2026-02-10T13:47:30.000+01:00
diff --git a/composer.json b/composer.json
@@ -29,51 +29,46 @@
         "php": "^8",
         "ext-json": "*",
         "haydenpierce/class-finder": "^0.4 || ^0.5",
-        "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",
+        "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",
         "webonyx/graphql-php": "dev-nodelist-array-access as 15.1.1"
     },
     "require-dev": {
-        "algolia/algoliasearch-client-php": "^3",
+        "algolia/algoliasearch-client-php": "^3 || ^4",
         "bensampo/laravel-enum": "^5 || ^6",
+        "dms/phpunit-arraysubset-asserts": "^0.4",
         "ergebnis/composer-normalize": "^2.2.2",
-        "fakerphp/faker": "^1.21",
-        "google/protobuf": "^3.21",
-        "larastan/larastan": "^2.9.14 || ^3.0.4",
-        "laravel/framework": "^9 || ^10 || ^11 || ^12",
+        "laravel/framework": "^9 || ^10",
         "laravel/legacy-factories": "^1.1.1",
-        "laravel/pennant": "^1",
+        "laravel/lumen-framework": "^9 || ^10 || dev-master",
         "laravel/scout": "^8 || ^9 || ^10",
-        "mattiasgeniar/phpunit-query-count-assertions": "^1.1",
-        "mll-lab/graphql-php-scalars": "^6.4.1",
+        "mll-lab/graphql-php-scalars": "^6",
         "mll-lab/php-cs-fixer-config": "^5",
         "mockery/mockery": "^1.5",
-        "nesbot/carbon": "^2.62.1 || ^3.8.4",
-        "orchestra/testbench": "^7.50 || ^8.32 || ^9.10 || ^10.1",
+        "nesbot/carbon": "^2.62.1",
+        "nunomaduro/larastan": "^2",
+        "orchestra/testbench": "^7.7 || ^8.8",
         "phpbench/phpbench": "^1.2.6",
-        "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",
+        "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",
         "predis/predis": "^1.1 || ^2.1",
         "pusher/pusher-php-server": "^5 || ^6 || ^7.0.2",
-        "rector/rector": "^1 || ^2",
+        "rector/rector": "^0.12.23",
         "thecodingmachine/phpstan-safe-rule": "^1.2"
     },
     "suggest": {
-        "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",
+        "bensampo/laravel-enum": "Convenient enum definitions that can easily be registered in your Schema",
         "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",
@@ -96,22 +91,23 @@
         "allow-plugins": {
             "composer/package-versions-deprecated": true,
             "ergebnis/composer-normalize": true,
-            "kylekatarnls/update-helper": true,
-            "phpstan/extension-installer": true
+            "kylekatarnls/update-helper": 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"
diff --git a/tests/Unit/Schema/Directives/BaseDirectiveTest.php b/tests/Unit/Schema/Directives/BaseDirectiveTest.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php
 
 namespace Tests\Unit\Schema\Directives;
 
@@ -35,7 +35,7 @@ public function testGetsModelClassFromDirective(): void
 
         $this->assertSame(
             Team::class,
-            $directive->getModelClass(),
+            $directive->getModelClass()
         );
     }
 
@@ -51,7 +51,7 @@ public function testDefaultsToFieldTypeForTheModelClass(): void
 
         $this->assertSame(
             User::class,
-            $directive->getModelClass(),
+            $directive->getModelClass()
         );
     }
 
@@ -69,7 +69,7 @@ public function testBuiltInTypeTolerated(): void
 
         $this->assertSame(
             Team::class,
-            $directive->getModelClass(),
+            $directive->getModelClass()
         );
     }
 
@@ -99,7 +99,7 @@ public function testResolvesAModelThatIsNamedLikeABaseClass(): void
 
         $this->assertSame(
             Closure::class,
-            $directive->getModelClass(),
+            $directive->getModelClass()
         );
     }
 
@@ -115,7 +115,7 @@ public function testPrefersThePrimaryModelNamespace(): void
 
         $this->assertSame(
             Category::class,
-            $directive->getModelClass(),
+            $directive->getModelClass()
         );
     }
 
@@ -131,7 +131,7 @@ public function testAllowsOverwritingTheDefaultModel(): void
 
         $this->assertSame(
             CategorySecondary::class,
-            $directive->getModelClass(),
+            $directive->getModelClass()
         );
     }
 
@@ -147,7 +147,7 @@ public function testResolvesFromTheSecondaryModelNamespace(): void
 
         $this->assertSame(
             OnlyHere::class,
-            $directive->getModelClass(),
+            $directive->getModelClass()
         );
     }
 
@@ -158,13 +158,13 @@ public function testGetsArgumentFromDirective(): void
         $this->assertSame(
             'argValue',
             // @phpstan-ignore-next-line protected method is called via wrapper below
-            $directive->directiveArgValue('argName'),
+            $directive->directiveArgValue('argName')
         );
 
         $this->assertSame(
             'argValue2',
             // @phpstan-ignore-next-line protected method is called via wrapper below
-            $directive->directiveArgValue('argName2'),
+            $directive->directiveArgValue('argName2')
         );
     }
 
@@ -182,7 +182,7 @@ public function testMutuallyExclusive(): void
         $directive = $this->constructFieldDirective('foo: ID @dummy(bar: 1, baz: 2)');
 
         $this->expectExceptionObject(
-            new DefinitionException('The arguments [bar, baz, qux] for @base are mutually exclusive, found [bar, baz] on foo.'),
+            new DefinitionException('The arguments [bar, baz, qux] for @base are mutually exclusive, found [bar, baz] on foo.')
         );
         // @phpstan-ignore-next-line protected method is called via wrapper below
         $directive->validateMutuallyExclusiveArguments(['bar', 'baz', 'qux']);
@@ -213,7 +213,7 @@ public function __call(string $method, array $args)
 
         $directive->hydrate(
             $fieldDefinition->directives->get(0),
-            $fieldDefinition,
+            $fieldDefinition
         );
 
         return $directive;
diff --git a/tests/Unit/Schema/ResolverProviderTest.php b/tests/Unit/Schema/ResolverProviderTest.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php
 
 namespace Tests\Unit\Schema;
 
@@ -12,7 +12,9 @@
 
 final class ResolverProviderTest extends TestCase
 {
-    /** @var \Nuwave\Lighthouse\Schema\ResolverProvider */
+    /**
+     * @var \Nuwave\Lighthouse\Schema\ResolverProvider
+     */
     protected $resolverProvider;
 
     public function setUp(): void
@@ -66,7 +68,7 @@ protected function constructFieldValue(string $fieldDefinition, string $parentTy
 
         return new FieldValue(
             $typeValue,
-            $queryType->fields->get(0),
+            $queryType->fields->get(0)
         );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<?php declare(strict_types=1);`
	`1`	`+<?php`
`2`	`2`
`3`	`3`	`namespace Tests\Unit\Schema;`
`4`	`4`
`@@ -12,7 +12,9 @@`
`12`	`12`
`13`	`13`	`final class ResolverProviderTest extends TestCase`
`14`	`14`	`{`
`15`		`- /** @var \Nuwave\Lighthouse\Schema\ResolverProvider */`
	`15`	`+ /**`
	`16`	`+ * @var \Nuwave\Lighthouse\Schema\ResolverProvider`
	`17`	`+ */`
`16`	`18`	`protected $resolverProvider;`
`17`	`19`
`18`	`20`	`public function setUp(): void`
`@@ -66,7 +68,7 @@ protected function constructFieldValue(string $fieldDefinition, string $parentTy`
`66`	`68`
`67`	`69`	`return new FieldValue(`
`68`	`70`	`$typeValue,`
`69`		`- $queryType->fields->get(0),`
	`71`	`+ $queryType->fields->get(0)`
`70`	`72`	`);`
`71`	`73`	`}`
`72`	`74`	`}`