From 370b1a210c6dc39a6bdd820dd712190eff0700dd Mon Sep 17 00:00:00 2001
From: Vishal Kadam <56800-007vkadam@users.noreply.drupalcode.org>
Date: Fri, 10 Jan 2025 15:53:33 +0530
Subject: [PATCH] Drupal 11 compatibility fixes

---
 advanced_datalayer.info.yml                                | 2 +-
 composer.json                                              | 2 +-
 .../context_advanced_datalayer.info.yml                    | 2 +-
 .../example_advanced_datalayer.info.yml                    | 2 +-
 src/Form/AdvancedDatalayerSettingsForm.php                 | 7 ++++++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/advanced_datalayer.info.yml b/advanced_datalayer.info.yml
index 51047e9..5804cd7 100644
--- a/advanced_datalayer.info.yml
+++ b/advanced_datalayer.info.yml
@@ -2,7 +2,7 @@ name: Advanced Datalayer
 description: Allows you to configure dataLayer page variables.
 type: module
 package: SEO
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10 || ^11
 dependencies:
   - drupal:field
   - token:token
diff --git a/composer.json b/composer.json
index ec29e02..9db5142 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
         "seo"
     ],
     "require": {
-        "drupal/core": "^9 || ^10",
+        "drupal/core": "^10 || ^11",
         "drupal/token": "^1.0"
     }
 }
diff --git a/context_advanced_datalayer/context_advanced_datalayer.info.yml b/context_advanced_datalayer/context_advanced_datalayer.info.yml
index 73e0d3e..ece49e9 100644
--- a/context_advanced_datalayer/context_advanced_datalayer.info.yml
+++ b/context_advanced_datalayer/context_advanced_datalayer.info.yml
@@ -2,7 +2,7 @@ name: Context Advanced Datalayer
 description: Allows site admins to setup Datalayer page variables using Contexts module
 type: module
 package: Context
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10 || ^11
 dependencies:
   - context:context
   - advanced_datalayer:advanced_datalayer
diff --git a/example_advanced_datalayer/example_advanced_datalayer.info.yml b/example_advanced_datalayer/example_advanced_datalayer.info.yml
index 1c5ee32..ed05d9a 100644
--- a/example_advanced_datalayer/example_advanced_datalayer.info.yml
+++ b/example_advanced_datalayer/example_advanced_datalayer.info.yml
@@ -2,6 +2,6 @@ name: Advanced Datalayer example
 description: Example tags and groups for Advanced Datalayer module
 type: module
 package: SEO
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10 || ^11
 dependencies:
   - advanced_datalayer:advanced_datalayer
diff --git a/src/Form/AdvancedDatalayerSettingsForm.php b/src/Form/AdvancedDatalayerSettingsForm.php
index 7ceae8b..8f876aa 100644
--- a/src/Form/AdvancedDatalayerSettingsForm.php
+++ b/src/Form/AdvancedDatalayerSettingsForm.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\advanced_datalayer\Form;
 
+use Drupal\Core\Config\TypedConfigManagerInterface;
 use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
@@ -41,6 +42,8 @@ class AdvancedDatalayerSettingsForm extends ConfigFormBase {
    *
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   ConfigFactoryInterface object.
+   * @param \Drupal\Core\Config\TypedConfigManagerInterface $typedConfigManager
+   *   The typed config manager.
    * @param \Drupal\advanced_datalayer\AdvancedDatalayerManagerInterface $datalayer_manager
    *   Advance datalayer manager object.
    * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info
@@ -50,11 +53,12 @@ class AdvancedDatalayerSettingsForm extends ConfigFormBase {
    */
   public function __construct(
     ConfigFactoryInterface $config_factory,
+    TypedConfigManagerInterface $typedConfigManager,
     AdvancedDatalayerManagerInterface $datalayer_manager,
     EntityTypeBundleInfoInterface $entity_type_bundle_info,
     StateInterface $state
   ) {
-    parent::__construct($config_factory);
+    parent::__construct($config_factory, $typedConfigManager);
     $this->datalayerManager = $datalayer_manager;
     $this->entityTypeBundleInfo = $entity_type_bundle_info;
     $this->state = $state;
@@ -66,6 +70,7 @@ class AdvancedDatalayerSettingsForm extends ConfigFormBase {
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
+      $container->get('config.typed'),
       $container->get('advanced_datalayer.manager'),
       $container->get('entity_type.bundle.info'),
       $container->get('state')
-- 
GitLab