Merge branch 'develop' into f/d10_readiness

* develop:
  Release 3.15.2
  ITKDev: php warning if unserialize fails in encrypt patch

CHANGELOG.md

@@ -23,6 +23,12 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 - Reduntand dependency removing - webform_scheduled_tasks
 - Drupal 10 compability fixes
 
+## [3.15.2] 2024-05-27
+
+- [#108](https://github.com/OS2Forms/os2forms/pull/108)
+  Patched webform encrypt to suppress warning when data is mixed between
+  encrypted and not encrypted fields.
+
 ## [3.15.1] 2024-05-14
 
 - Added missing return type.
@@ -236,7 +242,8 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 - Security in case of vulnerabilities.
 ```
 
-[Unreleased]: https://github.com/OS2Forms/os2forms/compare/3.15.1...HEAD
+[Unreleased]: https://github.com/OS2Forms/os2forms/compare/3.15.2...HEAD
+[3.15.2]: https://github.com/OS2Forms/os2forms/compare/3.15.1...3.15.2
 [3.15.1]: https://github.com/OS2Forms/os2forms/compare/3.15.0...3.15.1
 [3.15.0]: https://github.com/OS2Forms/os2forms/compare/3.14.1...3.15.0
 [3.14.1]: https://github.com/OS2Forms/os2forms/compare/3.14.0...3.14.1

composer.json

@@ -109,7 +109,8 @@
                 "3290637 - Automated Drupal 10 compatibility fixes": "https://www.drupal.org/files/issues/2023-05-12/webform_node_element_d10-3290637-11.patch"
             },
             "drupal/webform_encrypt": {
-                "Ensure data is base64 encoded (https://www.drupal.org/project/webform_encrypt/issues/3399414)": "https://git.drupalcode.org/project/webform_encrypt/-/merge_requests/4.patch"
+                "Ensure data is base64 encoded (https://www.drupal.org/project/webform_encrypt/issues/3399414)": "https://git.drupalcode.org/project/webform_encrypt/-/merge_requests/4.patch",
+                "PHP Warning if unserialize fails (https://www.drupal.org/project/webform_encrypt/issues/3292305)": "https://www.drupal.org/files/issues/2022-06-23/unserialize-php-notice.patch"
             }
         },
         "drupal-lenient": {