Merge branch 'main' into docs/next-drupal-docs-update

Author: backlineint

.github/workflows/next.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   phpunit:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         # Supported PHP versions: https://www.drupal.org/docs/getting-started/system-requirements/php-requirements
@@ -22,15 +22,21 @@ jobs:
           - "10.0.x"
           - "10.1.x"
           - "10.2.x"
+          - "10.3.x"
+          - "11.0.x"
         exclude:
           - drupal: "10.0.x"
             php: "8.3"
           - drupal: "10.1.x"
             php: "8.3"
+          - drupal: "11.0.x"
+            php: "8.1"
+          - drupal: "11.0.x"
+            php: "8.2"
     name: Drupal ${{ matrix.drupal }} - PHP ${{ matrix.php }}
     services:
       mysql:
-        image: mysql:5.7
+        image: mysql:8.0
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
           MYSQL_DATABASE: db

modules/next/.gitlab-ci.yml

@@ -52,9 +52,11 @@ include:
 #
 # Docs at https://git.drupalcode.org/project/gitlab_templates/-/blob/1.0.x/includes/include.drupalci.variables.yml
 ################
-# variables:
-#   SKIP_ESLINT: '1'
-
+variables:
+  # SKIP_ESLINT: '1'
+  OPT_IN_TEST_PREVIOUS_MINOR: 1
+  OPT_IN_TEST_NEXT_MINOR: 1
+  OPT_IN_TEST_NEXT_MAJOR: 1
 ###################################################################################
 #
 #                                        *

modules/next/composer.json

@@ -17,6 +17,6 @@
     "drupal/subrequests": "^3.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^6.0 || ^7.0 || ^8.0 || ^9.0"
+    "phpunit/phpunit": "^9 || ^10"
   }
 }

modules/next/modules/next_extras/next_extras.info.yml

@@ -1,7 +1,7 @@
 name: Next.js Extras (Experimental)
 description: Adds extra (mostly experiemental) functionality to Next.js module
 type: module
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10 || ^11
 package: Web services
 dependencies:
   - next:next

modules/next/modules/next_extras/src/NextCacheInvalidator.php

@@ -143,7 +143,8 @@ public function invalidatePath(string $path, array $sites): void {
         }
       }
       catch (RequestException $exception) {
-        watchdog_exception('next_extras', $exception);
+        // Using logger service to log the exception.
+        $this->logger->error($exception->getMessage());
       }
     }
   }

modules/next/modules/next_graphql/next_graphql.info.yml

@@ -1,7 +1,7 @@
 name: 'Next.js GraphQL'
 type: module
 description: 'GraphQL for Next.js'
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10 || ^11
 package: Web services
 dependencies:
   - graphql:graphql

modules/next/modules/next_jsonapi/next_jsonapi.info.yml

@@ -1,7 +1,7 @@
 name: 'Next.js JSON:API'
 type: module
 description: 'JSON:API Helpers for Next.js'
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10 || ^11
 package: Web services
 dependencies:
   - decoupled_router:decoupled_router

modules/next/modules/next_jsonapi/src/NextJsonapiServiceProvider.php

@@ -15,7 +15,6 @@ class NextJsonapiServiceProvider extends ServiceProviderBase {
    */
   public function alter(ContainerBuilder $container) {
     /** @var \Symfony\Component\DependencyInjection\Definition $definition */
-
     if ($container->hasDefinition('jsonapi.entity_resource')) {
       $definition = $container->getDefinition('jsonapi.entity_resource');
       $definition->setClass('Drupal\next_jsonapi\Controller\EntityResource');

modules/next/modules/next_jsonapi/tests/src/Kernel/Controller/EntityResourceTest.php

@@ -8,7 +8,7 @@
 use Drupal\Tests\node\Traits\NodeCreationTrait;
 use Drupal\Tests\user\Traits\UserCreationTrait;
 use Drupal\user\Entity\User;
-use Symfony\Component\HttpFoundation\ParameterBag;
+use Symfony\Component\HttpFoundation\InputBag;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -45,7 +45,6 @@ protected function setUp(): void {
     $this->installEntitySchema('node');
     $this->installEntitySchema('user');
     $this->installConfig(['filter', 'next']);
-    $this->installSchema('system', ['sequences']);
     $this->installSchema('node', ['node_access']);
 
     $type = NodeType::create([
@@ -91,14 +90,14 @@ public function testPageLimit() {
 
     // Default using \Drupal\jsonapi\Query\OffsetPage::SIZE_MAX.
     $request = Request::create('/jsonapi/node/article');
-    $request->query = new ParameterBag();
+    $request->query = new InputBag();
     $response = $entity_resource->getCollection($resource_type, $request);
     $data = $response->getResponseData()->getData();
     $this->assertSame(50, $data->count());
 
     // With page limit.
     $request = Request::create('/jsonapi/node/article');
-    $request->query = new ParameterBag([
+    $request->query = new InputBag([
       'page' => [
         'limit' => 10,
       ],
@@ -109,7 +108,7 @@ public function testPageLimit() {
 
     // With page limit over size max.
     $request = Request::create('/jsonapi/node/article');
-    $request->query = new ParameterBag([
+    $request->query = new InputBag([
       'page' => [
         'limit' => 100,
       ],
@@ -120,7 +119,7 @@ public function testPageLimit() {
 
     // With page limit and offset.
     $request = Request::create('/jsonapi/node/article');
-    $request->query = new ParameterBag([
+    $request->query = new InputBag([
       'page' => [
         'offset' => 2,
         'limit' => 5,
@@ -132,7 +131,7 @@ public function testPageLimit() {
 
     // With fields as sparse fieldset.
     $request = Request::create('/jsonapi/node/article');
-    $request->query = new ParameterBag([
+    $request->query = new InputBag([
       'fields' => [
         'node--article' => 'title',
       ],
@@ -143,7 +142,7 @@ public function testPageLimit() {
 
     // Using sparse fieldset path override.
     $request = Request::create('/jsonapi/node/article');
-    $request->query = new ParameterBag([
+    $request->query = new InputBag([
       'fields' => [
         'node--article' => 'path,title',
       ],
@@ -154,7 +153,7 @@ public function testPageLimit() {
 
     // Using sparse fieldset path override and limit.
     $request = Request::create('/jsonapi/node/article');
-    $request->query = new ParameterBag([
+    $request->query = new InputBag([
       'fields' => [
         'node--article' => 'path,title',
       ],
@@ -168,7 +167,7 @@ public function testPageLimit() {
 
     // Using sparse fieldset path override and limit.
     $request = Request::create('/jsonapi/node/article');
-    $request->query = new ParameterBag([
+    $request->query = new InputBag([
       'fields' => [
         'node--article' => 'path,title',
       ],

modules/next/modules/next_jwt/next_jwt.info.yml

@@ -1,7 +1,7 @@
 name: Next.js JWT (Experimental)
 type: module
 description: 'Generates preview URLs using JSON Web Token'
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10 || ^11
 package: Web services
 dependencies:
   - next:next