From 3f46255800d8d16d6acca522a5ae7cc9e6928f82 Mon Sep 17 00:00:00 2001 From: Stanislav Kutasevits Date: Wed, 29 Jul 2026 11:23:58 +0300 Subject: [PATCH 1/4] Adding Drupal 11 compatibility --- CHANGELOG.md | 2 ++ os2forms_sync.info.yml | 2 +- src/Form/SettingsForm.php | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f5280e..cfa503c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +- Drupal 11 compatibility + ## [1.3.0] - Handled webform categories now being an array. diff --git a/os2forms_sync.info.yml b/os2forms_sync.info.yml index a2e8ccb..e106619 100644 --- a/os2forms_sync.info.yml +++ b/os2forms_sync.info.yml @@ -3,7 +3,7 @@ description: OS2Forms sync package: OS2Forms type: module -core_version_requirement: ^9 || ^10 +core_version_requirement: ^10 || ^ 11 dependencies: - drupal:os2forms diff --git a/src/Form/SettingsForm.php b/src/Form/SettingsForm.php index b4c6e6f..09df425 100644 --- a/src/Form/SettingsForm.php +++ b/src/Form/SettingsForm.php @@ -21,7 +21,7 @@ final class SettingsForm extends FormBase { * * @var \Drupal\os2forms_sync\Helper\Settings */ - private Settings $settings; + protected Settings $settings; /** * Constructor. From df15b18780e3ff656667de4be9395978550e3be3 Mon Sep 17 00:00:00 2001 From: Stanislav Kutasevits Date: Wed, 29 Jul 2026 11:25:10 +0300 Subject: [PATCH 2/4] Adding 1.4.0 version --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfa503c..3ab9fc3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [1.4.0] + - Drupal 11 compatibility ## [1.3.0] From e5bfc78f9fa783c5741d9de474747fd18479c636 Mon Sep 17 00:00:00 2001 From: Stanislav Kutasevits Date: Wed, 29 Jul 2026 13:10:06 +0300 Subject: [PATCH 3/4] Fixing version type --- os2forms_sync.info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os2forms_sync.info.yml b/os2forms_sync.info.yml index e106619..d5af3c0 100644 --- a/os2forms_sync.info.yml +++ b/os2forms_sync.info.yml @@ -3,7 +3,7 @@ description: OS2Forms sync package: OS2Forms type: module -core_version_requirement: ^10 || ^ 11 +core_version_requirement: ^10 || ^11 dependencies: - drupal:os2forms From 2792f45afa55eb94a7d6c4ff4a9a82653760405d Mon Sep 17 00:00:00 2001 From: Stanislav Kutasevits Date: Thu, 30 Jul 2026 16:45:48 +0300 Subject: [PATCH 4/4] Support drush/drush ^13 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0362e0d..da50d6a 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ ], "require": { "drupal/webform": "^6", - "drush/drush": "^11 || ^12", + "drush/drush": "^11 || ^12 || ^13", "symfony/options-resolver": "^5.4 || ^6.0" }, "require-dev": {