Drupal 11 support

composer.json

@@ -8,7 +8,7 @@
     "require": {
         "drupal/field_group": "^3.1",
         "drupal/image_widget_crop": "^2.3",
-        "drupal/linkit": "^6.0-beta1",
+        "drupal/linkit": "^6.1 || ^7.0",
         "drupal/media_library_edit": "^3.0",
         "drupal/metatag": "^2.0.2",
         "drupal/pathauto": "^1.8",
@@ -23,6 +23,17 @@
         "composer-exit-on-patch-failure": true,
         "patchLevel": {
             "drupal/core": "-p2"
+        },
+        "patches": {
+            "drupal/field_group": {
+                "Nullable types #3490746": "https://git.drupalcode.org/project/field_group/-/commit/23540687517e3afee192f08f1c32a40d69f2dfa7.patch"
+            },
+            "drupal/paragraphs": {
+                "Nullable types #3492419": "https://git.drupalcode.org/project/paragraphs/-/commit/9efaadd62448fc847f9860a2066d81c3039daa07.patch"
+            },
+            "drupal/role_delegation": {
+                "Nullable types #3499682": "https://git.drupalcode.org/project/role_delegation/-/commit/f21be7a1f66de4a095c1398d9a53aa44bdad3524.patch"
+            }
         }
     }
 }

localgov_core.info.yml

@@ -2,7 +2,7 @@ name: LocalGov Core
 description: LocalGov Drupal helper functions and core dependencies.
 package: LocalGov Drupal
 type: module
-core_version_requirement: ^10.1
+core_version_requirement: ^10.1 || ^11
 
 dependencies:
   - drupal:block

modules/localgov_admin_theme_improvements/localgov_admin_theme_improvements.info.yml

@@ -2,4 +2,4 @@ name: LocalGov Admin Theme Improvements
 type: module
 description: 'Small items to fix issues with the admin theme.'
 package: LocalGov Drupal
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10 || ^11

modules/localgov_media/localgov_media.info.yml

@@ -2,7 +2,7 @@ name: LocalGov Media
 description: LocalGov Media configuration.
 package: LocalGov Drupal
 type: module
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10 || ^11
 
 dependencies:
   - drupal:ckeditor5

modules/localgov_media/tests/src/Functional/StandardProfileTest.php

@@ -19,11 +19,11 @@ class StandardProfileTest extends BrowserTestBase {
   protected $profile = 'standard';
 
   /**
-   * Test locagov_media installs with the Standard profile.
+   * Test localgov_media installs with the Standard profile.
    */
   public function testEnablingLocalGovMedia() {
-
     \Drupal::service('module_installer')->install(['localgov_media']);
+    $this->assertTrue(\Drupal::service('module_handler')->moduleExists('localgov_media'));
   }
 
 }

modules/localgov_roles/localgov_roles.info.yml

@@ -2,7 +2,7 @@ name: LocalGov Roles
 description: Default user roles.
 package: LocalGov Drupal
 type: module
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10 || ^11
 
 dependencies:
   - drupal:path

modules/localgov_roles/tests/modules/localgov_roles_test_one/localgov_roles_test_one.info.yml

@@ -2,5 +2,5 @@ name: 'LocalGov Roles Test Helper 1'
 type: module
 description: 'Support module for LocalGov Roles tests'
 package: Testing
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10 || ^11
 hidden: true

modules/localgov_roles/tests/modules/localgov_roles_test_two/localgov_roles_test_two.info.yml

@@ -2,5 +2,5 @@ name: 'LocalGov Roles Test Helper 2'
 type: module
 description: 'Support module for LocalGov Roles tests'
 package: Testing
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10 || ^11
 hidden: true

src/Plugin/Block/PageHeaderBlock.php

@@ -2,7 +2,6 @@
 
 namespace Drupal\localgov_core\Plugin\Block;
 
-use Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Block\BlockBase;
 use Drupal\Core\Cache\Cache;
@@ -15,6 +14,7 @@
 use Drupal\node\Entity\Node;
 use Drupal\taxonomy\Entity\Term;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
@@ -37,7 +37,7 @@ class PageHeaderBlock extends BlockBase implements ContainerFactoryPluginInterfa
   /**
    * Core event_dispatcher service.
    *
-   * @var \Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher
+   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
    */
   protected $eventDispatcher;
 
@@ -115,7 +115,7 @@ public static function create(ContainerInterface $container, array $configuratio
   /**
    * {@inheritdoc}
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, CurrentRouteMatch $current_route_match, ContainerAwareEventDispatcher $event_dispatcher, RequestStack $request_stack, TitleResolver $title_resolver) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, CurrentRouteMatch $current_route_match, EventDispatcherInterface $event_dispatcher, RequestStack $request_stack, TitleResolver $title_resolver) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
 
     $this->currentRouteMatch = $current_route_match;

tests/localgov_core_default_blocks_test/localgov_core_default_blocks_test.info.yml

@@ -1,5 +1,5 @@
 name: 'Default blocks test'
 type: module
 package: Testing
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10 || ^11
 description: Testing module for default blocks.

tests/localgov_core_page_header_event_test/localgov_core_page_header_event_test.info.yml

@@ -1,5 +1,5 @@
 name: 'Page header display event test'
 type: module
 package: Testing
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10 || ^11
 description: Testing module for the page header display event.