Merge pull request #118 from localgovdrupal/1.x

1.0.0-beta10 release

Author: finnlewis

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"
   },

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:

localgov_forms.libraries.yml

@@ -1,21 +1,18 @@
 localgov_forms_uk_address:
-  version: VERSION
   css:
     theme:
       css/localgov_forms_uk_address.css: {}
   dependencies:
     - webform/webform.composite
 
 localgov_forms.form_errors:
-  version: VERSION
   js:
     js/form_errors.js: {}
   dependencies:
     - core/drupal
     - 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:

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'

modules/localgov_forms_date/localgov_forms_date.libraries.yml

@@ -1,5 +1,4 @@
 localgov_forms_date:
-  version: VERSION
   css:
     theme:
       css/date.css: {}

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

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']);

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's webform module.
 package: LocalGov Drupal Examples
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10 || ^11
 dependencies:
   - 'webform:webform'

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:

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