Merge branch 'develop' into PB-422

Author: omiroshnichenko

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

@@ -101,10 +101,13 @@ public function getReport($name) : \IteratorIterator
                 foreach ($batchQuery->fetchAll() as $row) {
                     foreach ($contentTypes as $type) {
                         // Count the amount of content types within the content
-                        $typeCounts[$type['name']] += substr_count(
-                            $row['content'],
-                            'data-content-type="' . $type['name'] . '"'
-                        );
+                        $rowContent = $row['content'] ?? '';
+                        if (strlen($rowContent) > 0) {
+                            $typeCounts[$type['name']] += substr_count(
+                                $rowContent,
+                                'data-content-type="' . $type['name'] . '"'
+                            );
+                        }
                     }
                 }
             }

dev/tests/integration/_files/Magento/TestModuleCmsPageBuilderAnalytics/etc/reports.xml

@@ -16,7 +16,7 @@
                 </using>
             </link-source>
             <filter glue="and">
-                <condition attribute="identifier" operator="eq">page-builder-analytics-test-page</condition>
+                <condition attribute="identifier" operator="like">page-builder-analytics-test-page%</condition>
             </filter>
         </source>
     </report>
@@ -30,8 +30,8 @@
                 </using>
             </link-source>
             <filter glue="and">
-                <condition attribute="identifier" operator="eq">page-builder-analytics-test-page</condition>
+                <condition attribute="identifier" operator="like">page-builder-analytics-test-page%</condition>
             </filter>
         </source>
     </report>
-</config>
+</config>

dev/tests/integration/testsuite/Magento/CmsPageBuilderAnalytics/_files/pages.php

@@ -390,3 +390,25 @@
     ->setContent($content)
     ->setPageLayout('cms-full-width')
     ->save();
+
+/** @var $emptyContentPage \Magento\Cms\Model\Page */
+$emptyContentPage = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Cms\Model\Page::class);
+$emptyContentPage->setTitle('Page Builder Analytics Test Page - Empty Content')
+    ->setIdentifier('page-builder-analytics-test-page-empty')
+    ->setStores([0, 1])
+    ->setIsActive(1)
+    ->setCreatedIn(1)
+    ->setContent('')
+    ->setPageLayout('cms-full-width')
+    ->save();
+
+/** @var $nullContentPage \Magento\Cms\Model\Page */
+$nullContentPage = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Cms\Model\Page::class);
+$nullContentPage->setTitle('Page Builder Analytics Test Page - Null Content')
+    ->setIdentifier('page-builder-analytics-test-page-null')
+    ->setStores([0, 1])
+    ->setIsActive(1)
+    ->setCreatedIn(1)
+    ->setContent(null)
+    ->setPageLayout('cms-full-width')
+    ->save();