MC-14937: Complete Page Builder Analytics data collection

cspruiell · cspruiell · commit c68e6b6d913e · 2019-03-06T00:17:56.000-06:00
- fix code formatting
diff --git a/app/code/Magento/CatalogPageBuilderAnalytics/composer.json b/app/code/Magento/CatalogPageBuilderAnalytics/composer.json
@@ -1,25 +1,25 @@
 {
-  "name": "magento/module-catalog-page-builder-analytics",
-  "description": "Catalog Page Builder Analytics module",
-  "config": {
-    "sort-packages": true
-  },
-  "require": {
-    "magento/module-page-builder-analytics": "*",
-    "magento/module-catalog": "*",
-    "magento/framework": "*",
-    "php": "~7.1.3||~7.2.0"
-  },
-  "type": "magento2-module",
-  "license": [
-    "proprietary"
-  ],
-  "autoload": {
-    "files": [
-      "registration.php"
+    "name": "magento/module-catalog-page-builder-analytics",
+    "description": "Catalog Page Builder Analytics module",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/module-page-builder-analytics": "*",
+        "magento/module-catalog": "*",
+        "magento/framework": "*",
+        "php": "~7.1.3||~7.2.0"
+    },
+    "type": "magento2-module",
+    "license": [
+        "proprietary"
     ],
-    "psr-4": {
-      "Magento\\CatalogPageBuilderAnalytics\\": ""
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\CatalogPageBuilderAnalytics\\": ""
+        }
     }
-  }
 }
diff --git a/app/code/Magento/CmsPageBuilderAnalytics/composer.json b/app/code/Magento/CmsPageBuilderAnalytics/composer.json
@@ -1,25 +1,25 @@
 {
-  "name": "magento/module-cms-page-builder-analytics",
-  "description": "CMS Page Builder Analytics module",
-  "config": {
-    "sort-packages": true
-  },
-  "require": {
-    "magento/module-page-builder-analytics": "*",
-    "magento/module-cms": "*",
-    "magento/framework": "*",
-    "php": "~7.1.3||~7.2.0"
-  },
-  "type": "magento2-module",
-  "license": [
-    "proprietary"
-  ],
-  "autoload": {
-    "files": [
-      "registration.php"
+    "name": "magento/module-cms-page-builder-analytics",
+    "description": "CMS Page Builder Analytics module",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/module-page-builder-analytics": "*",
+        "magento/module-cms": "*",
+        "magento/framework": "*",
+        "php": "~7.1.3||~7.2.0"
+    },
+    "type": "magento2-module",
+    "license": [
+        "proprietary"
     ],
-    "psr-4": {
-      "Magento\\CmsPageBuilderAnalytics\\": ""
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\CmsPageBuilderAnalytics\\": ""
+        }
     }
-  }
 }
diff --git a/app/code/Magento/PageBuilderAnalytics/Model/ContentTypeUsageReportProvider.php b/app/code/Magento/PageBuilderAnalytics/Model/ContentTypeUsageReportProvider.php
@@ -127,8 +127,6 @@ private function getRowCount(AdapterInterface $connection, Query $query) : strin
         $countSelect->reset(\Magento\Framework\DB\Select::COLUMNS)
             ->columns(['row_count' => new \Zend_Db_Expr('COUNT(*)')]);
 
-        return $connection->fetchOne(
-            $countSelect
-        );
+        return $connection->fetchOne($countSelect);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -127,8 +127,6 @@ private function getRowCount(AdapterInterface $connection, Query $query) : strin`
`127`	`127`	`$countSelect->reset(\Magento\Framework\DB\Select::COLUMNS)`
`128`	`128`	`->columns(['row_count' => new \Zend_Db_Expr('COUNT(*)')]);`
`129`	`129`
`130`		`- return $connection->fetchOne(`
`131`		`- $countSelect`
`132`		`- );`
	`130`	`+ return $connection->fetchOne($countSelect);`
`133`	`131`	`}`
`134`	`132`	`}`