From 96d656e366a4f7109a448620c090a8288ff45b54 Mon Sep 17 00:00:00 2001
From: Mark Conroy <mark@mark.ie>
Date: Mon, 10 Mar 2025 13:19:58 +0000
Subject: [PATCH 1/4] Remove version: VERSION from libraries

---
 localgov_forms.libraries.yml                                  | 4 ----
 modules/localgov_forms_date/localgov_forms_date.libraries.yml | 1 -
 2 files changed, 5 deletions(-)

diff --git a/localgov_forms.libraries.yml b/localgov_forms.libraries.yml
index d8f347c..da1857b 100644
--- a/localgov_forms.libraries.yml
+++ b/localgov_forms.libraries.yml
@@ -1,5 +1,4 @@
 localgov_forms_uk_address:
-  version: VERSION
   css:
     theme:
       css/localgov_forms_uk_address.css: {}
@@ -7,7 +6,6 @@ localgov_forms_uk_address:
     - webform/webform.composite
 
 localgov_forms.form_errors:
-  version: VERSION
   js:
     js/form_errors.js: {}
   dependencies:
@@ -15,7 +13,6 @@ localgov_forms.form_errors:
     - core/jquery
 
 localgov_forms.address_select:
-  version: VERSION
   js:
     js/address_select.js: {}
   dependencies:
@@ -25,7 +22,6 @@ localgov_forms.address_select:
     - core/jquery
 
 localgov_forms.address_change:
-  version: VERSION
   js:
     js/address_change.js: {}
   dependencies:
diff --git a/modules/localgov_forms_date/localgov_forms_date.libraries.yml b/modules/localgov_forms_date/localgov_forms_date.libraries.yml
index ef50d1d..4e4a838 100644
--- a/modules/localgov_forms_date/localgov_forms_date.libraries.yml
+++ b/modules/localgov_forms_date/localgov_forms_date.libraries.yml
@@ -1,5 +1,4 @@
 localgov_forms_date:
-  version: VERSION
   css:
     theme:
       css/date.css: {}

From 9b0d18a9dbba7dad4eb21b593c255230086ed926 Mon Sep 17 00:00:00 2001
From: SinghPardeep <pardeep.singh@walsall.gov.uk>
Date: Tue, 11 Mar 2025 11:09:31 +0000
Subject: [PATCH 2/4] updating address dropdown when drupal ajax request
 completes

---
 js/address_change.js | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/js/address_change.js b/js/address_change.js
index 51b2eb2..06df4ee 100644
--- a/js/address_change.js
+++ b/js/address_change.js
@@ -209,5 +209,42 @@
       });
     }
   }
+//pop up dropdown with searched address every time a Drupal AJAX request completes
+  $(document).ajaxComplete(function () {
+    var selectElement = $('.js-address-select');
+
+    // Clear previous options
+    selectElement.empty();
+
+    // Add default option
+    var defaultOption = $('<option>', {
+      value: '0',
+      text: '-Please choose an address-'
+    });
+    selectElement.append(defaultOption);
+
+    // Check if address list exists
+    var addressList = drupalSettings.centralHub.addressList;
+
+    if (addressList && addressList.length > 0) {
+      $.each(addressList, function (index, address) {
+        var option = $('<option>', {
+          value: address.name,
+          text: address.display
+        });
+        selectElement.append(option);
+      });
+    } else {
+      var noAddressOption = $('<option>', {
+        value: '',
+        text: 'No addresses found'
+      });
+      selectElement.append(noAddressOption);
+    }
+
+    // Show the dropdown after AJAX loads addresses
+    $('.js-address-select-container').removeClass('hidden');
+  });
+
 
 })(jQuery, Drupal);

From 03f161869e748274bd9aa5c80ca89bac010b86c2 Mon Sep 17 00:00:00 2001
From: Pardeep Singh <38877418+PardeepSinghBali@users.noreply.github.com>
Date: Thu, 27 Mar 2025 10:40:27 +0000
Subject: [PATCH 3/4] Revert "updating address dropdown when Drupal ajax
 request completes"

---
 js/address_change.js | 37 -------------------------------------
 1 file changed, 37 deletions(-)

diff --git a/js/address_change.js b/js/address_change.js
index 06df4ee..51b2eb2 100644
--- a/js/address_change.js
+++ b/js/address_change.js
@@ -209,42 +209,5 @@
       });
     }
   }
