ITKDev: php warning if unserialize fails in encrypt patch

OS2Forms · May 27, 2024 · 77f6782 · 77f6782
1 parent 03143b7
commit 77f6782
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,9 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 ## [Unreleased]
 
+- [#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.

diff --git a/composer.json b/composer.json
@@ -116,7 +116,8 @@
                 "entityQuery reference JOINs should specify target_type (https://www.drupal.org/project/dynamic_entity_reference/issues/3120952#comment-14141038)": "https://www.drupal.org/files/issues/2021-06-22/entityquery-reference-joins-should-specify-target_type-3120952-24.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"
             }
         }
     },