Skip to content

F/drupal11 - #346

Open
stankut wants to merge 24 commits into
developfrom
f/drupal11
Open

F/drupal11#346
stankut wants to merge 24 commits into
developfrom
f/drupal11

Conversation

@stankut

@stankut stankut commented Aug 26, 2026

Copy link
Copy Markdown
Collaborator

Drupal 11 compatibility

@ds-bellcom
ds-bellcom requested a review from jekuaitk August 26, 2026 12:59
@ds-bellcom ds-bellcom linked an issue Aug 26, 2026 that may be closed by this pull request

@jekuaitk jekuaitk left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A couple questions otherwise good!

Comment thread composer.json
Comment thread modules/os2forms_encrypt/src/Form/SettingsForm.php
Comment thread src/Plugin/WebformHandler/SaveToFileWebformHandler.php Outdated
Comment thread composer.json
"drupal/advancedqueue": "^1.0",
"drupal/cache_control_override": "^1.1 || ^2.0",
"drupal/coc_forms_auto_export": "^3.0@alpha",
"drupal/config_entity_revisions": "2.0.x-dev",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ds-bellcom as per our agreement, config_entity_revisions is going to be removed. But as Jeppe has correctly mentioned, there is a code dependant on it. This code is actually dedicated for facilitating the installations with config_entity_revisions enabled.

As i can see this dependancy can be quickly removed, but i would like to have and agreement on it :)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stankut and @jekuaitk: I spoke with the coordination group this morning and they agreed that the modules webform_revisions and config_entity_revisions should both be removed from OS2forms.

So I think we should remove the dependency on these modules from OS2forms.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had another look at at that. Here are some things i would like to clarify now.

@jekuaitk Do I understand correctly that ITK might still be using this module/modules in their solution?
If yes, then I suggest we leave this code as is, because it's already checking if webform_revisions is enabed, and only intercepts the method if module is enabled.
If that module is not enabled/existing it would call a standard getColumns implementation, which knows nothing about the revisions:
https://github.com/OS2Forms/os2forms/blob/develop/modules/os2forms_encrypt/src/WebformOs2FormsEncryptSubmissionStorage.php#L39-L42

If however ITK is not using these modules and not planing to, we can safely remove the override of this method getColumns.

Please tell us you're thoughts on that and i will make the proper changes accordingy.

cc @ds-bellcom

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stankut We do indeed use all of them. Leaving the code as is and checking if the module is enabled seems reasonable to me!

@jekuaitk
jekuaitk self-requested a review September 12, 2026 14:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Opgradering til Drupal 11

3 participants