From cb4d3a623e89257237330f2061670dabb4933503 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Thu, 9 Apr 2026 09:52:31 +0200 Subject: [PATCH 1/4] Ensured plain string first arguments for logging --- src/Plugin/AdvancedQueue/JobType/ArchiveDocument.php | 6 +++--- src/Plugin/WebformHandler/GetOrganizedWebformHandler.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Plugin/AdvancedQueue/JobType/ArchiveDocument.php b/src/Plugin/AdvancedQueue/JobType/ArchiveDocument.php index d3f7fd8..a58dc68 100644 --- a/src/Plugin/AdvancedQueue/JobType/ArchiveDocument.php +++ b/src/Plugin/AdvancedQueue/JobType/ArchiveDocument.php @@ -85,15 +85,15 @@ public function process(Job $job): JobResult { try { $this->helper->archive($payload['submissionId'], $payload['handlerConfiguration']); - $this->submissionLogger->notice($this->t('The submission #@serial was successfully delivered', ['@serial' => $webformSubmission->serial()]), $logger_context); + $this->submissionLogger->notice('The submission #@serial was successfully delivered', $logger_context + ['@serial' => $webformSubmission->serial()]); return JobResult::success(); } catch (\Exception $e) { - $this->submissionLogger->error($this->t('The submission #@serial failed (@message)', [ + $this->submissionLogger->error('The submission #@serial failed (@message)', $logger_context + [ '@serial' => $webformSubmission->serial(), '@message' => $e->getMessage(), - ]), $logger_context); + ]); return JobResult::failure($e->getMessage()); } diff --git a/src/Plugin/WebformHandler/GetOrganizedWebformHandler.php b/src/Plugin/WebformHandler/GetOrganizedWebformHandler.php index 29f2100..70dc09f 100644 --- a/src/Plugin/WebformHandler/GetOrganizedWebformHandler.php +++ b/src/Plugin/WebformHandler/GetOrganizedWebformHandler.php @@ -285,7 +285,7 @@ public function postSave(WebformSubmissionInterface $webform_submission, $update 'operation' => 'submission queued', ]; - $this->submissionLogger->notice($this->t('Added submission #@serial to queue for processing', ['@serial' => $webform_submission->serial()]), $logger_context); + $this->submissionLogger->notice('Added submission #@serial to queue for processing', $logger_context + ['@serial' => $webform_submission->serial()]); } /** From 75c2545590c7aeed7568e96555b4e8438e36dcae Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Thu, 9 Apr 2026 10:00:30 +0200 Subject: [PATCH 2/4] Updated CHANGELOG --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fae58a..5607b35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ about writing changes to this log. ## [Unreleased] +## [2.1.1] 09.04.2026 + +* Ensured static strings as first argument for logging calls. + ## [2.1.0] 11.12.2025 * Allowed `os2forms/os2forms` `5.x`. @@ -77,7 +81,8 @@ about writing changes to this log. ## [1.0.0] 29.03.2023 -[Unreleased]: https://github.com/OS2Forms/os2forms_get_organized/compare/2.1.0...HEAD +[Unreleased]: https://github.com/OS2Forms/os2forms_get_organized/compare/2.1.1...HEAD +[2.1.1]: https://github.com/OS2Forms/os2forms_get_organized/compare/2.1.0...2.1.1 [2.1.0]: https://github.com/OS2Forms/os2forms_get_organized/compare/2.0.1...2.1.0 [2.0.1]: https://github.com/OS2Forms/os2forms_get_organized/compare/2.0.0...2.0.1 [2.0.0]: https://github.com/OS2Forms/os2forms_get_organized/compare/1.4.1...2.0.0 From b79c816f777bd429d47c06ac9f4478e159180f30 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Thu, 9 Apr 2026 10:10:42 +0200 Subject: [PATCH 3/4] Updated pr workflow --- .github/workflows/pr.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index d325fbe..0cd9bce 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -161,7 +161,7 @@ jobs: # Make Drupal 10 compatible composer --working-dir=drupal --no-interaction require psr/http-message:^1.0 - composer --working-dir=drupal --no-interaction require 'mglaman/composer-drupal-lenient' + composer --working-dir=drupal --no-interaction require 'mglaman/composer-drupal-lenient':'^1.0' composer --working-dir=drupal config --no-plugins --merge --json extra.drupal-lenient.allowed-list '["drupal/coc_forms_auto_export", "drupal/webform_node_element"]' # Require our module. From f323ee0251229e85afbb2fa112297980af0173f4 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Thu, 9 Apr 2026 12:23:34 +0200 Subject: [PATCH 4/4] Ensured placeholders take precedence in case of key collisions --- src/Plugin/AdvancedQueue/JobType/ArchiveDocument.php | 6 +++--- src/Plugin/WebformHandler/GetOrganizedWebformHandler.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Plugin/AdvancedQueue/JobType/ArchiveDocument.php b/src/Plugin/AdvancedQueue/JobType/ArchiveDocument.php index a58dc68..8a0f8b3 100644 --- a/src/Plugin/AdvancedQueue/JobType/ArchiveDocument.php +++ b/src/Plugin/AdvancedQueue/JobType/ArchiveDocument.php @@ -85,15 +85,15 @@ public function process(Job $job): JobResult { try { $this->helper->archive($payload['submissionId'], $payload['handlerConfiguration']); - $this->submissionLogger->notice('The submission #@serial was successfully delivered', $logger_context + ['@serial' => $webformSubmission->serial()]); + $this->submissionLogger->notice('The submission #@serial was successfully delivered', ['@serial' => $webformSubmission->serial()] + $logger_context); return JobResult::success(); } catch (\Exception $e) { - $this->submissionLogger->error('The submission #@serial failed (@message)', $logger_context + [ + $this->submissionLogger->error('The submission #@serial failed (@message)', [ '@serial' => $webformSubmission->serial(), '@message' => $e->getMessage(), - ]); + ] + $logger_context); return JobResult::failure($e->getMessage()); } diff --git a/src/Plugin/WebformHandler/GetOrganizedWebformHandler.php b/src/Plugin/WebformHandler/GetOrganizedWebformHandler.php index 70dc09f..81fd5b3 100644 --- a/src/Plugin/WebformHandler/GetOrganizedWebformHandler.php +++ b/src/Plugin/WebformHandler/GetOrganizedWebformHandler.php @@ -285,7 +285,7 @@ public function postSave(WebformSubmissionInterface $webform_submission, $update 'operation' => 'submission queued', ]; - $this->submissionLogger->notice('Added submission #@serial to queue for processing', $logger_context + ['@serial' => $webform_submission->serial()]); + $this->submissionLogger->notice('Added submission #@serial to queue for processing', ['@serial' => $webform_submission->serial()] + $logger_context); } /**