pryley / blackbar

activate.php

Spacing +30 added lines, -30 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-defined( 'WPINC' ) || die;
+defined('WPINC') || die;
 
 class GL_BlackBar_Activate
 {
@@ -26,7 +26,7 @@ 
 	 */
 	public static function isPhpValid()
 	{
-		return !version_compare( PHP_VERSION, static::MIN_PHP_VERSION, '<' );
+		return !version_compare(PHP_VERSION, static::MIN_PHP_VERSION, '<');
 	}
 
 	/**
@@ -35,7 +35,7 @@ 
 	public static function isWpValid()
 	{
 		global $wp_version;
-		return !version_compare( $wp_version, static::MIN_WORDPRESS_VERSION, '<' );
+		return !version_compare($wp_version, static::MIN_WORDPRESS_VERSION, '<');
 	}
 
 	/**
@@ -43,12 +43,12 @@ 
 	 */
 	public static function shouldDeactivate()
 	{
-		if( empty( static::$instance )) {
+		if (empty(static::$instance)) {
 			static::$instance = new static;
 		}
-		if( !static::isValid() ) {
-			add_action( 'activated_plugin', array( static::$instance, 'deactivate' ));
-			add_action( 'admin_notices', array( static::$instance, 'deactivate' ));
+		if (!static::isValid()) {
+			add_action('activated_plugin', array(static::$instance, 'deactivate'));
+			add_action('admin_notices', array(static::$instance, 'deactivate'));
 			return true;
 		}
 		return false;
@@ -57,14 +57,14 @@ 
 	/**
 	 * @return void
 	 */
-	public function deactivate( $plugin )
+	public function deactivate($plugin)
 	{
-		if( static::isValid() )return;
-		$pluginName = plugin_basename( dirname( realpath( __FILE__ )).'/'.static::BASENAME );
-		if( $plugin == $pluginName ) {
+		if (static::isValid())return;
+		$pluginName = plugin_basename(dirname(realpath(__FILE__)).'/'.static::BASENAME);
+		if ($plugin == $pluginName) {
 			$this->redirect(); //exit
 		}
-		deactivate_plugins( $pluginName );
+		deactivate_plugins($pluginName);
 		$this->printNotice();
 	}
 
@@ -73,10 +73,10 @@ 
 	 */
 	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' )
+		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;
 	}
@@ -88,25 +88,25 @@ 
 	{
 		$noticeTemplate = '<div id="message" class="notice notice-error error is-dismissible"><p><strong>%s</strong></p><p>%s</p><p>%s</p></div>';
 		$messages = array(
-			__( 'The Black Bar plugin was deactivated.', 'blackbar' ),
-			__( 'Sorry, this plugin requires %s or greater in order to work properly.', 'blackbar' ),
-			__( '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.', 'blackbar' ),
-			__( 'PHP version', 'blackbar' ).' '.static::MIN_PHP_VERSION,
-			__( 'WordPress version', 'blackbar' ).' '.static::MIN_WORDPRESS_VERSION,
-			__( 'Update WordPress', 'blackbar' ),
+			__('The Black Bar plugin was deactivated.', 'blackbar'),
+			__('Sorry, this plugin requires %s or greater in order to work properly.', 'blackbar'),
+			__('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.', 'blackbar'),
+			__('PHP version', 'blackbar').' '.static::MIN_PHP_VERSION,
+			__('WordPress version', 'blackbar').' '.static::MIN_WORDPRESS_VERSION,
+			__('Update WordPress', 'blackbar'),
 		);
-		if( !static::isPhpValid() ) {
-			printf( $noticeTemplate,
+		if (!static::isPhpValid()) {
+			printf($noticeTemplate,
 				$messages[0],
-				sprintf( $messages[1], $messages[3] ),
-				sprintf( $messages[2], PHP_VERSION )
+				sprintf($messages[1], $messages[3]),
+				sprintf($messages[2], PHP_VERSION)
 			);
 		}
-		else if( !static::isWpValid() ) {
-			printf( $noticeTemplate,
+		else if (!static::isWpValid()) {
+			printf($noticeTemplate,
 				$messages[0],
-				sprintf( $messages[1], $messages[4] ),
-				sprintf( '<a href="%s">%s</a>', admin_url( 'update-core.php' ), $messages[5] )
+				sprintf($messages[1], $messages[4]),
+				sprintf('<a href="%s">%s</a>', admin_url('update-core.php'), $messages[5])
 			);
 		}
 	}

src/Application.php

Spacing +61 added lines, -61 removed lines

@@ -16,7 +16,7 @@ 
 
 	public function __construct()
 	{
-		$this->file = realpath( dirname( __DIR__ ).'/'.static::ID.'.php' );
+		$this->file = realpath(dirname(__DIR__).'/'.static::ID.'.php');
 		$this->profiler = new Profiler;
 	}
 
@@ -27,9 +27,9 @@ 
 	 */
 	public function enqueueAssets()
 	{
-		wp_enqueue_script( static::ID, $this->url( 'assets/main.js' ));
-		wp_enqueue_style( static::ID, $this->url( 'assets/main.css' ), array( 'dashicons' ));
-		wp_enqueue_style( static::ID.'-syntax', $this->url( 'assets/syntax.css' ));
+		wp_enqueue_script(static::ID, $this->url('assets/main.js'));
+		wp_enqueue_style(static::ID, $this->url('assets/main.css'), array('dashicons'));
+		wp_enqueue_style(static::ID.'-syntax', $this->url('assets/syntax.css'));
 	}
 
 	/**
@@ -39,7 +39,7 @@ 
 	 * @param int $errline
 	 * @return void
 	 */
-	public function errorHandler( $errno, $errstr, $errfile, $errline )
+	public function errorHandler($errno, $errstr, $errfile, $errline)
 	{
 		$errorCodes = array(
 			2 => 'Warning',
@@ -47,11 +47,11 @@ 
 			2048 => 'Strict',
 			8192 => 'Deprecated',
 		);
-		$errname = array_key_exists( $errno, $errorCodes )
+		$errname = array_key_exists($errno, $errorCodes)
 			? $errorCodes[$errno]
 			: 'Unknown';
-		$hash = md5( $errno.$errstr.$errfile.$errline );
-		if( array_key_exists( $hash, $this->errors )) {
+		$hash = md5($errno.$errstr.$errfile.$errline);
+		if (array_key_exists($hash, $this->errors)) {
 			$this->errors[$hash]['count']++;
 		}
 		else {
@@ -70,15 +70,15 @@ 
 	 * @param string $classes
 	 * @return string
 	 */
-	public function filterBodyClasses( $classes )
+	public function filterBodyClasses($classes)
 	{
-		return trim( $classes.' '.static::ID );
+		return trim($classes.' '.static::ID);
 	}
 
 	/**
 	 * @return array
 	 */
-	public function filterNoconflictScripts( $scripts )
+	public function filterNoconflictScripts($scripts)
 	{
 		$scripts[] = static::ID;
 		return $scripts;
@@ -87,7 +87,7 @@ 
 	/**
 	 * @return array
 	 */
-	public function filterNoconflictStyles( $styles )
+	public function filterNoconflictStyles($styles)
 	{
 		$styles[] = static::ID;
 		$styles[] = static::ID.'-syntax';
@@ -99,18 +99,18 @@ 
 	 */
 	public function init()
 	{
-		add_action( 'admin_enqueue_scripts',    array( $this, 'enqueueAssets' ));
-		add_action( 'admin_footer',             array( $this, 'renderBar' ));
-		add_action( 'plugins_loaded',           array( $this, 'registerLanguages' ));
-		add_action( 'wp_enqueue_scripts',       array( $this, 'enqueueAssets' ));
-		add_action( 'wp_footer',                array( $this, 'renderBar' ));
-		add_filter( 'admin_body_class',         array( $this, 'filterBodyClasses' ));
-		add_filter( 'all',                      array( $this, 'initProfiler' ));
-		add_filter( 'gform_noconflict_scripts', array( $this, 'filterNoconflictScripts' ) );
-		add_filter( 'gform_noconflict_styles',  array( $this, 'filterNoconflictStyles' ) );
-		apply_filters( 'debug', 'Profiler Started' );
-		apply_filters( 'debug', 'blackbar/profiler/noise' );
-		set_error_handler( array( $this, 'errorHandler' ), E_ALL|E_STRICT );
+		add_action('admin_enqueue_scripts', array($this, 'enqueueAssets'));
+		add_action('admin_footer', array($this, 'renderBar'));
+		add_action('plugins_loaded', array($this, 'registerLanguages'));
+		add_action('wp_enqueue_scripts', array($this, 'enqueueAssets'));
+		add_action('wp_footer', array($this, 'renderBar'));
+		add_filter('admin_body_class', array($this, 'filterBodyClasses'));
+		add_filter('all', array($this, 'initProfiler'));
+		add_filter('gform_noconflict_scripts', array($this, 'filterNoconflictScripts'));
+		add_filter('gform_noconflict_styles', array($this, 'filterNoconflictStyles'));
+		apply_filters('debug', 'Profiler Started');
+		apply_filters('debug', 'blackbar/profiler/noise');
+		set_error_handler(array($this, 'errorHandler'), E_ALL|E_STRICT);
 	}
 
 	/**
@@ -119,8 +119,8 @@ 
 	 */
 	public function initProfiler()
 	{
-		if( func_get_arg(0) != static::DEBUG )return;
-		$this->profiler->trace( func_get_arg(1) );
+		if (func_get_arg(0) != static::DEBUG)return;
+		$this->profiler->trace(func_get_arg(1));
 	}
 
 	/**
@@ -128,7 +128,7 @@ 
 	 */
 	public function registerLanguages()
 	{
-		load_plugin_textdomain( static::ID, false, plugin_basename( $this->path() ).static::LANG );
+		load_plugin_textdomain(static::ID, false, plugin_basename($this->path()).static::LANG);
 	}
 
 	/**
@@ -137,11 +137,11 @@ 
 	 * @param string $view
 	 * @return void
 	 */
-	public function render( $view, array $data = array() )
+	public function render($view, array $data = array())
 	{
-		$file = $this->path( sprintf( 'views/%s.php', str_replace( '.php', '', $view )));
-		if( !file_exists( $file ))return;
-		extract( $data );
+		$file = $this->path(sprintf('views/%s.php', str_replace('.php', '', $view)));
+		if (!file_exists($file))return;
+		extract($data);
 		include $file;
 	}
 
@@ -152,8 +152,8 @@ 
 	 */
 	public function renderBar()
 	{
-		apply_filters( 'debug', 'Profiler Stopped' );
-		$this->render( 'debug-bar', array(
+		apply_filters('debug', 'Profiler Stopped');
+		$this->render('debug-bar', array(
 			'blackbar' => $this,
 			'errors' => $this->getErrors(),
 			'errorsLabel' => $this->getErrorsLabel(),
@@ -167,9 +167,9 @@ 
 	/**
 	 * @return string
 	 */
-	protected function convertToMiliseconds( $time, $decimals = 2 )
+	protected function convertToMiliseconds($time, $decimals = 2)
 	{
-		return number_format( $time * 1000, $decimals );
+		return number_format($time * 1000, $decimals);
 	}
 
 	/**
@@ -178,16 +178,16 @@ 
 	protected function getErrors()
 	{
 		$errors = array();
-		foreach( $this->errors as $error ) {
-			if( $error['errno'] == E_WARNING ) {
+		foreach ($this->errors as $error) {
+			if ($error['errno'] == E_WARNING) {
 				$error['name'] = '<span class="glbb-error">'.$error['name'].'</span>';
 			}
-			if( $error['count'] > 1 ) {
+			if ($error['count'] > 1) {
 				$error['name'] .= ' ('.$error['count'].')';
 			}
 			$errors[] = array(
 				'name' => $error['name'],
-				'message' => sprintf( __( '%s on line %s in file %s', 'blackbar' ),
+				'message' => sprintf(__('%s on line %s in file %s', 'blackbar'),
 					$error['message'],
 					$error['line'],
 					$error['file']
@@ -203,14 +203,14 @@ 
 	protected function getErrorsLabel()
 	{
 		$warningCount = 0;
-		foreach( $this->errors as $error ) {
-			if( $error['errno'] == E_WARNING ) {
+		foreach ($this->errors as $error) {
+			if ($error['errno'] == E_WARNING) {
 				$warningCount++;
 			}
 		}
-		$errorCount = count( $this->errors );
-		$warnings = $warningCount > 0 ? sprintf( ', %d!', $warningCount ) : '';
-		return sprintf( __( 'Errors (%d%s)', 'blackbar' ), $errorCount, $warnings );
+		$errorCount = count($this->errors);
+		$warnings = $warningCount > 0 ? sprintf(', %d!', $warningCount) : '';
+		return sprintf(__('Errors (%d%s)', 'blackbar'), $errorCount, $warnings);
 	}
 
 	/**
@@ -218,8 +218,8 @@ 
 	 */
 	protected function getProfilerLabel()
 	{
-		$profilerTime = $this->convertToMiliseconds( $this->profiler->getTotalTime(), 0 );
-		return sprintf( __( 'Profiler (%s ms)', 'blackbar' ), $profilerTime );
+		$profilerTime = $this->convertToMiliseconds($this->profiler->getTotalTime(), 0);
+		return sprintf(__('Profiler (%s ms)', 'blackbar'), $profilerTime);
 	}
 
 	/**
@@ -240,14 +240,14 @@ 
 			'SET',
 			'WHERE',
 		);
-		$replace = array_map( function( $value ) {
+		$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 );
+		}, $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[] = array(
 				'ms' => $miliseconds,
 				'sql' => $sql,
@@ -263,29 +263,29 @@ 
 	{
 		global $wpdb;
 		$queryTime = 0;
-		foreach( $wpdb->queries as $query ) {
+		foreach ($wpdb->queries as $query) {
 			$queryTime += $query[1];
 		}
-		$queriesCount = '<span class="glbb-queries-count">'.count( $wpdb->queries ).'</span>';
-		$queriesTime = '<span class="glbb-queries-time">'.$this->convertToMiliseconds( $queryTime ).'</span>';
-		return sprintf( __( 'SQL (%s queries in %s ms)', 'blackbar' ), $queriesCount, $queriesTime );
+		$queriesCount = '<span class="glbb-queries-count">'.count($wpdb->queries).'</span>';
+		$queriesTime = '<span class="glbb-queries-time">'.$this->convertToMiliseconds($queryTime).'</span>';
+		return sprintf(__('SQL (%s queries in %s ms)', 'blackbar'), $queriesCount, $queriesTime);
 	}
 
 	/**
 	 * @param string $file
 	 * @return string
 	 */
-	protected function path( $file = '' )
+	protected function path($file = '')
 	{
-		return plugin_dir_path( $this->file ).ltrim( trim( $file ), '/' );
+		return plugin_dir_path($this->file).ltrim(trim($file), '/');
 	}
 
 	/**
 	 * @param string $path
 	 * @return string
 	 */
-	protected function url( $path = '' )
+	protected function url($path = '')
 	{
-		return esc_url( plugin_dir_url( $this->file ) . ltrim( trim( $path ), '/' ));
+		return esc_url(plugin_dir_url($this->file).ltrim(trim($path), '/'));
 	}
 }

src/Profiler.php

Spacing +18 added lines, -18 removed lines

@@ -37,19 +37,19 @@ 
 	 * @param array $timer
 	 * @return string
 	 */
-	public function getMemoryString( $timer )
+	public function getMemoryString($timer)
 	{
-		$timer = $this->normalize( $timer );
-		return sprintf( '%s %s', round( $timer['memory'] / 1000 ), __( 'kB', 'blackbar' ));
+		$timer = $this->normalize($timer);
+		return sprintf('%s %s', round($timer['memory'] / 1000), __('kB', 'blackbar'));
 	}
 
 	/**
 	 * @param array $timer
 	 * @return string
 	 */
-	public function getNameString( $timer )
+	public function getNameString($timer)
 	{
-		$timer = $this->normalize( $timer );
+		$timer = $this->normalize($timer);
 		return $timer['name'];
 	}
 
@@ -57,13 +57,13 @@ 
 	 * @param array $timer
 	 * @return string
 	 */
-	public function getTimeString( $timer )
+	public function getTimeString($timer)
 	{
-		$timer = $this->normalize( $timer );
-		$index = array_search( $timer['name'], array_column( $this->timers, 'name' ));
-		$start = $this->start + ( $index * $this->noise );
-		$time = number_format( round(( $timer['time'] - $start ) * 1000, 4 ), 4 );
-		return sprintf( '%s %s', $time, __( 'ms', 'blackbar' ));
+		$timer = $this->normalize($timer);
+		$index = array_search($timer['name'], array_column($this->timers, 'name'));
+		$start = $this->start + ($index * $this->noise);
+		$time = number_format(round(($timer['time'] - $start) * 1000, 4), 4);
+		return sprintf('%s %s', $time, __('ms', 'blackbar'));
 	}
 
 	/**
@@ -71,20 +71,20 @@ 
 	 */
 	public function getTotalTime()
 	{
-		$totalNoise = ( count( $this->timers ) - 1 ) * $this->noise;
+		$totalNoise = (count($this->timers) - 1) * $this->noise;
 		return $this->stop - $this->start - $totalNoise;
 	}
 
 	/**
 	 * @param string $name
 	 */
-	public function trace( $name )
+	public function trace($name)
 	{
-		$microtime = microtime( true );
-		if( !$this->start ) {
+		$microtime = microtime(true);
+		if (!$this->start) {
 			$this->start = $microtime;
 		}
-		if( $name === 'blackbar/profiler/noise' ) {
+		if ($name === 'blackbar/profiler/noise') {
 			$this->noise = $microtime - $this->start;
 			return;
 		}
@@ -99,9 +99,9 @@ 
 	/**
 	 * @return array
 	 */
-	protected function normalize( $timer )
+	protected function normalize($timer)
 	{
-		return wp_parse_args( (array) $timer, array(
+		return wp_parse_args((array) $timer, array(
 			'name' => '',
 			'time' => 0,
 			'memory' => 0,