pryley / blackbar

src/Application.php

Braces +7 added lines, -4 removed lines

@@ -53,8 +53,7 @@ 
 		$hash = md5( $errno.$errstr.$errfile.$errline );
 		if( array_key_exists( $hash, $this->errors )) {
 			$this->errors[$hash]['count']++;
-		}
-		else {
+		} else {
 			$this->errors[$hash] = array(
 				"errno" => $errno,
 				"message" => $errstr,
@@ -119,7 +118,9 @@ 
 	 */
 	public function initProfiler()
 	{
-		if( func_get_arg(0) != static::DEBUG )return;
+		if( func_get_arg(0) != static::DEBUG ) {
+			return;
+		}
 		$this->profiler->trace( func_get_arg(1) );
 	}
 
@@ -140,7 +141,9 @@ 
 	public function render( $view, array $data = array() )
 	{
 		$file = $this->path( sprintf( 'views/%s.php', str_replace( '.php', '', $view )));
-		if( !file_exists( $file ))return;
+		if( !file_exists( $file )) {
+			return;
+		}
 		extract( $data );
 		include $file;
 	}

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 (%s)', 'blackbar' ), $errorCount.$warnings );
+		$errorCount = count($this->errors);
+		$warnings = $warningCount > 0 ? sprintf(', %d!', $warningCount) : '';
+		return sprintf(__('Errors (%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), '/'));
 	}
 }

views/panels/templates.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
-<?php defined( 'WPINC' ) || die;
+<?php defined('WPINC') || die;
 
 Development::printTemplatePaths();

views/panels/globals.php

Spacing +6 added lines, -6 removed lines

@@ -1,7 +1,7 @@
-<?php defined( 'WPINC' ) || die; ?>
+<?php defined('WPINC') || die; ?>
 
-<pre><code class="php">$_GET = <?= esc_html( var_export( $_GET, true )); ?>;</code></pre><br/>
-<pre><code class="php">$_POST = <?= esc_html( var_export( $_POST, true )); ?>;</code></pre><br/>
-<pre><code class="php">$_COOKIE = <?= esc_html( var_export( $_COOKIE, true )); ?>;</code></pre><br/>
-<pre><code class="php">$_SESSION = <?= esc_html( var_export( $_SESSION, true )); ?>;</code></pre><br/>
-<pre><code class="php">$_SERVER = <?= esc_html( var_export( $_SERVER, true )); ?>;</code></pre><br/>
+<pre><code class="php">$_GET = <?= esc_html(var_export($_GET, true)); ?>;</code></pre><br/>
+<pre><code class="php">$_POST = <?= esc_html(var_export($_POST, true)); ?>;</code></pre><br/>
+<pre><code class="php">$_COOKIE = <?= esc_html(var_export($_COOKIE, true)); ?>;</code></pre><br/>
+<pre><code class="php">$_SESSION = <?= esc_html(var_export($_SESSION, true)); ?>;</code></pre><br/>
+<pre><code class="php">$_SERVER = <?= esc_html(var_export($_SERVER, true)); ?>;</code></pre><br/>

views/panels/profiler.php

Spacing +5 added lines, -5 removed lines

@@ -1,12 +1,12 @@
-<?php defined( 'WPINC' ) || die; ?>
+<?php defined('WPINC') || die; ?>
 
 <table>
 	<tbody>
-	<?php foreach( $profiler->getMeasure() as $timer ) : ?>
+	<?php foreach ($profiler->getMeasure() as $timer) : ?>
 		<tr>
-			<td><?= $profiler->getNameString( $timer ); ?></td>
-			<td class="glbb-number"><?= $profiler->getTimeString( $timer ); ?></td>
-			<td><?= $profiler->getMemoryString( $timer ); ?></td>
+			<td><?= $profiler->getNameString($timer); ?></td>
+			<td class="glbb-number"><?= $profiler->getTimeString($timer); ?></td>
+			<td><?= $profiler->getMemoryString($timer); ?></td>
 		</tr>
 	<?php endforeach; ?>
 	</tbody>

views/debug-bar.php

Spacing +13 added lines, -13 removed lines

@@ -1,32 +1,32 @@
-<?php defined( 'WPINC' ) || die;
-$isCastorTheme = class_exists( '\GeminiLabs\Castor\Application' );
+<?php defined('WPINC') || die;
+$isCastorTheme = class_exists('\GeminiLabs\Castor\Application');
 ?>
 
 <div id="glbb-debug-bar">
-	<a href="#" class="glbb-toggle glbb-off"><?= __( 'Toggle', 'blackbar' ); ?></a>
-	<a href="javascript:Blackbar.switchPanel('glbb-globals')" class="glbb-globals"><?= __( 'Globals', 'blackbar' ); ?></a>
+	<a href="#" class="glbb-toggle glbb-off"><?= __('Toggle', 'blackbar'); ?></a>
+	<a href="javascript:Blackbar.switchPanel('glbb-globals')" class="glbb-globals"><?= __('Globals', 'blackbar'); ?></a>
 	<a href="javascript:Blackbar.switchPanel('glbb-profiler')" class="glbb-profiler"><?= $profilerLabel; ?></a>
 	<a href="javascript:Blackbar.switchPanel('glbb-queries')" class="glbb-queries"><?= $queriesLabel; ?></a>
-	<?php if( $isCastorTheme ) : ?>
-	<a href="javascript:Blackbar.switchPanel('glbb-templates')" class="glbb-templates"><?= __( 'Templates', 'blackbar' ); ?></a>
+	<?php if ($isCastorTheme) : ?>
+	<a href="javascript:Blackbar.switchPanel('glbb-templates')" class="glbb-templates"><?= __('Templates', 'blackbar'); ?></a>
 	<?php endif; ?>
 	<a href="javascript:Blackbar.switchPanel('glbb-errors')" class="glbb-errors"><?= $errorsLabel; ?></a>
-	<a href="javascript:Blackbar.close()" class="glbb-close"><?= __( 'Close', 'blackbar' ); ?></a>
+	<a href="javascript:Blackbar.close()" class="glbb-close"><?= __('Close', 'blackbar'); ?></a>
 	<div id="glbb-globals" class="glbb-debug-panel">
-		<?php $blackbar->render( 'panels/globals' ); ?>
+		<?php $blackbar->render('panels/globals'); ?>
 	</div>
 	<div id="glbb-profiler" class="glbb-debug-panel">
-		<?php $blackbar->render( 'panels/profiler', array( 'profiler' => $profiler )); ?>
+		<?php $blackbar->render('panels/profiler', array('profiler' => $profiler)); ?>
 	</div>
 	<div id="glbb-queries" class="glbb-debug-panel">
-		<?php $blackbar->render( 'panels/queries', array( 'queries' => $queries )); ?>
+		<?php $blackbar->render('panels/queries', array('queries' => $queries)); ?>
 	</div>
-	<?php if( $isCastorTheme ) : ?>
+	<?php if ($isCastorTheme) : ?>
 	<div id="glbb-templates" class="glbb-debug-panel">
-		<?php $blackbar->render( 'panels/templates' ); ?>
+		<?php $blackbar->render('panels/templates'); ?>
 	</div>
 	<?php endif; ?>
 	<div id="glbb-errors" class="glbb-debug-panel">
-		<?php $blackbar->render( 'panels/errors', array( 'errors' => $errors )); ?>
+		<?php $blackbar->render('panels/errors', array('errors' => $errors)); ?>
 	</div>
 </div>

autoload.php

Braces +6 added lines, -2 removed lines

@@ -13,9 +13,13 @@
 	];
 	foreach( $namespaces as $prefix => $base_dir ) {
 		$len = strlen( $prefix );
-		if( strncmp( $prefix, $class, $len ) !== 0 )continue;
+		if( strncmp( $prefix, $class, $len ) !== 0 ) {
+			continue;
+		}
 		$file = $base_dir . str_replace( '\\', '/', substr( $class, $len )).'.php';
-		if( !file_exists( $file ))continue;
+		if( !file_exists( $file )) {
+			continue;
+		}
 		require $file;
 		break;
 	}

Spacing +7 added lines, -7 removed lines

@@ -1,21 +1,21 @@
 <?php
 
-defined( 'WPINC' ) || die;
+defined('WPINC') || die;
 
 /**
  * PSR-4 autoloader
  */
-spl_autoload_register( function( $class )
+spl_autoload_register(function($class)
 {
 	$namespaces = [
 		'GeminiLabs\\BlackBar\\' => __DIR__.'/src/',
 		'GeminiLabs\\BlackBar\\Tests\\' => __DIR__.'/tests/',
 	];
-	foreach( $namespaces as $prefix => $base_dir ) {
-		$len = strlen( $prefix );
-		if( strncmp( $prefix, $class, $len ) !== 0 )continue;
-		$file = $base_dir . str_replace( '\\', '/', substr( $class, $len )).'.php';
-		if( !file_exists( $file ))continue;
+	foreach ($namespaces as $prefix => $base_dir) {
+		$len = strlen($prefix);
+		if (strncmp($prefix, $class, $len) !== 0)continue;
+		$file = $base_dir.str_replace('\\', '/', substr($class, $len)).'.php';
+		if (!file_exists($file))continue;
 		require $file;
 		break;
 	}

views/panels/queries.php

Spacing +4 added lines, -4 removed lines

@@ -1,12 +1,12 @@
-<?php defined( 'WPINC' ) || die; ?>
+<?php defined('WPINC') || die; ?>
 
 <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_min_time" id="glbb_query_min_time" placeholder="<?= __( 'Minimum Execution Time', '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">
 	<tbody>
-		<?php foreach( $queries as $query ) : ?>
+		<?php foreach ($queries as $query) : ?>
 		<tr>
 			<td class="glbb-number"><?= $query['ms']; ?></td>
 			<td><pre><code class="sql"><?= $query['sql']; ?></code></pre></td>

views/panels/errors.php

Spacing +4 added lines, -4 removed lines

@@ -1,13 +1,13 @@
-<?php defined( 'WPINC' ) || die; ?>
+<?php defined('WPINC') || die; ?>
 
 <table>
 	<tbody>
-		<?php if( empty( $errors )) : ?>
+		<?php if (empty($errors)) : ?>
 		<tr>
-			<td><?= __( 'No errors found.', 'blackbar' ); ?></td>
+			<td><?= __('No errors found.', 'blackbar'); ?></td>
 		</tr>
 		<?php else : ?>
-		<?php foreach( $errors as $error ) : ?>
+		<?php foreach ($errors as $error) : ?>
 		<tr>
 			<td><?= $error['name']; ?></td>
 			<td><?= $error['message']; ?></td>

Braces +5 added lines, -2 removed lines

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

activate.php

Spacing +47 added lines, -47 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-defined( 'WPINC' ) || die;
+defined('WPINC') || die;
 
 /**
  * Checks for minimum system requirments on plugin activation
@@ -29,46 +29,46 @@ 
 	/**
 	 * @return bool
 	 */
-	public static function isValid( array $args = array() )
+	public static function isValid(array $args = array())
 	{
-		$versions = static::normalize( $args );
-		return static::isPhpValid( $versions->php ) && static::isWpValid( $versions->wordpress );
+		$versions = static::normalize($args);
+		return static::isPhpValid($versions->php) && static::isWpValid($versions->wordpress);
 	}
 
 	/**
 	 * @param string $version
 	 * @return bool
 	 */
-	public static function isPhpValid( $version = '' )
+	public static function isPhpValid($version = '')
 	{
-		$versions = static::normalize( array( 'php' => $version ));
-		return !version_compare( PHP_VERSION, $versions->php, '<' );
+		$versions = static::normalize(array('php' => $version));
+		return !version_compare(PHP_VERSION, $versions->php, '<');
 	}
 
 	/**
 	 * @param string $version
 	 * @return bool
 	 */
-	public static function isWpValid( $version = '' )
+	public static function isWpValid($version = '')
 	{
 		global $wp_version;
-		$versions = static::normalize( array( 'wordpress' => $version ));
-		return !version_compare( $wp_version, $versions->wordpress, '<' );
+		$versions = static::normalize(array('wordpress' => $version));
+		return !version_compare($wp_version, $versions->wordpress, '<');
 	}
 
 	/**
 	 * @return bool
 	 */
-	public static function shouldDeactivate( $file, array $args = [] )
+	public static function shouldDeactivate($file, array $args = [])
 	{
-		if( empty( static::$instance )) {
-			static::$file = realpath( $file );
+		if (empty(static::$instance)) {
+			static::$file = realpath($file);
 			static::$instance = new static;
-			static::$versions = static::normalize( $args );
+			static::$versions = static::normalize($args);
 		}
-		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;
@@ -77,24 +77,24 @@ 
 	/**
 	 * @return void
 	 */
-	public function deactivate( $plugin )
+	public function deactivate($plugin)
 	{
-		if( static::isValid() )return;
-		$pluginSlug = plugin_basename( static::$file );
-		if( $plugin == $pluginSlug ) {
+		if (static::isValid())return;
+		$pluginSlug = plugin_basename(static::$file);
+		if ($plugin == $pluginSlug) {
 			$this->redirect(); //exit
 		}
-		$pluginData = get_file_data( static::$file, array( 'name' => 'Plugin Name' ), 'plugin' );
-		deactivate_plugins( $pluginSlug );
-		$this->printNotice( $pluginData['name'] );
+		$pluginData = get_file_data(static::$file, array('name' => 'Plugin Name'), 'plugin');
+		deactivate_plugins($pluginSlug);
+		$this->printNotice($pluginData['name']);
 	}
 
 	/**
 	 * @return object
 	 */
-	protected static function normalize( array $args = [] )
+	protected static function normalize(array $args = [])
 	{
-		return (object) wp_parse_args( $args, array(
+		return (object) wp_parse_args($args, array(
 			'php' => static::MIN_PHP_VERSION,
 			'wordpress' => static::MIN_WORDPRESS_VERSION,
 		));
@@ -105,10 +105,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;
 	}
@@ -117,29 +117,29 @@ 
 	 * @param string $pluginName
 	 * @return void
 	 */
-	protected function printNotice( $pluginName )
+	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 = array(
-			__( 'The %s 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' ),
-			__( 'WordPress version', 'blackbar' ),
-			__( 'Update WordPress', 'blackbar' ),
+			__('The %s 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'),
+			__('WordPress version', 'blackbar'),
+			__('Update WordPress', 'blackbar'),
 		);
-		if( !static::isPhpValid() ) {
-			printf( $noticeTemplate,
-				sprintf( $messages[0], $pluginName ),
-				sprintf( $messages[1], $messages[3].' '.static::$versions->php ),
-				sprintf( $messages[2], PHP_VERSION )
+		if (!static::isPhpValid()) {
+			printf($noticeTemplate,
+				sprintf($messages[0], $pluginName),
+				sprintf($messages[1], $messages[3].' '.static::$versions->php),
+				sprintf($messages[2], PHP_VERSION)
 			);
 		}
-		else if( !static::isWpValid() ) {
-			printf( $noticeTemplate,
-				sprintf( $messages[0], $pluginName ),
-				sprintf( $messages[1], $messages[4].' '.static::$versions->wordpress ),
-				sprintf( '<a href="%s">%s</a>', admin_url( 'update-core.php' ), $messages[5] )
+		else if (!static::isWpValid()) {
+			printf($noticeTemplate,
+				sprintf($messages[0], $pluginName),
+				sprintf($messages[1], $messages[4].' '.static::$versions->wordpress),
+				sprintf('<a href="%s">%s</a>', admin_url('update-core.php'), $messages[5])
 			);
 		}
 	}

Braces +4 added lines, -3 removed lines

@@ -79,7 +79,9 @@ 
 	 */
 	public function deactivate( $plugin )
 	{
-		if( static::isValid() )return;
+		if( static::isValid() ) {
+			return;
+		}
 		$pluginSlug = plugin_basename( static::$file );
 		if( $plugin == $pluginSlug ) {
 			$this->redirect(); //exit
@@ -134,8 +136,7 @@ 
 				sprintf( $messages[1], $messages[3].' '.static::$versions->php ),
 				sprintf( $messages[2], PHP_VERSION )
 			);
-		}
-		else if( !static::isWpValid() ) {
+		} else if( !static::isWpValid() ) {
 			printf( $noticeTemplate,
 				sprintf( $messages[0], $pluginName ),
 				sprintf( $messages[1], $messages[4].' '.static::$versions->wordpress ),