Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion localgov_forms.info.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 0 additions & 4 deletions localgov_forms.libraries.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -25,7 +22,6 @@ localgov_forms.address_select:
- core/jquery

localgov_forms.address_change:
version: VERSION
js:
js/address_change.js: {}
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion modules/localgov_forms_date/localgov_forms_date.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
localgov_forms_date:
version: VERSION
css:
theme:
css/date.css: {}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

Expand Down Expand Up @@ -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']);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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 {}

}
Loading