From 34fe69adbe7de5df1c2308075443337110673e6d Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Sun, 18 Dec 2022 08:56:13 +1100 Subject: [PATCH] [REF] Fix a couple of errors in PHP8.2 --- CRM/Extension/Info.php | 5 +++++ CRM/Utils/Request.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CRM/Extension/Info.php b/CRM/Extension/Info.php index 2c28779bfe..3feb6af276 100644 --- a/CRM/Extension/Info.php +++ b/CRM/Extension/Info.php @@ -155,6 +155,11 @@ class CRM_Extension_Info { */ public $version; + /** + * @var array + */ + public $typeInfo; + /** * Load extension info an XML file. * diff --git a/CRM/Utils/Request.php b/CRM/Utils/Request.php index 0ab38f4898..b5f22a3f0f 100644 --- a/CRM/Utils/Request.php +++ b/CRM/Utils/Request.php @@ -130,7 +130,7 @@ class CRM_Utils_Request { return $method[$name]; } // CRM-18384 - decode incorrect keys generated when & is present in url - foreach ($method as $key => $value) { + foreach (($method ?? []) as $key => $value) { if (strpos($key, 'amp;') !== FALSE) { $method[str_replace('amp;', '', $key)] = $method[$key]; if (isset($method[$name])) { -- 2.25.1