From a725f4f20de1ef067551d6b27850282c1f09fad2 Mon Sep 17 00:00:00 2001
From: Liam Morland <24363-lkmorlan@users.noreply.drupalcode.org>
Date: Fri, 17 Jan 2025 13:31:34 +0000
Subject: [PATCH 1/2] Update Drupal version in README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index f36a3bfef4..bb9e3d832e 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
## INTRODUCTION
-The Webform module is a form builder and submission manager for Drupal 8/9.
+The Webform module is a form builder and submission manager for Drupal 10/11.
The primary use case for this module is to:
--
GitLab
From 74809357f1ccea3fdf40b70be25bff9bd0c164af Mon Sep 17 00:00:00 2001
From: Liam Morland <liam@openplus.ca>
Date: Fri, 17 Jan 2025 08:43:03 -0500
Subject: [PATCH 2/2] Issue #3500521: Use colon to open case statements
---
.../WebformAccessBreadcrumbBuilder.php | 2 +-
.../WebformElement/WebformAttachmentBase.php | 10 +++++-----
src/Entity/Webform.php | 2 +-
.../WebformHandler/RemotePostWebformHandler.php | 2 +-
src/WebformEntityListBuilder.php | 6 +++---
src/WebformTranslationLingotekManager.php | 16 ++++++++--------
6 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/modules/webform_access/src/Breadcrumb/WebformAccessBreadcrumbBuilder.php b/modules/webform_access/src/Breadcrumb/WebformAccessBreadcrumbBuilder.php
index a6ed5e4c2e..0af5f0061b 100644
--- a/modules/webform_access/src/Breadcrumb/WebformAccessBreadcrumbBuilder.php
+++ b/modules/webform_access/src/Breadcrumb/WebformAccessBreadcrumbBuilder.php
@@ -86,7 +86,7 @@ class WebformAccessBreadcrumbBuilder implements BreadcrumbBuilderInterface {
$breadcrumb->addLink(Link::createFromRoute($this->t('Groups'), 'entity.webform_access_group.collection'));
break;
- case 'webform_access_type';
+ case 'webform_access_type':
$breadcrumb->addLink(Link::createFromRoute($this->t('Types'), 'entity.webform_access_type.collection'));
break;
}
diff --git a/modules/webform_attachment/src/Plugin/WebformElement/WebformAttachmentBase.php b/modules/webform_attachment/src/Plugin/WebformElement/WebformAttachmentBase.php
index 01744eac52..c3bc63394e 100644
--- a/modules/webform_attachment/src/Plugin/WebformElement/WebformAttachmentBase.php
+++ b/modules/webform_attachment/src/Plugin/WebformElement/WebformAttachmentBase.php
@@ -87,10 +87,10 @@ abstract class WebformAttachmentBase extends WebformElementBase implements Webfo
$attachment_element = $this->getFormElementClassDefinition();
$format = $this->getItemFormat($element);
switch ($format) {
- case 'name';
+ case 'name':
return $attachment_element::getFileName($element, $webform_submission);
- case 'url';
+ case 'url':
return $attachment_element::getFileUrl($element, $webform_submission)->toString();
default:
@@ -108,12 +108,12 @@ abstract class WebformAttachmentBase extends WebformElementBase implements Webfo
$format = $this->getItemFormat($element);
switch ($format) {
- case 'name';
+ case 'name':
return $attachment_element::getFileName($element, $webform_submission);
default:
- case 'link';
- case 'url';
+ case 'link':
+ case 'url':
$fileUrl = $attachment_element::getFileUrl($element, $webform_submission);
return $fileUrl ? $fileUrl->toString() : '';
}
diff --git a/src/Entity/Webform.php b/src/Entity/Webform.php
index 4723e9faa3..ece61157a8 100644
--- a/src/Entity/Webform.php
+++ b/src/Entity/Webform.php
@@ -2715,7 +2715,7 @@ class Webform extends ConfigEntityBundleBase implements WebformInterface {
$handlers = $this->getHandlers();
switch ($method) {
- case 'overrideSettings';
+ case 'overrideSettings':
// If webform submission and alter settings, make sure to completely
// reset all settings to their original values.
$this->resetSettings();
diff --git a/src/Plugin/WebformHandler/RemotePostWebformHandler.php b/src/Plugin/WebformHandler/RemotePostWebformHandler.php
index ddd62103b4..b7e3633f47 100644
--- a/src/Plugin/WebformHandler/RemotePostWebformHandler.php
+++ b/src/Plugin/WebformHandler/RemotePostWebformHandler.php
@@ -759,7 +759,7 @@ class RemotePostWebformHandler extends WebformHandlerBase {
break;
case 'bool':
- case 'boolean';
+ case 'boolean':
$data[$key] = (bool) $type_value;
break;
diff --git a/src/WebformEntityListBuilder.php b/src/WebformEntityListBuilder.php
index 907eaf3b29..7ccc9adc2f 100644
--- a/src/WebformEntityListBuilder.php
+++ b/src/WebformEntityListBuilder.php
@@ -620,9 +620,9 @@ class WebformEntityListBuilder extends ConfigEntityListBuilder {
// Filter by (form) state.
switch ($state) {
- case WebformInterface::STATUS_OPEN;
- case WebformInterface::STATUS_CLOSED;
- case WebformInterface::STATUS_SCHEDULED;
+ case WebformInterface::STATUS_OPEN:
+ case WebformInterface::STATUS_CLOSED:
+ case WebformInterface::STATUS_SCHEDULED:
$query->condition('status', $state);
break;
}
diff --git a/src/WebformTranslationLingotekManager.php b/src/WebformTranslationLingotekManager.php
index 48e577eb86..d4a4d8ac74 100644
--- a/src/WebformTranslationLingotekManager.php
+++ b/src/WebformTranslationLingotekManager.php
@@ -47,7 +47,7 @@ class WebformTranslationLingotekManager implements WebformTranslationLingotekMan
}
break;
- case 'webform';
+ case 'webform':
// Replace elements with just the translatable properties
// (i.e. #title, #description, #options, etc…) so that Lingotek's
// translation services can correctly translate each element.
@@ -57,13 +57,13 @@ class WebformTranslationLingotekManager implements WebformTranslationLingotekMan
$this->encodeTokens($source_data);
break;
- case 'webform_image_select_images';
+ case 'webform_image_select_images':
// Convert images YAML string to an associative array.
$source_data['images'] = Yaml::decode($source_data['images']);
break;
- case 'webform_options';
- case 'webform_options_custom';
+ case 'webform_options':
+ case 'webform_options_custom':
// Convert options YAML string to an associative array.
$options = Yaml::decode($source_data['options']);
@@ -105,7 +105,7 @@ class WebformTranslationLingotekManager implements WebformTranslationLingotekMan
}
break;
- case 'webform';
+ case 'webform':
$this->decodeTokens($data);
/** @var \Drupal\webform\WebformInterface $translation */
@@ -113,15 +113,15 @@ class WebformTranslationLingotekManager implements WebformTranslationLingotekMan
$data['elements'] = Yaml::encode($data['elements']);
break;
- case 'webform_image_select_images';
+ case 'webform_image_select_images':
/** @var \Drupal\webform_image_select\WebformImageSelectImagesInterface $translation */
// Convert images associative array back to YAML string.
$translation->setImages($data['images']);
$data['images'] = Yaml::encode($data['images']);
break;
- case 'webform_options';
- case 'webform_options_custom';
+ case 'webform_options':
+ case 'webform_options_custom':
$options = $data['options'];
// If '_optgroups_' are defined we need to translate the optgroups.
if (isset($options['_optgroups_'])) {
--
GitLab