pryley / blackbar

views/panels/console.php

Braces +5 added lines, -2 removed lines

@@ -6,10 +6,13 @@
 		<tr>
 			<td><?= __('No entries found.', 'blackbar'); ?></td>
 		</tr>
-		<?php else : ?>
+		<?php else {
+	: ?>
 		<?php foreach ($entries as $entry) : ?>
 		<tr>
-			<td class="glbb-small"><?= $entry['name']; ?></td>
+			<td class="glbb-small"><?= $entry['name'];
+}
+?></td>
 			<td><pre><?= $entry['message']; ?></pre></td>
 		</tr>
 		<?php endforeach; ?>

views/panels/actions.php

Braces +5 added lines, -2 removed lines

@@ -6,14 +6,17 @@
 		<tr>
 			<td><?= __('No entries found.', 'blackbar'); ?></td>
 		</tr>
-		<?php else : ?>
+		<?php else {
+	: ?>
 		<?php foreach ($actions->getMeasure() as $hook => $flow) : ?>
 		<tr>
 			<td class="glbb-smalls"><?php 
 			// glsr_log($flow); 
 			?></td>
 		</tr>
-		<?php endforeach; ?>
+		<?php endforeach;
+}
+?>
 		<?php endif; ?>
 	</tbody>
 </table>

views/panels/queries.php

Braces +5 added lines, -2 removed lines

@@ -8,9 +8,12 @@
 		</tr>
 	</tbody>
 </table>
-<?php else : ?>
+<?php else {
+	: ?>
 <form method="get" class="glbb-queries-filter">
-	<input type="text" name="glbb_query_filter" id="glbb_query_filter" placeholder="<?= __('Find queries containing', 'blackbar'); ?>">
+	<input type="text" name="glbb_query_filter" id="glbb_query_filter" placeholder="<?= __('Find queries containing', 'blackbar');
+}
+?>">
 	<input type="text" name="glbb_query_min_time" id="glbb_query_min_time" placeholder="<?= __('Minimum Execution Time', 'blackbar'); ?>">
 </form>
 <table class="glbb-queries-table">

views/panels/profiler.php

Braces +5 added lines, -2 removed lines

@@ -6,10 +6,13 @@
 		<tr>
 			<td><?= __('No entries found.', 'blackbar'); ?></td>
 		</tr>
-		<?php else : ?>
+		<?php else {
+	: ?>
 		<?php foreach ($profiler->getMeasure() as $timer) : ?>
 		<tr>
-			<td><?= $profiler->getNameString($timer); ?></td>
+			<td><?= $profiler->getNameString($timer);
+}
+?></td>
 			<td class="glbb-medium"><?= $profiler->getTimeString($timer); ?></td>
 			<td class="glbb-medium"><?= $profiler->getMemoryString($timer); ?></td>
 		</tr>

compatibility.php

Indentation +5 added lines, -5 removed lines

@@ -7,8 +7,8 @@ 
  * @see https://docs.gravityforms.com/gform_noconflict_scripts/
  */
 add_filter('gform_noconflict_scripts', function (array $scripts) {
-    $scripts[] = 'blackbar';
-    return $scripts;
+	$scripts[] = 'blackbar';
+	return $scripts;
 });
 
 /*
@@ -16,7 +16,7 @@ 
  * @see https://docs.gravityforms.com/gform_noconflict_styles/
  */
 add_filter('gform_noconflict_styles', function (array $styles) {
-    $styles[] = 'blackbar';
-    $styles[] = 'blackbar-syntax';
-    return $styles;
+	$styles[] = 'blackbar';
+	$styles[] = 'blackbar-syntax';
+	return $styles;
 });

Braces +4 added lines, -2 removed lines

@@ -6,7 +6,8 @@ 
  * @return array
  * @see https://docs.gravityforms.com/gform_noconflict_scripts/
  */
