Ensure built-in directives have lowest priority (#2403)

nuwave · May 23, 2023 · b26fb27 · b26fb27
1 parent 5ef5976
commit b26fb27
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,12 @@ You can find and compare releases at the [GitHub release page](https://github.co
 
 ## Unreleased
 
+## v6.9.1
+
+### Fixed
+
+- Ensure built-in directives have the lowest priority in registration https://github.com/nuwave/lighthouse/pull/2403
+
 ## v6.9.0
 
 ### Added

diff --git a/src/Http/Responses/Stream.php b/src/Http/Responses/Stream.php
@@ -2,8 +2,6 @@
 
 namespace Nuwave\Lighthouse\Http\Responses;
 
-use Illuminate\Support\Str;
-
 abstract class Stream
 {
     /**
@@ -22,7 +20,7 @@ protected function chunkError(string $path, array $data): ?array
 
         $errorsMatchingPath = array_filter(
             $errors,
-            static fn (array $error): bool => Str::startsWith(implode('.', $error['path']), $path),
+            static fn (array $error): bool => str_starts_with(implode('.', $error['path']), $path),
         );
 
         return array_values($errorsMatchingPath);

diff --git a/src/Schema/DirectiveLocator.php b/src/Schema/DirectiveLocator.php
@@ -65,6 +65,8 @@ public function namespaces(): array
             ]))
             ->flatten()
             ->filter()
+            // Ensure built-in directives come last
+            ->sortBy(static fn (string $namespace): int => (int) str_starts_with($namespace, 'Nuwave\\Lighthouse'))
             ->all();
     }
 

diff --git a/src/Schema/Source/SchemaStitcher.php b/src/Schema/Source/SchemaStitcher.php
@@ -33,7 +33,7 @@ protected static function gatherSchemaImportsRecursively(string $path): string
     {
         return (new Collection(\Safe\file($path)))
             ->map(static function (string $line) use ($path): string {
-                if (! Str::startsWith(trim($line), '#import ')) {
+                if (! str_starts_with(trim($line), '#import ')) {
                     return rtrim($line, PHP_EOL) . PHP_EOL;
                 }
 

diff --git a/src/Subscriptions/Authorizer.php b/src/Subscriptions/Authorizer.php
@@ -59,7 +59,7 @@ public function authorize(Request $request): bool
      */
     protected function sanitizeChannelName(string $channelName): string
     {
-        if (Str::startsWith($channelName, 'presence-')) {
+        if (str_starts_with($channelName, 'presence-')) {
             return Str::substr($channelName, 9);
         }
 

diff --git a/tests/Integration/LifecycleEventsTest.php b/tests/Integration/LifecycleEventsTest.php
@@ -3,7 +3,6 @@
 namespace Tests\Integration;
 
 use Illuminate\Contracts\Events\Dispatcher as EventsDispatcher;
-use Illuminate\Support\Str;
 use Nuwave\Lighthouse\Events\BuildExtensionsResponse;
 use Nuwave\Lighthouse\Events\BuildSchemaString;
 use Nuwave\Lighthouse\Events\EndExecution;
@@ -27,7 +26,7 @@ public function testDispatchesProperLifecycleEvents(): void
         $events = [];
 
         $eventsDispatcher->listen('*', static function (string $name, array $payload) use (&$events): void {
-            if (Str::startsWith($name, 'Nuwave\\Lighthouse')) {
+            if (str_starts_with($name, 'Nuwave\\Lighthouse')) {
                 // We only fire class-based events, so the payload
                 // always holds exactly a single class instance.
                 $events[] = $payload[0];

diff --git a/tests/Unit/Schema/DirectiveLocatorTest.php b/tests/Unit/Schema/DirectiveLocatorTest.php
@@ -15,8 +15,7 @@
 
 final class DirectiveLocatorTest extends TestCase
 {
-    /** @var \Nuwave\Lighthouse\Schema\DirectiveLocator */
-    protected $directiveLocator;
+    private DirectiveLocator $directiveLocator;
 
     protected function setUp(): void
     {