From 166dfdf0d772275545c7989fe5e57e6499753df5 Mon Sep 17 00:00:00 2001 From: Edmund Dunn Date: Tue, 7 Nov 2023 11:53:57 -0800 Subject: [PATCH] VACMS-12252: patch for views_conditional modules --- composer.json | 3 +++ composer.lock | 2 +- ..._error_$renderer_must_not_be_defined.patch | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 patches/3399947-fix_for_fatal_error_$renderer_must_not_be_defined.patch diff --git a/composer.json b/composer.json index 3c47bfa99f..c27bdd6761 100644 --- a/composer.json +++ b/composer.json @@ -526,6 +526,9 @@ "drupal/views_bulk_operations": { "3246212 - When access is denied, display the reason": "https://www.drupal.org/files/issues/2023-01-19/display_access_denied_reason-3246212-22.patch" }, + "drupal/views_conditional": { + "3399947 - Fatal error: Type of Drupal\\views_conditional\\Plugin\\views\\field\\ViewsConditionalField::$renderer must not be defined": "https://www.drupal.org/files/issues/2023-11-07/fix_for_fatal_error_%24renderer_must_not_be_defined.patch" + }, "drupal/views_data_export": { "3189135 - Use relative URL for export button": "https://www.drupal.org/files/issues/2022-08-06/use-relative-url-for-export-3189135-10.patch" }, diff --git a/composer.lock b/composer.lock index 9762be15b1..cdab491717 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": "90f58561b1e1f61271dc3b801a1dfdcf", + "content-hash": "3d31c8654e648a9b4d11eaaef074f0b3", "packages": [ { "name": "asm89/stack-cors", diff --git a/patches/3399947-fix_for_fatal_error_$renderer_must_not_be_defined.patch b/patches/3399947-fix_for_fatal_error_$renderer_must_not_be_defined.patch new file mode 100644 index 0000000000..a27120a86d --- /dev/null +++ b/patches/3399947-fix_for_fatal_error_$renderer_must_not_be_defined.patch @@ -0,0 +1,19 @@ +Subject: [PATCH] fix for fatal error $renderer must not be defined +--- +Index: src/Plugin/views/field/ViewsConditionalField.php +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/src/Plugin/views/field/ViewsConditionalField.php b/src/Plugin/views/field/ViewsConditionalField.php +--- a/src/Plugin/views/field/ViewsConditionalField.php (revision ba0b9890da7c10711164f693d165d30882f8a13f) ++++ b/src/Plugin/views/field/ViewsConditionalField.php (date 1699384799887) +@@ -34,7 +34,7 @@ + /** + * The renderer. + */ +- protected RendererInterface $renderer; ++ protected $renderer; + + /** + * {@inheritdoc}