-add_filter('gform_noconflict_scripts', function (array $scripts) {
+add_filter('gform_noconflict_scripts', function (array $scripts)
+{
     $scripts[] = 'blackbar';
     return $scripts;
 });
@@ -15,7 +16,8 @@ 
  * @return array
  * @see https://docs.gravityforms.com/gform_noconflict_styles/
  */
-add_filter('gform_noconflict_styles', function (array $styles) {
+add_filter('gform_noconflict_styles', function (array $styles)
+{
     $styles[] = 'blackbar';
     $styles[] = 'blackbar-syntax';
     return $styles;

autoload.php

Indentation +16 added lines, -16 removed lines

@@ -3,20 +3,20 @@
 defined('WPINC') || die;
 
 spl_autoload_register(function ($className) {
-    $namespaces = [
-        'GeminiLabs\\BlackBar\\' => __DIR__.'/plugin/',
-        'GeminiLabs\\BlackBar\\Tests\\' => __DIR__.'/tests/',
-    ];
-    foreach ($namespaces as $prefix => $baseDir) {
-        $len = strlen($prefix);
-        if (0 !== strncmp($prefix, $className, $len)) {
-            continue;
-        }
-        $file = $baseDir.str_replace('\\', '/', substr($className, $len)).'.php';
-        if (!file_exists($file)) {
-            continue;
-        }
-        require $file;
-        break;
-    }
+	$namespaces = [
+		'GeminiLabs\\BlackBar\\' => __DIR__.'/plugin/',
+		'GeminiLabs\\BlackBar\\Tests\\' => __DIR__.'/tests/',
+	];
+	foreach ($namespaces as $prefix => $baseDir) {
+		$len = strlen($prefix);
+		if (0 !== strncmp($prefix, $className, $len)) {
+			continue;
+		}
+		$file = $baseDir.str_replace('\\', '/', substr($className, $len)).'.php';
+		if (!file_exists($file)) {
+			continue;
+		}
+		require $file;
+		break;
+	}
 });

Braces +2 added lines, -1 removed lines

@@ -2,7 +2,8 @@
 
 defined('WPINC') || die;
 
-spl_autoload_register(function ($className) {
+spl_autoload_register(function ($className)
+{
     $namespaces = [
         'GeminiLabs\\BlackBar\\' => __DIR__.'/plugin/',
         'GeminiLabs\\BlackBar\\Tests\\' => __DIR__.'/tests/',

plugin/SlowActions.php

Braces +4 added lines, -2 removed lines

@@ -74,9 +74,11 @@
                         $object = get_class($object);
                     }
                     $this->flow[$action]['callbacks'][$priority][] = sprintf('%s::%s', $object, $method);
-                } elseif (is_object($callback['function'])) {
+                }
+                elseif (is_object($callback['function'])) {
                     $this->flow[$action]['callbacks'][$priority][] = get_class($callback['function']);
-                } else {
+                }
+                else {
                     $this->flow[$action]['callbacks'][$priority][] = $callback['function'];
                 }
                 ++$this->flow[$action]['callbacks_count'];

Indentation +136 added lines, -136 removed lines

@@ -4,140 +4,140 @@
 
 class SlowActions
 {
-    /**
-     * @var array
-     */
-    protected $flow;
-
-    /**
-     * This is the time that WordPress takes to execute the all hook.
-     * @var int
-     */
-    protected $noise = 0;
-
-    /**
-     * @var int
-     */
-    protected $start = null;
-
-    /**
-     * @var int
-     */
-    protected $stop = null;
-
-    /**
-     * @var int
-     */
-    protected $totalActions = 0;
-
-    /**
-     * @var int
-     */
-    protected $totalTime = 0;
-
-    public function __construct()
-    {
-        $this->flow = [];
-        $this->start = microtime(true);
-    }
-
-    public function getTotalTimeForHook(array $data): array
-    {
-        $total = 0;
-        foreach ($data['time'] as $time) {
-            $total += ($time['stop'] - $time['start']) * 1000;
-        }
-        return $total;
-    }
-
-    public function addCallbacksForAction(string $action): array
-    {
-        global $wp_filter;
-        if (!array_key_exists($action, $this->flow)) {
-            return;
-        }
-        $this->flow[$action]['callbacks_count'] = 0;
-        foreach ($wp_filter[$action] as $priority => $callbacks) {
-            if (!array_key_exists($priority, $this->flow[$action]['callbacks'])) {
-                $this->flow[$action]['callbacks'][$priority] = [];
-            }
-            foreach ($callbacks as $callback) {
-                if (is_array($callback['function']) && 2 == count($callback['function'])) {
-                    list($object, $method) = $callback['function'];
-                    if (is_object($object)) {
-                        $object = get_class($object);
-                    }
-                    $this->flow[$action]['callbacks'][$priority][] = sprintf('%s::%s', $object, $method);
-                } elseif (is_object($callback['function'])) {
-                    $this->flow[$action]['callbacks'][$priority][] = get_class($callback['function']);
-                } else {
-                    $this->flow[$action]['callbacks'][$priority][] = $callback['function'];
-                }
-                ++$this->flow[$action]['callbacks_count'];
-            }
-        }
-    }
-
-    public function getMeasure(): array
-    {
-        foreach ($this->flow as $action => $data) {
-            $total = $this->getTotalTimeForHook($data);
-            $this->flow[$action]['total'] = $total;
-            $this->totalTime += $total;
-            $this->totalActions += $data['count'];
-            $this->addCallbacksForAction($action);
-        }
-        uasort($this->flow, [$this, 'sortByTime']);
-        return $this->flow;
-    }
-
-    public function getTotalActions(): int
-    {
-        return $this->totalActions;
-    }
-
-    /**
-     * Time in Microseconds
-     */
-    public function getTotalTime(): int
-    {
-        return $this->totalTime;
-        // $totalNoise = (count($this->timers) - 1) * $this->noise;
-        // return $this->stop - $this->start - $totalNoise;
-    }
-
-    public function startTimer(): void
-    {
-        if (!isset($this->flow[current_filter()])) {
-            $this->flow[current_filter()] = [
-                'callbacks' => [],
-                'count' => 0,
-                'stack' => [],
-                'time' => [],
-            ];
-            add_action(current_filter(), [$this, 'stopTimer'], 9000);
-        }
-        $count = ++$this->flow[current_filter()]['count'];
-        array_push($this->flow[current_filter()]['stack'], ['start' => microtime(true)]);
-    }
-
-    /**
-     * @param mixed $possibleFilter
-     * @return mixed
-     */
-    public function stopTimer($possibleFilter = null)
-    {
-        $time = array_pop($this->flow[current_filter()]['stack']);
-        $time['stop'] = microtime(true);
-        array_push($this->flow[current_filter()]['time'], $time);
-        return $possibleFilter;
-    }
-
-    protected function sortByTime(array $a, array $b): int
-    {
-        if ($a['total'] == $b['total']) {
-            return 0;
-        }
-        return ($a['total'] > $b['total']) ? -1 : 1;
-    }
+	/**
+	 * @var array
+	 */
+	protected $flow;
+
+	/**
+	 * This is the time that WordPress takes to execute the all hook.
+	 * @var int
+	 */
+	protected $noise = 0;
+
+	/**
+	 * @var int
+	 */
+	protected $start = null;
+
+	/**
+	 * @var int
+	 */
+	protected $stop = null;
+
+	/**
+	 * @var int
+	 */
+	protected $totalActions = 0;
+
+	/**
+	 * @var int
+	 */
+	protected $totalTime = 0;
+
+	public function __construct()
+	{
+		$this->flow = [];
+		$this->start = microtime(true);
+	}
+
+	public function getTotalTimeForHook(array $data): array
+	{
+		$total = 0;
+		foreach ($data['time'] as $time) {
+			$total += ($time['stop'] - $time['start']) * 1000;
+		}
+		return $total;
+	}
+
+	public function addCallbacksForAction(string $action): array
+	{
+		global $wp_filter;
+		if (!array_key_exists($action, $this->flow)) {
+			return;
+		}
+		$this->flow[$action]['callbacks_count'] = 0;
+		foreach ($wp_filter[$action] as $priority => $callbacks) {
+			if (!array_key_exists($priority, $this->flow[$action]['callbacks'])) {
+				$this->flow[$action]['callbacks'][$priority] = [];
+			}
+			foreach ($callbacks as $callback) {
+				if (is_array($callback['function']) && 2 == count($callback['function'])) {
+					list($object, $method) = $callback['function'];
+					if (is_object($object)) {
+						$object = get_class($object);
+					}
+					$this->flow[$action]['callbacks'][$priority][] = sprintf('%s::%s', $object, $method);
+				} elseif (is_object($callback['function'])) {
+					$this->flow[$action]['callbacks'][$priority][] = get_class($callback['function']);
+				} else {
+					$this->flow[$action]['callbacks'][$priority][] = $callback['function'];
+				}
+				++$this->flow[$action]['callbacks_count'];
+			}
+		}
+	}
+
+	public function getMeasure(): array
+	{
+		foreach ($this->flow as $action => $data) {
+			$total = $this->getTotalTimeForHook($data);
+			$this->flow[$action]['total'] = $total;
+			$this->totalTime += $total;
+			$this->totalActions += $data['count'];
+			$this->addCallbacksForAction($action);
+		}
+		uasort($this->flow, [$this, 'sortByTime']);
+		return $this->flow;
+	}
+
+	public function getTotalActions(): int
+	{
+		return $this->totalActions;
+	}
+
+	/**
+	 * Time in Microseconds
+	 */
+	public function getTotalTime(): int
+	{
+		return $this->totalTime;
+		// $totalNoise = (count($this->timers) - 1) * $this->noise;
+		// return $this->stop - $this->start - $totalNoise;
+	}
+
+	public function startTimer(): void
+	{
+		if (!isset($this->flow[current_filter()])) {
+			$this->flow[current_filter()] = [
+				'callbacks' => [],
+				'count' => 0,
+				'stack' => [],
+				'time' => [],
+			];
+			add_action(current_filter(), [$this, 'stopTimer'], 9000);
+		}
+		$count = ++$this->flow[current_filter()]['count'];
+		array_push($this->flow[current_filter()]['stack'], ['start' => microtime(true)]);
+	}
+
+	/**
+	 * @param mixed $possibleFilter
+	 * @return mixed
+	 */
+	public function stopTimer($possibleFilter = null)
+	{
+		$time = array_pop($this->flow[current_filter()]['stack']);
+		$time['stop'] = microtime(true);
+		array_push($this->flow[current_filter()]['time'], $time);
+		return $possibleFilter;
+	}
+
+	protected function sortByTime(array $a, array $b): int
+	{
+		if ($a['total'] == $b['total']) {
+			return 0;
+		}
+		return ($a['total'] > $b['total']) ? -1 : 1;
+	}
 }

activate.php

Indentation +126 added lines, -126 removed lines

@@ -8,141 +8,141 @@
  */
 class GL_Plugin_Check_v6
 {
-    const MIN_PHP_VERSION = '7.2';
-    const MIN_WORDPRESS_VERSION = '5.8';
+	const MIN_PHP_VERSION = '7.2';
+	const MIN_WORDPRESS_VERSION = '5.8';
 
-    /**
-     * @var array
-     */
-    public $versions;
+	/**
+	 * @var array
+	 */
+	public $versions;
 
-    /**
-     * @var string
-     */
-    protected $file;
+	/**
+	 * @var string
+	 */
+	protected $file;
 
-    /**
-     * @param string $file
-     */
-    public function __construct($file)
-    {
-        $this->file = realpath($file);
-        $versionRequirements = get_file_data($this->file, [
-            'php' => 'Requires PHP',
-            'wordpress' => 'Requires at least',
-        ]);
-        $this->versions = wp_parse_args(array_filter($versionRequirements), [
-            'php' => static::MIN_PHP_VERSION,
-            'wordpress' => static::MIN_WORDPRESS_VERSION,
-        ]);
-    }
+	/**
+	 * @param string $file
+	 */
+	public function __construct($file)
+	{
+		$this->file = realpath($file);
+		$versionRequirements = get_file_data($this->file, [
+			'php' => 'Requires PHP',
+			'wordpress' => 'Requires at least',
+		]);
+		$this->versions = wp_parse_args(array_filter($versionRequirements), [
+			'php' => static::MIN_PHP_VERSION,
+			'wordpress' => static::MIN_WORDPRESS_VERSION,
+		]);
+	}
 
-    /**
-     * @return bool
-     */
-    public function canProceed()
-    {
-        if ($this->isValid()) {
-            return true;
-        }
-        add_action('activated_plugin', [$this, 'deactivate']);
-        add_action('admin_notices', [$this, 'deactivate']);
-        return false;
-    }
+	/**
+	 * @return bool
+	 */
+	public function canProceed()
+	{
+		if ($this->isValid()) {
+			return true;
+		}
+		add_action('activated_plugin', [$this, 'deactivate']);
+		add_action('admin_notices', [$this, 'deactivate']);
+		return false;
+	}
 
-    /**
-     * @return bool
-     */
-    public function isPhpValid()
-    {
-        return version_compare(PHP_VERSION, $this->versions['php'], '>=');
-    }
+	/**
+	 * @return bool
+	 */
+	public function isPhpValid()
+	{
+		return version_compare(PHP_VERSION, $this->versions['php'], '>=');
+	}
 
-    /**
-     * @return bool
-     */
-    public function isValid()
-    {
-        return $this->isPhpValid() && $this->isWpValid();
-    }
+	/**
+	 * @return bool
+	 */
+	public function isValid()
+	{
+		return $this->isPhpValid() && $this->isWpValid();
+	}
 
-    /**
-     * @return bool
-     */
-    public function isWpValid()
-    {
-        global $wp_version;
-        return version_compare($wp_version, $this->versions['wordpress'], '>=');
-    }
+	/**
+	 * @return bool
+	 */
+	public function isWpValid()
+	{
+		global $wp_version;
+		return version_compare($wp_version, $this->versions['wordpress'], '>=');
+	}
 
-    /**
-     * @param string $plugin
-     * @return void
-     */
-    public function deactivate($plugin)
-    {
-        if ($this->isValid()) {
-            return;
-        }
-        $pluginSlug = plugin_basename($this->file);
-        if ($plugin == $pluginSlug) {
-            $this->redirect(); // exit
-        }
-        $pluginData = get_file_data($this->file, ['name' => 'Plugin Name'], 'plugin');
-        deactivate_plugins($pluginSlug);
-        $this->printNotice($pluginData['name']);
-    }
+	/**
+	 * @param string $plugin
+	 * @return void
+	 */
+	public function deactivate($plugin)
+	{
+		if ($this->isValid()) {
+			return;
+		}
+		$pluginSlug = plugin_basename($this->file);
+		if ($plugin == $pluginSlug) {
+			$this->redirect(); // exit
+		}
+		$pluginData = get_file_data($this->file, ['name' => 'Plugin Name'], 'plugin');
+		deactivate_plugins($pluginSlug);
+		$this->printNotice($pluginData['name']);
+	}
 
-    /**
-     * @return array
-     */
-    protected function getMessages()
-    {
-        return [
-            'notice' => _x('The %s plugin was deactivated.', 'admin-text', 'blackbar'),
-            'php_version' => _x('PHP version', 'admin-text', 'blackbar'),
-            'rollback' => _x('You can use the %s plugin to restore %s to the previous version.', 'admin-text', 'blackbar'),
-            'update_php' => _x('Please contact your hosting provider or server administrator to upgrade the version of PHP on your server (your server is running PHP version %s), or try to find an alternative plugin.', 'admin-text', 'blackbar'),
-            'update_wp' => _x('Update WordPress', 'admin-text', 'blackbar'),
-            'wp_version' => _x('WordPress version', 'admin-text', 'blackbar'),
-            'wrong_version' => _x('This plugin requires %s or greater in order to work properly.', 'admin-text', 'blackbar'),
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	protected function getMessages()
+	{
+		return [
+			'notice' => _x('The %s plugin was deactivated.', 'admin-text', 'blackbar'),
+			'php_version' => _x('PHP version', 'admin-text', 'blackbar'),
+			'rollback' => _x('You can use the %s plugin to restore %s to the previous version.', 'admin-text', 'blackbar'),
+			'update_php' => _x('Please contact your hosting provider or server administrator to upgrade the version of PHP on your server (your server is running PHP version %s), or try to find an alternative plugin.', 'admin-text', 'blackbar'),
+			'update_wp' => _x('Update WordPress', 'admin-text', 'blackbar'),
+			'wp_version' => _x('WordPress version', 'admin-text', 'blackbar'),
+			'wrong_version' => _x('This plugin requires %s or greater in order to work properly.', 'admin-text', 'blackbar'),
+		];
+	}
 
-    /**
-     * @param string $pluginName
-     * @return void
-     */
-    protected function printNotice($pluginName)
-    {
-        $noticeTemplate = '<div id="message" class="notice notice-error error is-dismissible"><p><strong>%s</strong></p><p>%s</p><p>%s</p></div>';
-        $messages = $this->getMessages();
-        $rollbackMessage = sprintf('<strong>'.$messages['rollback'].'</strong>', '<a href="https://wordpress.org/plugins/wp-rollback/" target="_blank">WP Rollback</a>', $pluginName);
-        if (!$this->isPhpValid()) {
-            printf($noticeTemplate,
-                sprintf($messages['notice'], $pluginName),
-                sprintf($messages['wrong_version'], $messages['php_version'].' '.$this->versions['php']),
-                sprintf($messages['update_php'], PHP_VERSION).'</p><p>'.$rollbackMessage
-            );
-        } elseif (!$this->isWpValid()) {
-            printf($noticeTemplate,
-                sprintf($messages['notice'], $pluginName),
-                sprintf($messages['wrong_version'], $messages['wp_version'].' '.$this->versions['wordpress']),
-                $rollbackMessage.'</p><p>'.sprintf('<a href="%s">%s</a>', admin_url('update-core.php'), $messages['update_wp'])
-            );
-        }
-    }
+	/**
+	 * @param string $pluginName
+	 * @return void
+	 */
+	protected function printNotice($pluginName)
+	{
+		$noticeTemplate = '<div id="message" class="notice notice-error error is-dismissible"><p><strong>%s</strong></p><p>%s</p><p>%s</p></div>';
+		$messages = $this->getMessages();
+		$rollbackMessage = sprintf('<strong>'.$messages['rollback'].'</strong>', '<a href="https://wordpress.org/plugins/wp-rollback/" target="_blank">WP Rollback</a>', $pluginName);
+		if (!$this->isPhpValid()) {
+			printf($noticeTemplate,
+				sprintf($messages['notice'], $pluginName),
+				sprintf($messages['wrong_version'], $messages['php_version'].' '.$this->versions['php']),
+				sprintf($messages['update_php'], PHP_VERSION).'</p><p>'.$rollbackMessage
+			);
+		} elseif (!$this->isWpValid()) {
+			printf($noticeTemplate,
+				sprintf($messages['notice'], $pluginName),
+				sprintf($messages['wrong_version'], $messages['wp_version'].' '.$this->versions['wordpress']),
+				$rollbackMessage.'</p><p>'.sprintf('<a href="%s">%s</a>', admin_url('update-core.php'), $messages['update_wp'])
+			);
+		}
+	}
 
-    /**
-     * @return void
-     */
-    protected function redirect()
-    {
-        wp_safe_redirect(self_admin_url(sprintf('plugins.php?plugin_status=%s&paged=%s&s=%s',
-            filter_input(INPUT_GET, 'plugin_status'),
-            filter_input(INPUT_GET, 'paged'),
-            filter_input(INPUT_GET, 's')
-        )));
-        exit;
-    }
+	/**
+	 * @return void
+	 */
+	protected function redirect()
+	{
+		wp_safe_redirect(self_admin_url(sprintf('plugins.php?plugin_status=%s&paged=%s&s=%s',
+			filter_input(INPUT_GET, 'plugin_status'),
+			filter_input(INPUT_GET, 'paged'),
+			filter_input(INPUT_GET, 's')
+		)));
+		exit;
+	}
 }

Braces +2 added lines, -1 removed lines

@@ -124,7 +124,8 @@
                 sprintf($messages['wrong_version'], $messages['php_version'].' '.$this->versions['php']),
                 sprintf($messages['update_php'], PHP_VERSION).'</p><p>'.$rollbackMessage
             );
-        } elseif (!$this->isWpValid()) {
+        }
+        elseif (!$this->isWpValid()) {
             printf($noticeTemplate,
                 sprintf($messages['notice'], $pluginName),
                 sprintf($messages['wrong_version'], $messages['wp_version'].' '.$this->versions['wordpress']),

plugin/Controller.php

Indentation +248 added lines, -248 removed lines

@@ -4,252 +4,252 @@
 
 class Controller
 {
-    /**
-     * @var Application
-     */
-    protected $app;
-
-    public function __construct(Application $app)
-    {
-        $this->app = Application::load();
-    }
-
-    /**
-     * @action admin_enqueue_scripts
-     * @action wp_enqueue_scripts
-     */
-    public function enqueueAssets(): void
-    {
-        wp_enqueue_script(Application::ID, $this->app->url('assets/main.js'));
-        wp_enqueue_style(Application::ID, $this->app->url('assets/main.css'), ['dashicons']);
-        wp_enqueue_style(Application::ID.'-syntax', $this->app->url('assets/syntax.css'));
-    }
-
-    /**
-     * @param string $classes
-     * @action admin_body_class
-     */
-    public function filterBodyClasses($classes): string
-    {
-        return trim((string) $classes.' '.Application::ID);
-    }
-
-    /**
-     * @filter all
-     */
-    public function initConsole(): void
-    {
-        if (Application::CONSOLE_HOOK !== func_get_arg(0)) {
-            return;
-        }
-        $args = array_pad(func_get_args(), 4, '');
-        $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 4);
-        $entry = array_pop($backtrace);
-        $message = $args[1];
-        $errno = $args[2];
-        $location = $args[3];
-        if (empty(trim($location)) && array_key_exists('file', $entry)) {
-            $path = explode(ABSPATH, $entry['file']);
-            $location = sprintf('%s:%s', array_pop($path), $entry['line']);
-        }
-        $this->app->console->store($message, $errno, '['.$location.'] ');
-    }
-
-    /**
-     * @filter all
-     */
-    public function initProfiler(): void
-    {
-        if (Application::PROFILER_HOOK !== func_get_arg(0)) {
-            return;
-        }
-        $this->app->profiler->trace(func_get_arg(1));
-    }
-
-    /**
-     * @filter all
-     */
-    public function measureSlowActions(): void
-    {
-        $this->app->actions->startTimer();
-    }
-
-    /**
-     * @action plugins_loaded
-     */
-    public function registerLanguages(): void
-    {
-        load_plugin_textdomain(Application::ID, false,
-            plugin_basename($this->app->path()).'/languages/'
-        );
-    }
-
-    /**
-     * @action admin_footer
-     * @action wp_footer
-     */
-    public function renderBar(): void
-    {
-        apply_filters('debug', 'Profiler Stopped');
-        $this->app->render('debug-bar', [
-            'actions' => $this->app->actions,
-            'actionsLabel' => $this->getSlowActionsLabel(),
-            'blackbar' => $this->app,
-            'consoleEntries' => $this->getConsoleEntries(),
-            'consoleLabel' => $this->getConsoleLabel(),
-            'profiler' => $this->app->profiler,
-            'profilerLabel' => $this->getProfilerLabel(),
-            'queries' => $this->getQueries(),
-            'queriesLabel' => $this->getQueriesLabel(),
-            'templates' => $this->getTemplates(),
-        ]);
-    }
-
-    protected function convertToMiliseconds(int $time, int $decimals = 2): string
-    {
-        return number_format($time * 1000, $decimals);
-    }
-
-    protected function getConsoleEntries(): array
-    {
-        return array_merge($this->getErrors(), $this->app->console->entries);
-    }
-
-    protected function getConsoleLabel(): string
-    {
-        $class = '';
-        $entries = $this->getConsoleEntries();
-        $entryCount = count($entries);
-        $errorCount = 0;
-        $label = __('Console', 'blackbar');
-        foreach ($entries as $entry) {
-            if (in_array($entry['code'], [E_NOTICE, E_STRICT, E_DEPRECATED])) {
-                $class = 'glbb-warning';
-            }
-            if (in_array($entry['code'], [E_WARNING])) {
-                ++$errorCount;
-            }
-        }
-        if ($entryCount > 0) {
-            $label .= sprintf(' (%d)', $entryCount);
-        }
-        if ($errorCount > 0) {
-            $class = 'glbb-error';
-            $label .= sprintf(' (%d, %d!)', $entryCount, $errorCount);
-        }
-        return sprintf('<span class="%s">%s</span>', $class, $label);
-    }
-
-    protected function getErrors(): array
-    {
-        $errors = [];
-        foreach ($this->app->errors as $error) {
-            $class = 'glbb-info';
-            if (in_array($error['code'], [E_NOTICE, E_STRICT, E_DEPRECATED])) {
-                $class = 'glbb-warning';
-            }
-            if (E_WARNING == $error['code']) {
-                $class = 'glbb-error';
-            }
-            if ($error['count'] > 1) {
-                $error['name'] .= ' ('.$error['count'].')';
-            }
-            $errors[] = [
-                'code' => $error['code'],
-                'name' => '<span class="'.$class.'">'.$error['name'].'</span>',
-                'message' => sprintf(__('%s on line %s in file %s', 'blackbar'),
-                    $error['message'],
-                    $error['line'],
-                    $error['file']
-                ),
-            ];
-        }
-        return $errors;
-    }
-
-    protected function getIncludedFiles(): array
-    {
-        $files = array_values(array_filter(get_included_files(), function ($file) {
-            $bool = false !== strpos($file, '/themes/')
-                && false === strpos($file, '/functions.php');
-            return (bool) apply_filters('blackbar/templates/file', $bool, $file);
-        }));
-        return array_map(function ($key, $value) {
-            $value = str_replace(trailingslashit(WP_CONTENT_DIR), '', $value);
-            return sprintf('[%s] => %s', $key, $value);
-        }, array_keys($files), $files);
-    }
-
-    protected function getProfilerLabel(): string
-    {
-        $label = __('Profiler', 'blackbar');
-        $profilerTime = $this->convertToMiliseconds($this->app->profiler->getTotalTime(), 0);
-        if ($profilerTime > 0) {
-            $label .= sprintf(' (%s %s)', $profilerTime, __('ms', 'blackbar'));
-        }
-        return $label;
-    }
-
-    protected function getQueries(): array
-    {
-        global $wpdb;
-        $queries = [];
-        $search = [
-            'AND', 'FROM', 'GROUP BY', 'INNER JOIN', 'LEFT JOIN', 'LIMIT',
-            'ON DUPLICATE KEY UPDATE', 'ORDER BY', 'OFFSET', ' SET', 'WHERE',
-        ];
-        $replace = array_map(function ($value) {
-            return PHP_EOL.$value;
-        }, $search);
-        foreach ($wpdb->queries as $query) {
-            $miliseconds = number_format(round($query[1] * 1000, 4), 4);
-            $sql = preg_replace('/\s\s+/', ' ', trim($query[0]));
-            $sql = str_replace(PHP_EOL, ' ', $sql);
-            $sql = str_replace($search, $replace, $sql);
-            $queries[] = [
-                'ms' => $miliseconds,
-                'sql' => $sql,
-            ];
-        }
-        return $queries;
-    }
-
-    protected function getQueriesLabel(): string
-    {
-        $label = __('SQL', 'blackbar');
-        if (!SAVEQUERIES) {
-            return $label;
-        }
-        global $wpdb;
-        $queryTime = 0;
-        foreach ($wpdb->queries as $query) {
-            $queryTime += $query[1];
-        }
-        $queriesCount = sprintf('<span class="glbb-queries-count">%s</span>', count($wpdb->queries));
-        $queriesTime = sprintf('<span class="glbb-queries-time">%s</span>', $this->convertToMiliseconds($queryTime));
-        return $label.sprintf(' (%s %s | %s %s)', $queriesCount, __('queries', 'blackbar'), $queriesTime, __('ms', 'blackbar'));
-    }
-
-    protected function getSlowActionsLabel(): string
-    {
-        $label = __('Hooks', 'blackbar');
-        $totalTime = $this->convertToMiliseconds($this->app->actions->getTotalTime(), 0);
-        if ($totalTime > 0) {
-            $label .= sprintf(' (%s %s)', $totalTime, __('ms', 'blackbar'));
-        }
-        return $label;
-    }
-
-    protected function getTemplates(): string
-    {
-        if (is_admin()) {
-            return '';
-        }
-        if (class_exists('\GeminiLabs\Castor\Facades\Development')) {
-            ob_start();
-            \GeminiLabs\Castor\Facades\Development::printTemplatePaths();
-            return ob_get_clean();
-        }
-        return sprintf('<pre>%s</pre>', implode(PHP_EOL, $this->getIncludedFiles()));
-    }
+	/**
+	 * @var Application
+	 */
+	protected $app;
+
+	public function __construct(Application $app)
+	{
+		$this->app = Application::load();
+	}
+
+	/**
+	 * @action admin_enqueue_scripts
+	 * @action wp_enqueue_scripts
+	 */
+	public function enqueueAssets(): void
+	{
+		wp_enqueue_script(Application::ID, $this->app->url('assets/main.js'));
+		wp_enqueue_style(Application::ID, $this->app->url('assets/main.css'), ['dashicons']);
+		wp_enqueue_style(Application::ID.'-syntax', $this->app->url('assets/syntax.css'));
+	}
+
+	/**
+	 * @param string $classes
+	 * @action admin_body_class
+	 */
+	public function filterBodyClasses($classes): string
+	{
+		return trim((string) $classes.' '.Application::ID);
+	}
+
+	/**
+	 * @filter all
+	 */
+	public function initConsole(): void
+	{
+		if (Application::CONSOLE_HOOK !== func_get_arg(0)) {
+			return;
+		}
+		$args = array_pad(func_get_args(), 4, '');
+		$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 4);
+		$entry = array_pop($backtrace);
+		$message = $args[1];
+		$errno = $args[2];
+		$location = $args[3];
+		if (empty(trim($location)) && array_key_exists('file', $entry)) {
+			$path = explode(ABSPATH, $entry['file']);
+			$location = sprintf('%s:%s', array_pop($path), $entry['line']);
+		}
+		$this->app->console->store($message, $errno, '['.$location.'] ');
+	}
+
+	/**
+	 * @filter all
+	 */
+	public function initProfiler(): void
+	{
+		if (Application::PROFILER_HOOK !== func_get_arg(0)) {
+			return;
+		}
+		$this->app->profiler->trace(func_get_arg(1));
+	}
+
+	/**
+	 * @filter all
+	 */
+	public function measureSlowActions(): void
+	{
+		$this->app->actions->startTimer();
+	}
+
+	/**
+	 * @action plugins_loaded
+	 */
+	public function registerLanguages(): void
+	{
+		load_plugin_textdomain(Application::ID, false,
+			plugin_basename($this->app->path()).'/languages/'
+		);
+	}
+
+	/**
+	 * @action admin_footer
+	 * @action wp_footer
+	 */
+	public function renderBar(): void
+	{
+		apply_filters('debug', 'Profiler Stopped');
+		$this->app->render('debug-bar', [
+			'actions' => $this->app->actions,
+			'actionsLabel' => $this->getSlowActionsLabel(),
+			'blackbar' => $this->app,
+			'consoleEntries' => $this->getConsoleEntries(),
+			'consoleLabel' => $this->getConsoleLabel(),
+			'profiler' => $this->app->profiler,
+			'profilerLabel' => $this->getProfilerLabel(),
+			'queries' => $this->getQueries(),
+			'queriesLabel' => $this->getQueriesLabel(),
+			'templates' => $this->getTemplates(),
+		]);
+	}
+
+	protected function convertToMiliseconds(int $time, int $decimals = 2): string
+	{
+		return number_format($time * 1000, $decimals);
+	}
+
+	protected function getConsoleEntries(): array
+	{
+		return array_merge($this->getErrors(), $this->app->console->entries);
+	}
+
+	protected function getConsoleLabel(): string
+	{
+		$class = '';
+		$entries = $this->getConsoleEntries();
+		$entryCount = count($entries);
+		$errorCount = 0;
+		$label = __('Console', 'blackbar');
+		foreach ($entries as $entry) {
+			if (in_array($entry['code'], [E_NOTICE, E_STRICT, E_DEPRECATED])) {
+				$class = 'glbb-warning';
+			}
+			if (in_array($entry['code'], [E_WARNING])) {
+				++$errorCount;
+			}
+		}
+		if ($entryCount > 0) {
+			$label .= sprintf(' (%d)', $entryCount);
+		}
+		if ($errorCount > 0) {
+			$class = 'glbb-error';
+			$label .= sprintf(' (%d, %d!)', $entryCount, $errorCount);
+		}
+		return sprintf('<span class="%s">%s</span>', $class, $label);
+	}
+
+	protected function getErrors(): array
+	{
+		$errors = [];
+		foreach ($this->app->errors as $error) {
+			$class = 'glbb-info';
+			if (in_array($error['code'], [E_NOTICE, E_STRICT, E_DEPRECATED])) {
+				$class = 'glbb-warning';
+			}
+			if (E_WARNING == $error['code']) {
+				$class = 'glbb-error';
+			}
+			if ($error['count'] > 1) {
+				$error['name'] .= ' ('.$error['count'].')';
+			}
+			$errors[] = [
+				'code' => $error['code'],
+				'name' => '<span class="'.$class.'">'.$error['name'].'</span>',
+				'message' => sprintf(__('%s on line %s in file %s', 'blackbar'),
+					$error['message'],
+					$error['line'],
+					$error['file']
+				),
+			];
+		}
+		return $errors;
+	}
+
+	protected function getIncludedFiles(): array
+	{
+		$files = array_values(array_filter(get_included_files(), function ($file) {
+			$bool = false !== strpos($file, '/themes/')
+				&& false === strpos($file, '/functions.php');
+			return (bool) apply_filters('blackbar/templates/file', $bool, $file);
+		}));
+		return array_map(function ($key, $value) {
+			$value = str_replace(trailingslashit(WP_CONTENT_DIR), '', $value);
+			return sprintf('[%s] => %s', $key, $value);
+		}, array_keys($files), $files);
+	}
+
+	protected function getProfilerLabel(): string
+	{
+		$label = __('Profiler', 'blackbar');
+		$profilerTime = $this->convertToMiliseconds($this->app->profiler->getTotalTime(), 0);
+		if ($profilerTime > 0) {
+			$label .= sprintf(' (%s %s)', $profilerTime, __('ms', 'blackbar'));
+		}
+		return $label;
+	}
+
+	protected function getQueries(): array
+	{
+		global $wpdb;
+		$queries = [];
+		$search = [
+			'AND', 'FROM', 'GROUP BY', 'INNER JOIN', 'LEFT JOIN', 'LIMIT',
+			'ON DUPLICATE KEY UPDATE', 'ORDER BY', 'OFFSET', ' SET', 'WHERE',
+		];
+		$replace = array_map(function ($value) {
+			return PHP_EOL.$value;
+		}, $search);
+		foreach ($wpdb->queries as $query) {
+			$miliseconds = number_format(round($query[1] * 1000, 4), 4);
+			$sql = preg_replace('/\s\s+/', ' ', trim($query[0]));
+			$sql = str_replace(PHP_EOL, ' ', $sql);
+			$sql = str_replace($search, $replace, $sql);
+			$queries[] = [
+				'ms' => $miliseconds,
+				'sql' => $sql,
+			];
+		}
+		return $queries;
+	}
+
+	protected function getQueriesLabel(): string
+	{
+		$label = __('SQL', 'blackbar');
+		if (!SAVEQUERIES) {
+			return $label;
+		}
+		global $wpdb;
+		$queryTime = 0;
+		foreach ($wpdb->queries as $query) {
+			$queryTime += $query[1];
+		}
+		$queriesCount = sprintf('<span class="glbb-queries-count">%s</span>', count($wpdb->queries));
+		$queriesTime = sprintf('<span class="glbb-queries-time">%s</span>', $this->convertToMiliseconds($queryTime));
+		return $label.sprintf(' (%s %s | %s %s)', $queriesCount, __('queries', 'blackbar'), $queriesTime, __('ms', 'blackbar'));
+	}
+
+	protected function getSlowActionsLabel(): string
+	{
+		$label = __('Hooks', 'blackbar');
+		$totalTime = $this->convertToMiliseconds($this->app->actions->getTotalTime(), 0);
+		if ($totalTime > 0) {
+			$label .= sprintf(' (%s %s)', $totalTime, __('ms', 'blackbar'));
+		}
+		return $label;
+	}
+
+	protected function getTemplates(): string
+	{
+		if (is_admin()) {
+			return '';
+		}
+		if (class_exists('\GeminiLabs\Castor\Facades\Development')) {
+			ob_start();
+			\GeminiLabs\Castor\Facades\Development::printTemplatePaths();
+			return ob_get_clean();
+		}
+		return sprintf('<pre>%s</pre>', implode(PHP_EOL, $this->getIncludedFiles()));
+	}
 }

Braces +6 added lines, -3 removed lines

@@ -169,12 +169,14 @@ 
 
     protected function getIncludedFiles(): array
     {
-        $files = array_values(array_filter(get_included_files(), function ($file) {
+        $files = array_values(array_filter(get_included_files(), function ($file)
+        {
             $bool = false !== strpos($file, '/themes/')
                 && false === strpos($file, '/functions.php');
             return (bool) apply_filters('blackbar/templates/file', $bool, $file);
         }));
-        return array_map(function ($key, $value) {
+        return array_map(function ($key, $value)
+        {
             $value = str_replace(trailingslashit(WP_CONTENT_DIR), '', $value);
             return sprintf('[%s] => %s', $key, $value);
         }, array_keys($files), $files);
@@ -198,7 +200,8 @@ 
             'AND', 'FROM', 'GROUP BY', 'INNER JOIN', 'LEFT JOIN', 'LIMIT',
             'ON DUPLICATE KEY UPDATE', 'ORDER BY', 'OFFSET', ' SET', 'WHERE',
         ];
-        $replace = array_map(function ($value) {
+        $replace = array_map(function ($value)
+        {
             return PHP_EOL.$value;
         }, $search);
         foreach ($wpdb->queries as $query) {