Merge pull request #345 from magento-gl/AC-3560

[Arrows] Delivery for RFC: Deprecate passing null

Author: sidolov

app/code/Magento/PageBuilder/Model/Filter/Template.php

@@ -221,7 +221,7 @@ private function generateDecodedHtmlPlaceholderMappingInDocument(DOMDocument $do
             $htmlContentTypeNode->setAttribute('data-decoded', 'true');
 
             // if nothing exists inside the node, continue
-            if (!strlen(trim($htmlContentTypeNode->nodeValue))) {
+            if (!strlen(trim($htmlContentTypeNode->nodeValue ?? ''))) {
                 continue;
             }
 

app/code/Magento/PageBuilderAnalytics/Model/ContentTypeUsageReportProvider.php

@@ -80,6 +80,7 @@ public function getReport($name) : \IteratorIterator
     {
         $query = $this->queryFactory->create($name);
 
+        $reportData = [];
         // Prepare our type count data
         $typeCounts = [];
         $contentTypes = $this->config->getContentTypes();
@@ -102,7 +103,7 @@ public function getReport($name) : \IteratorIterator
                     foreach ($contentTypes as $type) {
                         // Count the amount of content types within the content
                         $rowContent = $row['content'] ?? '';
-                        if (strlen($rowContent) > 0) {
+                        if ($rowContent !== null && strlen($rowContent) > 0) {
                             $typeCounts[$type['name']] += substr_count(
                                 $rowContent,
                                 'data-content-type="' . $type['name'] . '"'