From 310013ee20a69b3395690da32f73958c12abe8b2 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Sat, 30 Jul 2022 17:35:40 +1000 Subject: [PATCH] [REF][PHP8.1] Apply patch in PHPWord to fix passing in null value into stlen in validating locale --- composer.json | 3 +++ composer.lock | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 93b34f886d..7391b3bf03 100644 --- a/composer.json +++ b/composer.json @@ -311,6 +311,9 @@ "pear/net_smtp": { "Add in CiviCRM custom error message for CRM-8744": "https://raw.githubusercontent.com/civicrm/civicrm-core/a6a0ff13d2a155ad962529595dceaef728116f96/tools/scripts/composer/patches/net-smtp-patch.patch" }, + "phpoffice/phpword": { + "PHP8.1 fix for passing null value into strlen": "https://patch-diff.githubusercontent.com/raw/PHPOffice/PHPWord/pull/2272.patch" + }, "zetacomponents/mail": { "PHP 8.1 Compatability fixes": "https://patch-diff.githubusercontent.com/raw/zetacomponents/Mail/pull/88.patch", "CiviCRM Custom Patches for ZetaCompoents mail": "https://raw.githubusercontent.com/civicrm/civicrm-core/9d93748a36c7c5d44422911db1c98fb2f7067b34/tools/scripts/composer/patches/civicrm-custom-patches-zetacompoents-mail.patch", diff --git a/composer.lock b/composer.lock index d904de5c6a..6373bbb01e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "07b7e8a8fdf410a6f7f16582e5d8ad95", + "content-hash": "13a9932b926aa601a4f3ac3e39f9a7bf", "packages": [ { "name": "adrienrn/php-mimetyper", -- 2.25.1