Merge branch 'master' into fork/alancolant/resolve-query-instance

Author: mfn

.github/workflows/analysis.yml

@@ -3,6 +3,8 @@ name: Code Analysis
 on:
   pull_request:
   push:
+    branches:
+      - master
   schedule:
     # Run Monday morning at 3 o'clock
     #       ┌───────────── minute (0 - 59)
@@ -28,7 +30,7 @@ jobs:
       COMPOSER_NO_INTERACTION: 1
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: shivammathur/setup-php@v2
         with:
@@ -58,11 +60,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.3
+          php-version: 8.4
           coverage: none
 
       - name: Get composer cache directory

.github/workflows/integration_tests.yml

@@ -3,6 +3,8 @@ name: Integration tests
 on:
   pull_request:
   push:
+    branches:
+      - master
   schedule:
     # Run Monday morning at 3 o'clock
     #       ┌───────────── minute (0 - 59)
@@ -25,15 +27,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.2, 8.3, 8.4]
+        php: [8.2, 8.3, 8.4, 8.5]
         laravel: [^11.0, ^12.0]
     name: P=${{ matrix.php }} L=${{ matrix.laravel }}
     runs-on: ubuntu-latest
     env:
       COMPOSER_NO_INTERACTION: 1
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: shivammathur/setup-php@v2
         with:

.github/workflows/tests.yml

@@ -3,6 +3,8 @@ name: Tests
 on:
   pull_request:
   push:
+    branches:
+      - master
   schedule:
     # Run Monday morning at 3 o'clock
     #       ┌───────────── minute (0 - 59)
@@ -25,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.2, 8.3, 8.4]
+        php: [8.2, 8.3, 8.4, 8.5]
         laravel: [^11.0, ^12.0]
         stability: [prefer-lowest, prefer-stable]
     name: P=${{ matrix.php }} L=${{ matrix.laravel }} ${{ matrix.stability }}
@@ -34,7 +36,7 @@ jobs:
       COMPOSER_NO_INTERACTION: 1
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: shivammathur/setup-php@v2
         with:

.php-cs-fixer.dist.php

@@ -9,4 +9,5 @@
 return (new Config())
         ->setFinder($finder)
         ->setRules(\Mfn\PhpCsFixer\Config::getRules())
-        ->setRiskyAllowed(true);
+        ->setRiskyAllowed(true)
+        ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect());

CHANGELOG.md

@@ -1,7 +1,25 @@
 CHANGELOG
 =========
 
