From 502cb17f9ef9286dad32f73fb2b0e36018477a70 Mon Sep 17 00:00:00 2001 From: Matt Walters Date: Wed, 10 Jun 2020 18:45:52 +0100 Subject: [PATCH 1/2] magento/magento2-page-builder#504: Mismatching Strict Type - Extending Integration Test --- .../PageBuilder/Plugin/Filter/TemplatePluginTest.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Plugin/Filter/TemplatePluginTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Plugin/Filter/TemplatePluginTest.php index ab755418e87..639061f43c6 100644 --- a/dev/tests/integration/testsuite/Magento/PageBuilder/Plugin/Filter/TemplatePluginTest.php +++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Plugin/Filter/TemplatePluginTest.php @@ -53,6 +53,13 @@ public function testFiltering(string $preFiltered, string $postFiltered, string ); } + public function testNull() + { + $this->assertEmpty( + $this->templateFilter->filter(null) + ); + } + /** * @return array */ From 040827a1babf1ad1bea2f63efbd5ae429282d1b2 Mon Sep 17 00:00:00 2001 From: Matt Walters Date: Wed, 10 Jun 2020 18:48:55 +0100 Subject: [PATCH 2/2] magento/magento2-page-builder#504: Mismatching Strict Type - Adding Null Coalescing Operator - Removing Strict Type from `$result` Parameter (Cheers, @dannynimmo) --- app/code/Magento/PageBuilder/Plugin/Filter/TemplatePlugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/PageBuilder/Plugin/Filter/TemplatePlugin.php b/app/code/Magento/PageBuilder/Plugin/Filter/TemplatePlugin.php index b78ea29a6ad..0f65ed39d16 100644 --- a/app/code/Magento/PageBuilder/Plugin/Filter/TemplatePlugin.php +++ b/app/code/Magento/PageBuilder/Plugin/Filter/TemplatePlugin.php @@ -39,8 +39,8 @@ public function __construct( * @return string * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function afterFilter(\Magento\Framework\Filter\Template $subject, string $result) : string + public function afterFilter(\Magento\Framework\Filter\Template $subject, $result) : string { - return $this->templateFilter->filter($result); + return $this->templateFilter->filter($result ?? ''); } }