Added Support for Drupal 11

Author: kedarkhaire

.github/workflows/php.yml

@@ -1,7 +1,7 @@
 name: test_and_lint
 env:
   SIMPLETEST_DB: "sqlite://localhost//tmp/test.sqlite"
-  SIMPLETEST_BASE_URL: "http://127.0.0.1:8000"  
+  SIMPLETEST_BASE_URL: "http://127.0.0.1:8000"
   APIGEE_EDGE_AUTH_TYPE: ${{ secrets.APIGEE_EDGE_AUTH_TYPE }}
   APIGEE_EDGE_ORGANIZATION: ${{ secrets.APIGEE_EDGE_ORGANIZATION }}
   APIGEE_EDGE_USERNAME: ${{ secrets.APIGEE_EDGE_USERNAME }}
@@ -22,7 +22,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     name: "PHP ${{ matrix.php-version }} | Drupal ${{ matrix.drupal-core }}"
     strategy:
@@ -34,8 +34,13 @@ jobs:
           - "8.3"
         drupal-core:
           # Should update the following as the minimum supported version from Drupal.org
-          - "10.2.x"
           - "10.3.x"
+          - "11.1.x"
+        exclude:
+          - php-version: "8.1"
+            drupal-core: "11.1.x"
+          - php-version: "8.2"
+            drupal-core: "11.1.x"
 
     steps:
 
@@ -51,7 +56,7 @@ jobs:
         coverage: "xdebug"
         php-version: "${{ matrix.php-version }}"
         tools: composer:v2
-        extensions: dom, curl, libxml, mbstring, zip, pdo, mysql, pdo_mysql, bcmath, gd, exif, iconv, opcache, imagick
+        extensions: date, dom, filter, hash, json, curl, libxml, mbstring, zip, pdo, sqlite3, mysqli, mysql, pdo_mysql, bcmath, gd, exif, iconv, opcache, imagick, openssl
 
     - name: Checkout Drupal core
       run: |
@@ -111,17 +116,17 @@ jobs:
         sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional
 
     - name: "Run PHPUnit Tests"
-      if: ${{ matrix.drupal-core != '10.2.x' || matrix.php-version != '8.2' }}
+      if: ${{ matrix.drupal-core != '10.3.x' || matrix.php-version != '8.2' }}
       run: |
         cd drupal
-        vendor/bin/phpunit -c core --verbose --color --group apigee_api_catalog --testsuite unit,kernel,functional,functional-javascript modules/contrib/apigee_api_catalog
+        vendor/bin/phpunit -c core --color --group apigee_api_catalog --testsuite unit,kernel,functional,functional-javascript modules/contrib/apigee_api_catalog
 
     - name: "Run PHPUnit Tests with Code Coverage"
-      if: ${{ matrix.drupal-core == '10.2.x' && matrix.php-version == '8.2' }}
+      if: ${{ matrix.drupal-core == '10.3.x' && matrix.php-version == '8.2' }}
       run: |
         cd drupal
         cp modules/contrib/apigee_api_catalog/phpunit.core.xml.dist core/phpunit.xml
-        vendor/bin/phpunit -c core --verbose --color --group apigee_api_catalog --testsuite unit,kernel,functional,functional-javascript --coverage-clover /tmp/coverage.xml modules/contrib/apigee_api_catalog
+        vendor/bin/phpunit -c core --color --group apigee_api_catalog --testsuite unit,kernel,functional,functional-javascript --coverage-clover /tmp/coverage.xml modules/contrib/apigee_api_catalog
 
     - name: Artifacts
       if: failure()
@@ -131,7 +136,7 @@ jobs:
         path: drupal/sites/simpletest/browser_output/*
 
     - name: Upload Coverage to Codecov
-      if: ${{ matrix.drupal-core == '10.2.x' && matrix.php-version == '8.2' }}
+      if: ${{ matrix.drupal-core == '10.3.x' && matrix.php-version == '8.2' }}
       uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}

apigee_api_catalog.info.yml

@@ -1,7 +1,7 @@
 name: 'Apigee API Catalog'
 type: module
 description: 'Display OpenAPI documentation of your APIs to your developers.'
-core_version_requirement: ^10
+core_version_requirement: ^10 || ^11
 package: 'Apigee'
 dependencies:
 - drupal:text

composer.json

@@ -5,19 +5,19 @@
     "description": "Apigee API Catalog for Drupal",
     "require": {
         "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
-        "drupal/entity": "^1.1",
-        "drupal/file_link": "^2.0",
-        "drupal/apigee_edge": "^3.0.8",
-        "webonyx/graphql-php": "^14.11"
+        "drupal/entity": "^1.6",
+        "drupal/file_link": "^2.2",
+        "drupal/apigee_edge": "^3.0.8 || ^4.0.0",
+        "webonyx/graphql-php": "^15.19"
     },
     "require-dev": {
-        "cweagans/composer-patches": "^1.6",
-        "drupal/core-dev": "^10.2",
-        "drush/drush": "^12.4.3",
-        "mglaman/drupal-check": "^1.3",
-        "phpmd/phpmd": "^2.8.2",
-        "phpmetrics/phpmetrics": "^2.5",
-        "phpstan/phpstan": "^1.5"
+        "cweagans/composer-patches": "^1.7",
+        "drupal/core-dev": "^10.3 || ^11.1",
+        "drush/drush": "^12.4.3 || ^13.3",
+        "mglaman/drupal-check": "^1.5",
+        "phpmd/phpmd": "^2.15.0",
+        "phpmetrics/phpmetrics": "^2.8",
+        "phpstan/phpstan": "^1.12"
     },
     "config": {
         "sort-packages": true

modules/apigee_asyncapi_doc/apigee_asyncapi_doc.info.yml

@@ -2,7 +2,7 @@ name: AsyncAPI for Apigee
 type: module
 description: AsyncAPI for Apigee
 package: Apigee (Experimental)
-core_version_requirement: ^10
+core_version_requirement: ^10 || ^11
 dependencies:
   - apigee_api_catalog
   - file_link

modules/apigee_freeform_doc/apigee_freeform_doc.info.yml

@@ -2,7 +2,7 @@ name: Free-form documentation for Apigee
 type: module
 description: Free-form documentation for Apigee
 package: Apigee (Experimental)
-core_version_requirement: ^10
+core_version_requirement: ^10 || ^11
 dependencies:
   - apigee_api_catalog
   - file

modules/apigee_graphql_doc/apigee_graphql_doc.info.yml

@@ -2,7 +2,7 @@ name: GraphQL for Apigee
 type: module
 description: GraphQL for Apigee
 package: Apigee (Experimental)
-core_version_requirement: ^10
+core_version_requirement: ^10 || ^11
 dependencies:
   - apigee_api_catalog
   - file_link

tests/src/Functional/ApiDocsAdminTest.php

@@ -24,6 +24,7 @@
 use Drupal\Core\Url;
 use Drupal\Tests\BrowserTestBase;
 use Drupal\Tests\TestFileCreationTrait;
+use Drupal\TestTools\Random;
 use Drupal\file\Entity\File;
 use Drupal\file\FileInterface;
 
@@ -129,7 +130,7 @@ public function testApiDocAdministration() {
 
     $page = $this->getSession()->getPage();
     $random_name = $this->randomMachineName();
-    $random_description = $this->randomGenerator->sentences(5);
+    $random_description = Random::getGenerator()->sentences(5);
     $page->fillField('title[0][value]', $random_name);
     $page->fillField('body[0][value]', $random_description);
     $page->fillField('field_apidoc_spec_file_source', 'file');