-[Next release](https://github.com/rebing/graphql-laravel/compare/9.9.0...master)
+[Next release](https://github.com/rebing/graphql-laravel/compare/9.12.0...master)
+
+2025-11-05, 9.12.0
+------------------
+
+### Fixed
+- Fixed type declaration mismatch in scalar type classes generated by `make:graphql:scalar` command by removing premature type hints from the stub [\#1190 / iisyos](https://github.com/rebing/graphql-laravel/pull/1190)
+
+2025-10-07, 9.11.0
+------------------
+
+## Added
+- Add `route_attributes` support for GraphQL routes [\#1186 / alissn](https://github.com/rebing/graphql-laravel/pull/1186)
+
+2025-05-17, 9.10.0
+------------------
+
+## Added
+- Support Laravels cursor pagination [\#1180 / Davidnadejdin](https://github.com/rebing/graphql-laravel/pull/1180)
 
 2025-02-24, 9.9.0
 -----------------

README.md

@@ -63,6 +63,7 @@ config/graphql.php
       - [GraphQL resolver middleware](#graphql-resolver-middleware)
     - [Schemas](#schemas)
       - [Schema classes](#schema-classes)
+      - [Route attributes](#route-attributes)
     - [Creating a query](#creating-a-query)
     - [Creating a mutation](#creating-a-mutation)
       - [File uploads](#file-uploads)
@@ -245,7 +246,7 @@ schemas and assign different **HTTP middleware** and **execution middleware** to
 them, in addition to the global middleware. For example:
 
 ```php
-'schema' => 'default',
+'default_schema' => 'default',
 
 'schemas' => [
     'default' => [
@@ -275,6 +276,11 @@ them, in addition to the global middleware. For example:
         'execution_middleware' => [
             \Rebing\GraphQL\Support\ExecutionMiddleware\UnusedVariablesMiddleware::class,
         ],
+        // Route attributes applied to the generated HTTP route for this schema
+        // Example: expose this schema on a dedicated subdomain
+        'route_attributes' => [
+            'domain' => 'api.example.com',
+        ],
     ],
 ],
 ```
@@ -284,6 +290,24 @@ which it is accessible. Per the default configuration of `prefix = graphql`, the
 _default_ schema is accessible via `/graphql`.
 
 
+#### Route attributes
+
+You can customize the HTTP route generated for a specific schema using the `route_attributes` key.
+This is useful for setting parameters supported by Laravel routes, e.g. a custom `domain`.
+
+```php
+'schemas' => [
+    'with_custom_domain' => [
+        'query' => [
+            App\GraphQL\Queries\UsersQuery::class,
+        ],
+        'middleware' => ['auth:api'],
+        'route_attributes' => [
+            'domain' => 'api.example.com',
+        ],
+    ],
+]
+```
 
 
 #### Schema classes
@@ -1895,6 +1919,37 @@ class PostsQuery extends Query
 }
 ```
 
+[Cursor Pagination](https://laravel.com/docs/pagination#cursor-pagination) will be used, if a query or mutation returns a `CursorPaginationType`.
+
+```php
+namespace App\GraphQL\Queries;
+
+use Closure;
+use GraphQL\Type\Definition\ResolveInfo;
+use GraphQL\Type\Definition\Type;
+use Rebing\GraphQL\Support\Facades\GraphQL;
+use Rebing\GraphQL\Support\Query;
+
+class PostsQuery extends Query
+{
+    public function type(): Type
+    {
+        return GraphQL::cursorPaginate('posts');
+    }
+
+    // ...
+
+    public function resolve($root, array $args, $context, ResolveInfo $info, Closure $getSelectFields)
+    {
+        $fields = $getSelectFields();
+
+        return Post::with($fields->getRelations())
+            ->select($fields->getSelect())
+            ->cursorPaginate($args['limit'], ['*'], 'cursorName', $args['cursor']);
+    }
+}
+```
+
 ### Batching
 
 Batched requests are required to be sent via a POST request.
@@ -2005,7 +2060,7 @@ class EpisodeEnum extends EnumType
 > will be able to choose from, while the value is what will your server receive (what will enum
 > be resolved to).
 
-The Enum will be registered like any other type in your schema in `config/graphq.php`:
+The Enum will be registered like any other type in your schema in `config/graphql.php`:
 
 ```php
 'schemas' => [
@@ -2266,7 +2321,7 @@ class ReviewInput extends InputType
 }
 ```
 
-The Input Object will be registered like any other type in your schema in `config/graphq.php`:
+The Input Object will be registered like any other type in your schema in `config/graphql.php`:
 
 ```php
 'schemas' => [

config/config.php

@@ -93,6 +93,13 @@
 
             // An array of middlewares, overrides the global ones
             'execution_middleware' => null,
+
+            // Route attributes applied when generating the HTTP route for this schema
+            // Example:
+            // 'route_attributes' => [
+            //     'domain' => 'api.example.com',
+            // ]
+            'route_attributes' => [],
         ],
     ],
 
@@ -152,6 +159,12 @@
      */
     'simple_pagination_type' => Rebing\GraphQL\Support\SimplePaginationType::class,
 
+    /*
+     * You can define your own cursor pagination type.
+     * Reference Rebing\GraphQL\Support\CursorPaginationType::class
+     */
+    'cursor_pagination_type' => Rebing\GraphQL\Support\CursorPaginationType::class,
+
     /*
      * Overrides the default field resolver
      * See http://webonyx.github.io/graphql-php/data-fetching/#default-field-resolver