-//pop up dropdown with searched address every time a Drupal AJAX request completes
-  $(document).ajaxComplete(function () {
-    var selectElement = $('.js-address-select');
-
-    // Clear previous options
-    selectElement.empty();
-
-    // Add default option
-    var defaultOption = $('<option>', {
-      value: '0',
-      text: '-Please choose an address-'
-    });
-    selectElement.append(defaultOption);
-
-    // Check if address list exists
-    var addressList = drupalSettings.centralHub.addressList;
-
-    if (addressList && addressList.length > 0) {
-      $.each(addressList, function (index, address) {
-        var option = $('<option>', {
-          value: address.name,
-          text: address.display
-        });
-        selectElement.append(option);
-      });
-    } else {
-      var noAddressOption = $('<option>', {
-        value: '',
-        text: 'No addresses found'
-      });
-      selectElement.append(noAddressOption);
-    }
-
-    // Show the dropdown after AJAX loads addresses
-    $('.js-address-select-container').removeClass('hidden');
-  });
-
 
 })(jQuery, Drupal);

From 828efecaa1feb17a79ab40f34fbd3af3b9ef4294 Mon Sep 17 00:00:00 2001
From: Stephen Cox <stephen-cox@users.noreply.github.com>
Date: Tue, 6 May 2025 12:20:33 +0100
Subject: [PATCH 4/4] Drupal 11 support (#115)

* Drupal 11 support

* Add Drupal 11 support for test modules

* Add Drupal 11 support for test modules

* Require Webform ^6.2 || ^6.3@beta

* Fix failing tests

* Fix failing tests

* Testing suggestion by @adnan-cds

https://github.com/localgovdrupal/localgov_forms/pull/115/commits/d8c64bb9df6afd677f4033769a6a5de22c07c5b2#r2071719954

Underlying issue https://www.drupal.org/project/drupal/issues/2245905

* Fix seems to work. Correcting PHP CS.

---------

Co-authored-by: ekes <ekes@iskra.net>
---
 composer.json                                    |  2 +-
 localgov_forms.info.yml                          |  2 +-
 .../localgov_forms_date.info.yml                 |  2 +-
 .../localgov_forms_date_test.info.yml            |  2 +-
 .../tests/src/Kernel/DateWebformElementTest.php  |  8 ++++----
 .../localgov_forms_decision_tree.info.yml        |  2 +-
 ...s_example_liberty_create_integration.info.yml |  2 +-
 .../localgov_forms_test.info.yml                 |  2 +-
 .../src/Driver/Database/FakeLts/Connection.php   | 16 ++++++++++++++++
 9 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index 79fc48b..4cfb350 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
   "license": "GPL-2.0-or-later",
   "minimum-stability": "dev",
   "require": {
-    "drupal/webform": "^6.0",
+    "drupal/webform": "^6.2 || ^6.3@beta",
     "drupal/geocoder": "^3.44 || ^4.21",
     "localgovdrupal/localgov_os_places_geocoder_provider": "1.x-dev"
   },
diff --git a/localgov_forms.info.yml b/localgov_forms.info.yml
index 45db5fc..99ca586 100644
--- a/localgov_forms.info.yml
+++ b/localgov_forms.info.yml
@@ -1,7 +1,7 @@
 name: LocalGov Forms
 type: module
 description: Provides additional configuration, styling and components for the Drupal Webform module.
-core_version_requirement: ^8.8 || ^9 || ^10
+core_version_requirement: ^10 || ^11
 package: LocalGov Drupal
 
 dependencies:
diff --git a/modules/localgov_forms_date/localgov_forms_date.info.yml b/modules/localgov_forms_date/localgov_forms_date.info.yml
index a260d91..1c69753 100644
--- a/modules/localgov_forms_date/localgov_forms_date.info.yml
+++ b/modules/localgov_forms_date/localgov_forms_date.info.yml
@@ -2,7 +2,7 @@ name: 'LocalGov Forms: Date'
 type: module
 description: 'A custom Date component'
 package: LocalGov Drupal
-core_version_requirement: ^8 || ^9 || ^10
+core_version_requirement: ^10 || ^11
 dependencies:
   - 'webform:webform'
   - 'localgov_forms:localgov_forms'
diff --git a/modules/localgov_forms_date/tests/modules/localgov_forms_date_test/localgov_forms_date_test.info.yml b/modules/localgov_forms_date/tests/modules/localgov_forms_date_test/localgov_forms_date_test.info.yml
index de62dbe..7881eb8 100644
--- a/modules/localgov_forms_date/tests/modules/localgov_forms_date_test/localgov_forms_date_test.info.yml
+++ b/modules/localgov_forms_date/tests/modules/localgov_forms_date_test/localgov_forms_date_test.info.yml
@@ -2,7 +2,7 @@ name: 'Localgov form date test'
 description: 'Helper module to setup a webform with a localgov_forms_date field.'
 type: module
 package: Testing
-core_version_requirement: ^8.8 || ^9 || ^10
+core_version_requirement: ^10 || ^11
 
 dependencies:
   - webform:webform
diff --git a/modules/localgov_forms_date/tests/src/Kernel/DateWebformElementTest.php b/modules/localgov_forms_date/tests/src/Kernel/DateWebformElementTest.php
index b529afd..f6c09ca 100644
--- a/modules/localgov_forms_date/tests/src/Kernel/DateWebformElementTest.php
+++ b/modules/localgov_forms_date/tests/src/Kernel/DateWebformElementTest.php
@@ -34,8 +34,10 @@ protected function passCase(): void {
     $form_state->setValue('date',
       ['day' => '1', 'month' => '1', 'year' => '1']);
     $form_state->setValue('op', 'Submission');
+    $form_state->setValue('submit', 'Submit');
 
-    $this->container->get('form_builder')->submitForm(clone($this->testForm), $form_state);
+    $test_form = clone($this->testForm);
+    $this->container->get('form_builder')->submitForm($test_form, $form_state);
     $this->assertEmpty($form_state->getErrors());
   }
 
@@ -89,12 +91,10 @@ protected function setUp(): void {
 
     $this->installEntitySchema('user');
     $this->installEntitySchema('path_alias');
-
     $this->installSchema('webform', ['webform']);
-
     $this->installConfig('system');
+    $this->installConfig('webform');
     $this->installConfig('localgov_forms_date_test');
-
     $this->installConfig('localgov_forms_date');
 
     $empty_submission = WebformSubmission::create(['webform_id' => 'date_test']);
diff --git a/modules/localgov_forms_decision_tree/localgov_forms_decision_tree.info.yml b/modules/localgov_forms_decision_tree/localgov_forms_decision_tree.info.yml
index 27ad7ad..1ab1832 100644
--- a/modules/localgov_forms_decision_tree/localgov_forms_decision_tree.info.yml
+++ b/modules/localgov_forms_decision_tree/localgov_forms_decision_tree.info.yml
@@ -2,6 +2,6 @@ name: LocalGov Forms Demo Decision Tree
 type: module
 description: Demo of creating a decision tree with Drupal&#039;s webform module.
 package: LocalGov Drupal Examples
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10 || ^11
 dependencies:
   - 'webform:webform'
diff --git a/modules/localgov_forms_example_liberty_create_integration/localgov_forms_example_liberty_create_integration.info.yml b/modules/localgov_forms_example_liberty_create_integration/localgov_forms_example_liberty_create_integration.info.yml
index 1f2a869..33162fc 100644
--- a/modules/localgov_forms_example_liberty_create_integration/localgov_forms_example_liberty_create_integration.info.yml
+++ b/modules/localgov_forms_example_liberty_create_integration/localgov_forms_example_liberty_create_integration.info.yml
@@ -1,7 +1,7 @@
 name: LocalGov Forms example Liberty Create integration
 type: module
 description: Liberty Create API integration example.
-core_version_requirement: ^10
+core_version_requirement: ^10 || ^11
 package: LocalGov Drupal
 
 dependencies:
diff --git a/tests/modules/localgov_forms_test/localgov_forms_test.info.yml b/tests/modules/localgov_forms_test/localgov_forms_test.info.yml
index 2038f32..4fc72eb 100644
--- a/tests/modules/localgov_forms_test/localgov_forms_test.info.yml
+++ b/tests/modules/localgov_forms_test/localgov_forms_test.info.yml
@@ -2,7 +2,7 @@ name: 'Localgov form test'
 description: 'Helper module to setup a Contact webform.'
 type: module
 package: Testing
-core_version_requirement: ^8.8 || ^9 || ^10
+core_version_requirement: ^10 || ^11
 
 dependencies:
   - webform:webform
diff --git a/tests/modules/localgov_forms_test/src/Driver/Database/FakeLts/Connection.php b/tests/modules/localgov_forms_test/src/Driver/Database/FakeLts/Connection.php
index 724d325..24382e5 100644
--- a/tests/modules/localgov_forms_test/src/Driver/Database/FakeLts/Connection.php
+++ b/tests/modules/localgov_forms_test/src/Driver/Database/FakeLts/Connection.php
@@ -4,6 +4,8 @@
 
 namespace Drupal\localgov_forms_test\Driver\Database\FakeLts;
 
+use Drupal\Core\Database\Transaction\TransactionManagerInterface;
+use Drupal\mysql\Driver\Database\mysql\TransactionManager;
 use Drupal\Tests\Core\Database\Stub\StubConnection;
 use Drupal\Tests\Core\Database\Stub\StubPDO;
 
@@ -29,4 +31,18 @@ public static function open(array &$connection_options = []) {
     return new StubPDO();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function driverTransactionManager(): TransactionManagerInterface {
+    return new TransactionManager($this);
+  }
+
+  /**
+   * {@inheritdoc}
+   *
+   * Work-around for avoiding TransactionManager usage.
+   */
+  public function commitAll(): void {}
+
 }