From 6b052aa7c47b15dc26c2ff44ae7a14102f904ead Mon Sep 17 00:00:00 2001 From: orakili Date: Wed, 23 Aug 2023 05:48:01 +0000 Subject: [PATCH] fix: patch views for compatibility with PHP 8.2 Refs: ODSG-45 --- PATCHES/core-views-php-82-compatibility.patch | 25 +++++++++++++++++++ composer.patches.json | 3 ++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 PATCHES/core-views-php-82-compatibility.patch diff --git a/PATCHES/core-views-php-82-compatibility.patch b/PATCHES/core-views-php-82-compatibility.patch new file mode 100644 index 00000000..5690cb93 --- /dev/null +++ b/PATCHES/core-views-php-82-compatibility.patch @@ -0,0 +1,25 @@ +diff --git a/core/modules/views/src/Plugin/views/query/QueryPluginBase.php b/core/modules/views/src/Plugin/views/query/QueryPluginBase.php +index 1e0740fc9d..15f8d4fc9f 100644 +--- a/core/modules/views/src/Plugin/views/query/QueryPluginBase.php ++++ b/core/modules/views/src/Plugin/views/query/QueryPluginBase.php +@@ -59,6 +59,20 @@ abstract class QueryPluginBase extends PluginBase implements CacheableDependency + */ + protected $groupOperator; + ++ /** ++ * WHERE groups. ++ * ++ * @var array ++ */ ++ protected $where; ++ ++ /** ++ * HAVING groups. ++ * ++ * @var array ++ */ ++ protected $having; ++ + /** + * Generate a query and a countquery from all of the information supplied. + * diff --git a/composer.patches.json b/composer.patches.json index de3b2b09..35bf00c5 100644 --- a/composer.patches.json +++ b/composer.patches.json @@ -2,7 +2,8 @@ "patches": { "drupal/core": { "https://www.drupal.org/project/drupal/issues/3351600": "PATCHES/core-ckeditor5-dialog-fix-3351600.patch", - "https://www.drupal.org/project/drupal/issues/3376927": "PATCHES/core-css-js-aggregation-3376927.patch" + "https://www.drupal.org/project/drupal/issues/3376927": "PATCHES/core-css-js-aggregation-3376927.patch", + "Views PHP 8.2 compatibility": "PATCHES/core-views-php-82-compatibility.patch" }, "drupal/csp": { "Simplify log format": "PATCHES/csp-log-format.patch"