new query monitor support

Author: Mte90

QM_Collector_WPBP_Debug.php

@@ -0,0 +1,20 @@
+<?php
+
+class QM_Collector_WPBP_Debug extends QM_Collector {
+	/**
+	 * Register with WordPress API on construct
+	 */
+	function __construct( $title ) {
+		$this->title = $title;
+		$this->id = strtolower( str_replace(' ', '_', $title ) );
+	}
+
+	public function name() {
+		return $this->title;
+	}
+
+	public function process() {
+		$this->data['log'] = 123;
+	}
+
+}

QM_Collector_WPBP_Debug_Output.php

@@ -0,0 +1,54 @@
+<?php
+
+class QM_Collector_WPBP_Debug_Output extends QM_Output_Html {
+	public function __construct( QM_Collector $collector, $output, $title ) {
+		parent::__construct( $collector );
+		$this->output = $output;
+		$this->title = $title;
+		$this->id = strtolower( str_replace(' ', '_', $title ) );
+		add_filter( 'qm/output/menus', array( $this, 'admin_menu' ), 101 );
+		add_filter( 'qm/output/title', array( $this, 'admin_title' ), 101 );
+		add_filter( 'qm/output/menu_class', array( $this, 'admin_class' ) );
+	}
+
+	/**
+	* Outputs data in the footer
+	*/
+	public function output() {
+		echo $this->output;
+	}
+
+	/**
+	* Adds data to top admin bar
+	*
+	* @param array $title
+	*
+	* @return array
+	*/
+	public function admin_title( array $title ) {
+		$data = $this->collector->get_data();
+		$title[] = $this->title . ' (' .	count( $data['log'] ) . ')';
+		return $title;
+	}
+
+	/**
+	* @param array $class
+	*
+	* @return array
+	*/
+	public function admin_class( array $class ) {
+		$class[] = $this->id;
+		return $class;
+	}
+
+	public function admin_menu( array $menu ) {
+		$data = $this->collector->get_data();
+		$menu[] = $this->menu( array(
+			'id'    => $this->id,
+			'href'  => '#' . str_replace( '_', '-', $this->id),
+			'title' => $this->title
+		));
+		return $menu;
+	}
+
+}

WPBP_Debug_Panel.php

@@ -1,6 +1,6 @@
 {
   "name": "wpbp/debug",
-  "description": "Add to your plugin the Debug Bar support (work also on Query Monitor)",
+  "description": "Add your plugin to Query Monitor",
   "license": "GPL-3.0",
   "keywords": [
     "wordpress",

composer.json

@@ -1,11 +1,11 @@
 <?php
 
 /**
- * Provides interface for debugging variables with Debug Bar
- * 
- * @author    Benjamin J. Balter <ben@balter.com> & Mte90 <mte90net@gmail.com>
+ * Provides interface for debugging variables with Query Monitor
+ *
+ * @author    Mte90 <mte90net@gmail.com>
  * @license   GPL-2.0+
- * @copyright 2014 
+ * @copyright 2018
  *
  */
 if ( !class_exists( 'WPBP_Debug' ) ) {
@@ -25,12 +25,24 @@ class WPBP_Debug {
 		 * Check user cap and WP_DEBUG on init to see if class should continue loading
 		 */
 		function __construct( $title ) {
-			if ( !current_user_can( 'manage_options' ) || !WP_DEBUG ) {
-				return;
+			if( class_exists('QM_Collectors') ) {
+				require_once( 'QM_Collector_WPBP_Debug.php' );
+				$this->title = $title;
+
+				QM_Collectors::add( new QM_Collector_WPBP_Debug( $this->title ) );
 			}
-			$this->title = $title;
 
-			add_filter( 'debug_bar_panels', array( $this, 'init_panel' ) );
+			/**
+			* Register output. The filter won't run if Query Monitor is not
+			* installed so we don't have to explicity check for it.
+			*/
+			add_filter( 'qm/outputter/html', function(array $output, QM_Collectors $collectors) {
+				include 'QM_Collector_WPBP_Debug_Output.php';
+				if ( $collector = QM_Collectors::get( 'wpbp' ) ) {
+					$output['wpbp'] = new QM_Collector_WPBP_Debug_Output( $collector, $this->output, $this->title );
+				}
+				return $output;
+			}, 101, 2 );
 		}
 
 		/**
@@ -42,9 +54,6 @@ function __construct( $title ) {
 		 * @return mixed
 		 */
 		function log( $var, $die = false, $function = 'var_dump' ) {
-			if ( !current_user_can( 'manage_options' ) || !WP_DEBUG ) {
-				return;
-			}
 
 			ob_start();
 			if ( is_string( $var ) ) {
@@ -57,25 +66,7 @@ function log( $var, $die = false, $function = 'var_dump' ) {
 				die();
 			}
 
-			$debug = ob_get_clean();
-
-			$GLOBALS[ 'WPBP_Debug' ][] = $debug;
-
-			// Allow this to be used as a filter
-			return $var;
-		}
-
-		/**
-		 * Extend Debug_Bar_Panel
-		 * @param array $panels The default panels.
-		 * @return array passback The original panels.
-		 */
-		function init_panel( $panels ) {
-			if ( !class_exists( 'WPBP_Debug_Panel' ) ) {
-				require_once('WPBP_Debug_Panel.php');
-				$panels[] = new WPBP_Debug_Panel( $this->title );
-			}
-			return $panels;
+			$this->output = ob_get_clean();
 		}
 
 	}