pryley / blackbar

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;
 });

Spacing +6 added lines, -6 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 
-defined('WPINC') || die;
+defined( 'WPINC' ) || die;
 
 /*
  * @return array
  * @see https://docs.gravityforms.com/gform_noconflict_scripts/
  */
-add_filter('gform_noconflict_scripts', function (array $scripts) {
-    $scripts[] = 'blackbar';
+add_filter( 'gform_noconflict_scripts', function( array $scripts ) {
+    $scripts[ ] = 'blackbar';
     return $scripts;
 });
 
@@ -15,8 +15,8 @@ 
  * @return array
  * @see https://docs.gravityforms.com/gform_noconflict_styles/
  */
-add_filter('gform_noconflict_styles', function (array $styles) {
-    $styles[] = 'blackbar';
-    $styles[] = 'blackbar-syntax';
+add_filter( 'gform_noconflict_styles', function( array $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;
+	}
 });

Spacing +9 added lines, -9 removed lines

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

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/',

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;
+	}
 }

Spacing +43 added lines, -43 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-defined('ABSPATH') || exit;
+defined( 'ABSPATH' ) || exit;
 
 /**
  * Check for minimum system requirements on plugin activation.
@@ -24,17 +24,17 @@ 
     /**
      * @param string $file
      */
-    public function __construct($file)
+    public function __construct( $file )
     {
-        $this->file = realpath($file);
-        $versionRequirements = get_file_data($this->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), [
+        ] );
+        $this->versions = wp_parse_args( array_filter( $versionRequirements ), [
             'php' => static::MIN_PHP_VERSION,
             'wordpress' => static::MIN_WORDPRESS_VERSION,
-        ]);
+        ] );
     }
 
     /**
@@ -42,11 +42,11 @@ 
      */
     public function canProceed()
     {
-        if ($this->isValid()) {
+        if( $this->isValid() ) {
             return true;
         }
-        add_action('activated_plugin', [$this, 'deactivate']);
-        add_action('admin_notices', [$this, 'deactivate']);
+        add_action( 'activated_plugin', [ $this, 'deactivate' ] );
+        add_action( 'admin_notices', [ $this, 'deactivate' ] );
         return false;
     }
 
@@ -55,7 +55,7 @@ 
      */
     public function isPhpValid()
     {
-        return version_compare(PHP_VERSION, $this->versions['php'], '>=');
+        return version_compare( PHP_VERSION, $this->versions[ 'php' ], '>=' );
     }
 
     /**
@@ -72,25 +72,25 @@ 
     public function isWpValid()
     {
         global $wp_version;
-        return version_compare($wp_version, $this->versions['wordpress'], '>=');
+        return version_compare( $wp_version, $this->versions[ 'wordpress' ], '>=' );
     }
 
     /**
      * @param string $plugin
      * @return void
      */
-    public function deactivate($plugin)
+    public function deactivate( $plugin )
     {
-        if ($this->isValid()) {
+        if( $this->isValid() ) {
             return;
         }
-        $pluginSlug = plugin_basename($this->file);
-        if ($plugin == $pluginSlug) {
+        $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']);
+        $pluginData = get_file_data( $this->file, [ 'name' => 'Plugin Name' ], 'plugin' );
+        deactivate_plugins( $pluginSlug );
+        $this->printNotice( $pluginData[ 'name' ] );
     }
 
     /**
@@ -99,13 +99,13 @@ 
     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'),
+            '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' ),
         ];
     }
 
@@ -113,22 +113,22 @@ 
      * @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 = $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
+        $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'])
+        } 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' ] )
             );
         }
     }
@@ -138,11 +138,11 @@ 
      */
     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;
     }
 }

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']),

blackbar.php

Indentation +7 added lines, -7 removed lines

@@ -20,13 +20,13 @@
 defined('ABSPATH') || exit;
 
 if (!class_exists('GL_Plugin_Check_v6')) {
-    require_once __DIR__.'/activate.php';
+	require_once __DIR__.'/activate.php';
 }
 if ((new GL_Plugin_Check_v6(__FILE__))->canProceed()) {
-    require_once __DIR__.'/autoload.php';
-    require_once __DIR__.'/compatibility.php';
-    if (!defined('SAVEQUERIES')) {
-        define('SAVEQUERIES', 1);
-    }
-    GeminiLabs\BlackBar\Application::load()->init();
+	require_once __DIR__.'/autoload.php';
+	require_once __DIR__.'/compatibility.php';
+	if (!defined('SAVEQUERIES')) {
+		define('SAVEQUERIES', 1);
+	}
+	GeminiLabs\BlackBar\Application::load()->init();
 }

Spacing +8 added lines, -8 removed lines

@@ -17,16 +17,16 @@
  * Text Domain:       blackbar
  * Domain Path:       languages
  */
-defined('ABSPATH') || exit;
+defined( 'ABSPATH' ) || exit;
 
-if (!class_exists('GL_Plugin_Check_v6')) {
-    require_once __DIR__.'/activate.php';
+if( !class_exists( 'GL_Plugin_Check_v6' ) ) {
+    require_once __DIR__ . '/activate.php';
 }
-if ((new GL_Plugin_Check_v6(__FILE__))->canProceed()) {
-    require_once __DIR__.'/autoload.php';
-    require_once __DIR__.'/compatibility.php';
-    if (!defined('SAVEQUERIES')) {
-        define('SAVEQUERIES', 1);
+if( ( new GL_Plugin_Check_v6( __FILE__ ) )->canProceed() ) {
+    require_once __DIR__ . '/autoload.php';
+    require_once __DIR__ . '/compatibility.php';
+    if( !defined( 'SAVEQUERIES' ) ) {
+        define( 'SAVEQUERIES', 1 );
     }
     GeminiLabs\BlackBar\Application::load()->init();
 }

plugin/Modules/Templates.php

Braces +6 added lines, -3 removed lines

@@ -30,12 +30,15 @@
             && class_exists('\GeminiLabs\Castor\Helpers\Development')
             && method_exists('\GeminiLabs\Castor\Helpers\Development', 'templatePaths')) { // @phpstan-ignore-line
             $this->entries = \GeminiLabs\Castor\Facades\Development::templatePaths();
-        } else {
-            $files = array_values(array_filter(get_included_files(), function ($file) {
+        }
+        else {
+            $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);
             }));
-            $this->entries = array_map(function ($file) {
+            $this->entries = array_map(function ($file)
+            {
                 return str_replace(trailingslashit(WP_CONTENT_DIR), '', $file);
             }, $files);
         }

Indentation +32 added lines, -32 removed lines

@@ -6,39 +6,39 @@
 
 class Templates extends Module
 {
-    public function entries(): array
-    {
-        if (!empty($this->entries)) {
-            return $this->entries;
-        }
-        if (class_exists('\GeminiLabs\Castor\Facades\Development')
-            && class_exists('\GeminiLabs\Castor\Helpers\Development')
-            && method_exists('\GeminiLabs\Castor\Helpers\Development', 'templatePaths')) { // @phpstan-ignore-line
-            $this->entries = \GeminiLabs\Castor\Facades\Development::templatePaths();
-        } else {
-            $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);
-            }));
-            $this->entries = array_map(function ($file) {
-                return str_replace(trailingslashit(WP_CONTENT_DIR), '', $file);
-            }, $files);
-        }
-        return $this->entries;
-    }
+	public function entries(): array
+	{
+		if (!empty($this->entries)) {
+			return $this->entries;
+		}
+		if (class_exists('\GeminiLabs\Castor\Facades\Development')
+			&& class_exists('\GeminiLabs\Castor\Helpers\Development')
+			&& method_exists('\GeminiLabs\Castor\Helpers\Development', 'templatePaths')) { // @phpstan-ignore-line
+			$this->entries = \GeminiLabs\Castor\Facades\Development::templatePaths();
+		} else {
+			$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);
+			}));
+			$this->entries = array_map(function ($file) {
+				return str_replace(trailingslashit(WP_CONTENT_DIR), '', $file);
+			}, $files);
+		}
+		return $this->entries;
+	}
 
-    public function hasEntries(): bool
-    {
-        return !empty($this->entries());
-    }
+	public function hasEntries(): bool
+	{
+		return !empty($this->entries());
+	}
 
-    public function isVisible(): bool
-    {
-        return !is_admin() && $this->hasEntries();
-    }
+	public function isVisible(): bool
+	{
+		return !is_admin() && $this->hasEntries();
+	}
 
-    public function label(): string
-    {
-        return __('Templates', 'blackbar');
-    }
+	public function label(): string
+	{
+		return __('Templates', 'blackbar');
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -8,28 +8,28 @@ 
 {
     public function entries(): array
     {
-        if (!empty($this->entries)) {
+        if( !empty( $this->entries ) ) {
             return $this->entries;
         }
-        if (class_exists('\GeminiLabs\Castor\Facades\Development')
-            && class_exists('\GeminiLabs\Castor\Helpers\Development')
-            && method_exists('\GeminiLabs\Castor\Helpers\Development', 'templatePaths')) { // @phpstan-ignore-line
+        if( class_exists( '\GeminiLabs\Castor\Facades\Development' )
+            && class_exists( '\GeminiLabs\Castor\Helpers\Development' )
+            && method_exists( '\GeminiLabs\Castor\Helpers\Development', 'templatePaths' ) ) { // @phpstan-ignore-line
             $this->entries = \GeminiLabs\Castor\Facades\Development::templatePaths();
         } else {
-            $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);
-            }));
-            $this->entries = array_map(function ($file) {
-                return str_replace(trailingslashit(WP_CONTENT_DIR), '', $file);
-            }, $files);
+            $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 );
+            }) );
+            $this->entries = array_map( function( $file ) {
+                return str_replace( trailingslashit( WP_CONTENT_DIR ), '', $file );
+            }, $files );
         }
         return $this->entries;
     }
 
     public function hasEntries(): bool
     {
-        return !empty($this->entries());
+        return !empty( $this->entries() );
     }
 
     public function isVisible(): bool
@@ -39,6 +39,6 @@ 
 
     public function label(): string
     {
-        return __('Templates', 'blackbar');
+        return __( 'Templates', 'blackbar' );
     }
 }

plugin/Application.php

Braces +2 added lines, -1 removed lines

@@ -55,7 +55,8 @@
         do_action('blackbar/profiler/start'); // start profiler
         do_action('blackbar/profiler/noise'); // measure profiler noise
         add_action('plugins_loaded', [$controller, 'registerLanguages']);
-        add_action('init', function () use ($controller) {
+        add_action('init', function () use ($controller)
+        {
             if (!apply_filters('blackbar/enabled', current_user_can('administrator'))) {
                 return;
             }

Indentation +81 added lines, -81 removed lines

@@ -11,94 +11,94 @@
 
 final class Application
 {
-    public const CONSOLE_HOOK = 'console';
-    public const ID = 'blackbar';
-    public const PROFILER_START_HOOK = 'timer:start';
-    public const PROFILER_STOP_HOOK = 'timer:stop';
+	public const CONSOLE_HOOK = 'console';
+	public const ID = 'blackbar';
+	public const PROFILER_START_HOOK = 'timer:start';
+	public const PROFILER_STOP_HOOK = 'timer:stop';
 
-    public $console;
-    public $file;
-    public $globals;
-    public $hooks;
-    public $profiler;
-    public $queries;
-    public $templates;
+	public $console;
+	public $file;
+	public $globals;
+	public $hooks;
+	public $profiler;
+	public $queries;
+	public $templates;
 
-    private static $instance;
+	private static $instance;
 
-    public function __construct()
-    {
-        $file = wp_normalize_path((new \ReflectionClass($this))->getFileName());
-        $this->console = new Console($this);
-        $this->file = str_replace('plugin/Application', static::ID, $file);
-        $this->globals = new Globals($this);
-        $this->hooks = new Hooks($this);
-        $this->profiler = new Profiler($this);
-        $this->queries = new Queries($this);
-        $this->templates = new Templates($this);
-    }
+	public function __construct()
+	{
+		$file = wp_normalize_path((new \ReflectionClass($this))->getFileName());
+		$this->console = new Console($this);
+		$this->file = str_replace('plugin/Application', static::ID, $file);
+		$this->globals = new Globals($this);
+		$this->hooks = new Hooks($this);
+		$this->profiler = new Profiler($this);
+		$this->queries = new Queries($this);
+		$this->templates = new Templates($this);
+	}
 
-    public function errorHandler(int $errno, string $message, string $file, int $line): bool
-    {
-        $path = explode(ABSPATH, $file);
-        $location = sprintf('%s:%s', array_pop($path), $line);
-        $this->console->store($message, (string) $errno, $location);
-        return true;
-    }
+	public function errorHandler(int $errno, string $message, string $file, int $line): bool
+	{
+		$path = explode(ABSPATH, $file);
+		$location = sprintf('%s:%s', array_pop($path), $line);
+		$this->console->store($message, (string) $errno, $location);
+		return true;
+	}
 
-    public function init(): void
-    {
-        $controller = new Controller($this);
-        add_action('all', [$controller, 'initConsole']);
-        add_action('all', [$controller, 'initHooks']);
-        add_action('all', [$controller, 'initProfiler']);
-        do_action('blackbar/profiler/start'); // start profiler
-        do_action('blackbar/profiler/noise'); // measure profiler noise
-        add_action('plugins_loaded', [$controller, 'registerLanguages']);
-        add_action('init', function () use ($controller) {
-            if (!apply_filters('blackbar/enabled', current_user_can('administrator'))) {
-                return;
-            }
-            add_action('admin_enqueue_scripts', [$controller, 'enqueueAssets']);
-            add_action('wp_enqueue_scripts', [$controller, 'enqueueAssets']);
-            add_action('admin_footer', [$controller, 'renderBar'], 99999);
-            add_action('wp_footer', [$controller, 'renderBar'], 99999);
-            add_filter('admin_body_class', [$controller, 'filterBodyClasses']);
-        });
-        set_error_handler([$this, 'errorHandler'], E_ALL | E_STRICT);
-    }
+	public function init(): void
+	{
+		$controller = new Controller($this);
+		add_action('all', [$controller, 'initConsole']);
+		add_action('all', [$controller, 'initHooks']);
+		add_action('all', [$controller, 'initProfiler']);
+		do_action('blackbar/profiler/start'); // start profiler
+		do_action('blackbar/profiler/noise'); // measure profiler noise
+		add_action('plugins_loaded', [$controller, 'registerLanguages']);
+		add_action('init', function () use ($controller) {
+			if (!apply_filters('blackbar/enabled', current_user_can('administrator'))) {
+				return;
+			}
+			add_action('admin_enqueue_scripts', [$controller, 'enqueueAssets']);
+			add_action('wp_enqueue_scripts', [$controller, 'enqueueAssets']);
+			add_action('admin_footer', [$controller, 'renderBar'], 99999);
+			add_action('wp_footer', [$controller, 'renderBar'], 99999);
+			add_filter('admin_body_class', [$controller, 'filterBodyClasses']);
+		});
+		set_error_handler([$this, 'errorHandler'], E_ALL | E_STRICT);
+	}
 
-    /**
-     * @return static
-     */
-    public static function load()
-    {
-        if (empty(self::$instance)) {
-            self::$instance = new static();
-        }
-        return self::$instance;
-    }
+	/**
+	 * @return static
+	 */
+	public static function load()
+	{
+		if (empty(self::$instance)) {
+			self::$instance = new static();
+		}
+		return self::$instance;
+	}
 
-    public function path(string $file = '', bool $realpath = true): string
-    {
-        $path = $realpath
-            ? plugin_dir_path($this->file)
-            : trailingslashit(WP_PLUGIN_DIR).basename(dirname($this->file));
-        return trailingslashit($path).ltrim(trim($file), '/');
-    }
+	public function path(string $file = '', bool $realpath = true): string
+	{
+		$path = $realpath
+			? plugin_dir_path($this->file)
+			: trailingslashit(WP_PLUGIN_DIR).basename(dirname($this->file));
+		return trailingslashit($path).ltrim(trim($file), '/');
+	}
 
-    public function render(string $view, array $data = []): void
-    {
-        $file = $this->path(sprintf('views/%s.php', str_replace('.php', '', $view)));
-        if (!file_exists($file)) {
-            return;
-        }
-        extract($data);
-        include $file;
-    }
+	public function render(string $view, array $data = []): void
+	{
+		$file = $this->path(sprintf('views/%s.php', str_replace('.php', '', $view)));
+		if (!file_exists($file)) {
+			return;
+		}
+		extract($data);
+		include $file;
+	}
 
-    public function url(string $path = ''): string
-    {
-        return esc_url(plugin_dir_url($this->file).ltrim(trim($path), '/'));
-    }
+	public function url(string $path = ''): string
+	{
+		return esc_url(plugin_dir_url($this->file).ltrim(trim($path), '/'));
+	}
 }

Spacing +38 added lines, -38 removed lines

@@ -28,44 +28,44 @@ 
 
     public function __construct()
     {
-        $file = wp_normalize_path((new \ReflectionClass($this))->getFileName());
-        $this->console = new Console($this);
-        $this->file = str_replace('plugin/Application', static::ID, $file);
-        $this->globals = new Globals($this);
-        $this->hooks = new Hooks($this);
-        $this->profiler = new Profiler($this);
-        $this->queries = new Queries($this);
-        $this->templates = new Templates($this);
+        $file = wp_normalize_path( ( new \ReflectionClass( $this ) )->getFileName() );
+        $this->console = new Console( $this );
+        $this->file = str_replace( 'plugin/Application', static::ID, $file );
+        $this->globals = new Globals( $this );
+        $this->hooks = new Hooks( $this );
+        $this->profiler = new Profiler( $this );
+        $this->queries = new Queries( $this );
+        $this->templates = new Templates( $this );
     }
 
-    public function errorHandler(int $errno, string $message, string $file, int $line): bool
+    public function errorHandler( int $errno, string $message, string $file, int $line ): bool
     {
-        $path = explode(ABSPATH, $file);
-        $location = sprintf('%s:%s', array_pop($path), $line);
-        $this->console->store($message, (string) $errno, $location);
+        $path = explode( ABSPATH, $file );
+        $location = sprintf( '%s:%s', array_pop( $path ), $line );
+        $this->console->store( $message, (string) $errno, $location );
         return true;
     }
 
     public function init(): void
     {
-        $controller = new Controller($this);
-        add_action('all', [$controller, 'initConsole']);
-        add_action('all', [$controller, 'initHooks']);
-        add_action('all', [$controller, 'initProfiler']);
-        do_action('blackbar/profiler/start'); // start profiler
-        do_action('blackbar/profiler/noise'); // measure profiler noise
-        add_action('plugins_loaded', [$controller, 'registerLanguages']);
-        add_action('init', function () use ($controller) {
-            if (!apply_filters('blackbar/enabled', current_user_can('administrator'))) {
+        $controller = new Controller( $this );
+        add_action( 'all', [ $controller, 'initConsole' ] );
+        add_action( 'all', [ $controller, 'initHooks' ] );
+        add_action( 'all', [ $controller, 'initProfiler' ] );
+        do_action( 'blackbar/profiler/start' ); // start profiler
+        do_action( 'blackbar/profiler/noise' ); // measure profiler noise
+        add_action( 'plugins_loaded', [ $controller, 'registerLanguages' ] );
+        add_action( 'init', function() use ( $controller ) {
+            if( !apply_filters( 'blackbar/enabled', current_user_can( 'administrator' ) ) ) {
                 return;
             }
-            add_action('admin_enqueue_scripts', [$controller, 'enqueueAssets']);
-            add_action('wp_enqueue_scripts', [$controller, 'enqueueAssets']);
-            add_action('admin_footer', [$controller, 'renderBar'], 99999);
-            add_action('wp_footer', [$controller, 'renderBar'], 99999);
-            add_filter('admin_body_class', [$controller, 'filterBodyClasses']);
+            add_action( 'admin_enqueue_scripts', [ $controller, 'enqueueAssets' ] );
+            add_action( 'wp_enqueue_scripts', [ $controller, 'enqueueAssets' ] );
+            add_action( 'admin_footer', [ $controller, 'renderBar' ], 99999 );
+            add_action( 'wp_footer', [ $controller, 'renderBar' ], 99999 );
+            add_filter( 'admin_body_class', [ $controller, 'filterBodyClasses' ] );
         });
-        set_error_handler([$this, 'errorHandler'], E_ALL | E_STRICT);
+        set_error_handler( [ $this, 'errorHandler' ], E_ALL | E_STRICT );
     }
 
     /**
@@ -73,32 +73,32 @@ 
      */
     public static function load()
     {
-        if (empty(self::$instance)) {
+        if( empty( self::$instance ) ) {
             self::$instance = new static();
         }
         return self::$instance;
     }
 
-    public function path(string $file = '', bool $realpath = true): string
+    public function path( string $file = '', bool $realpath = true ): string
     {
         $path = $realpath
-            ? plugin_dir_path($this->file)
-            : trailingslashit(WP_PLUGIN_DIR).basename(dirname($this->file));
-        return trailingslashit($path).ltrim(trim($file), '/');
+            ? plugin_dir_path( $this->file )
+            : trailingslashit( WP_PLUGIN_DIR ) . basename( dirname( $this->file ) );
+        return trailingslashit( $path ) . ltrim( trim( $file ), '/' );
     }
 
-    public function render(string $view, array $data = []): void
+    public function render( string $view, array $data = [ ] ): void
     {
-        $file = $this->path(sprintf('views/%s.php', str_replace('.php', '', $view)));
-        if (!file_exists($file)) {
+        $file = $this->path( sprintf( 'views/%s.php', str_replace( '.php', '', $view ) ) );
+        if( !file_exists( $file ) ) {
             return;
         }
-        extract($data);
+        extract( $data );
         include $file;
     }
 
-    public function url(string $path = ''): string
+    public function url( string $path = '' ): string
     {
-        return esc_url(plugin_dir_url($this->file).ltrim(trim($path), '/'));
+        return esc_url( plugin_dir_url( $this->file ) . ltrim( trim( $path ), '/' ) );
     }
 }

plugin/Modules/Queries.php

Braces +4 added lines, -2 removed lines

@@ -25,7 +25,8 @@ 
             '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) {
@@ -35,7 +36,8 @@ 
             $sql = str_replace(['( ',' )',' ,'], ['(',')',','], $sql);
             $sql = str_replace($search, $replace, $sql);
             $parts = explode(PHP_EOL, $sql);
-            $sql = array_reduce($parts, function ($carry, $part) {
+            $sql = array_reduce($parts, function ($carry, $part)
+            {
                 if (str_starts_with($part, 'SELECT') && strlen($part) > 100) {
                     $part = preg_replace('/\s*(,)\s*/', ','.PHP_EOL.'  ', $part);
                 }

Indentation +67 added lines, -67 removed lines

@@ -6,74 +6,74 @@
 
 class Queries extends Module
 {
-    public function entries(): array
-    {
-        global $wpdb;
-        $entries = [];
-        $index = 0;
-        $search = [
-            '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(['( ',' )',' ,'], ['(',')',','], $sql);
-            $sql = str_replace($search, $replace, $sql);
-            $parts = explode(PHP_EOL, $sql);
-            $sql = array_reduce($parts, function ($carry, $part) {
-                if (str_starts_with($part, 'SELECT') && strlen($part) > 100) {
-                    $part = preg_replace('/\s*(,)\s*/', ','.PHP_EOL.'  ', $part);
-                }
-                if (str_starts_with($part, 'WHERE')) {
-                    $part = str_replace('AND', PHP_EOL.'  AND', $part);
-                }
-                return $carry.$part.PHP_EOL;
-            });
-            $trace = explode(', ', $query[2]);
-            $entries[] = [
-                'index' => $index++,
-                'sql' => $sql,
-                'time' => $miliseconds,
-                'trace' => array_reverse($trace, true),
-            ];
-        }
-        uasort($entries, [$this, 'sortByTime']);
-        return $entries;
-    }
+	public function entries(): array
+	{
+		global $wpdb;
+		$entries = [];
+		$index = 0;
+		$search = [
+			'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(['( ',' )',' ,'], ['(',')',','], $sql);
+			$sql = str_replace($search, $replace, $sql);
+			$parts = explode(PHP_EOL, $sql);
+			$sql = array_reduce($parts, function ($carry, $part) {
+				if (str_starts_with($part, 'SELECT') && strlen($part) > 100) {
+					$part = preg_replace('/\s*(,)\s*/', ','.PHP_EOL.'  ', $part);
+				}
+				if (str_starts_with($part, 'WHERE')) {
+					$part = str_replace('AND', PHP_EOL.'  AND', $part);
+				}
+				return $carry.$part.PHP_EOL;
+			});
+			$trace = explode(', ', $query[2]);
+			$entries[] = [
+				'index' => $index++,
+				'sql' => $sql,
+				'time' => $miliseconds,
+				'trace' => array_reverse($trace, true),
+			];
+		}
+		uasort($entries, [$this, 'sortByTime']);
+		return $entries;
+	}
 
-    public function hasEntries(): bool
-    {
-        global $wpdb;
-        return !empty($wpdb->queries);
-    }
+	public function hasEntries(): bool
+	{
+		global $wpdb;
+		return !empty($wpdb->queries);
+	}
 
-    public function label(): string
-    {
-        $label = __('SQL', 'blackbar');
-        if (!defined('SAVEQUERIES') || !SAVEQUERIES) {
-            return $label;
-        }
-        global $wpdb;
-        $queryTime = 0;
-        foreach ($wpdb->queries as $query) {
-            $queryTime += $query[1];
-        }
-        $queryTime = number_format($queryTime * 1000, 2);
-        $count = sprintf('<span class="glbb-queries-count">%s</span>', count($wpdb->queries));
-        $time = sprintf('<span class="glbb-queries-time">%s</span>', $queryTime);
-        return sprintf('%s <span class="glbb-link-info">%s / %s ms</span>', $label, $count, $time);
-    }
+	public function label(): string
+	{
+		$label = __('SQL', 'blackbar');
+		if (!defined('SAVEQUERIES') || !SAVEQUERIES) {
+			return $label;
+		}
+		global $wpdb;
+		$queryTime = 0;
+		foreach ($wpdb->queries as $query) {
+			$queryTime += $query[1];
+		}
+		$queryTime = number_format($queryTime * 1000, 2);
+		$count = sprintf('<span class="glbb-queries-count">%s</span>', count($wpdb->queries));
+		$time = sprintf('<span class="glbb-queries-time">%s</span>', $queryTime);
+		return sprintf('%s <span class="glbb-link-info">%s / %s ms</span>', $label, $count, $time);
+	}
 
-    protected function sortByTime(array $a, array $b): int
-    {
-        if ($a['time'] !== $b['time']) {
-            return ($a['time'] > $b['time']) ? -1 : 1;
-        }
-        return 0;
-    }
+	protected function sortByTime(array $a, array $b): int
+	{
+		if ($a['time'] !== $b['time']) {
+			return ($a['time'] > $b['time']) ? -1 : 1;
+		}
+		return 0;
+	}
 }

Spacing +33 added lines, -33 removed lines

@@ -9,70 +9,70 @@
     public function entries(): array
     {
         global $wpdb;
-        $entries = [];
+        $entries = [ ];
         $index = 0;
         $search = [
             '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(['( ',' )',' ,'], ['(',')',','], $sql);
-            $sql = str_replace($search, $replace, $sql);
-            $parts = explode(PHP_EOL, $sql);
-            $sql = array_reduce($parts, function ($carry, $part) {
-                if (str_starts_with($part, 'SELECT') && strlen($part) > 100) {
-                    $part = preg_replace('/\s*(,)\s*/', ','.PHP_EOL.'  ', $part);
+        $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( [ '( ', ' )', ' ,' ], [ '(', ')', ',' ], $sql );
+            $sql = str_replace( $search, $replace, $sql );
+            $parts = explode( PHP_EOL, $sql );
+            $sql = array_reduce( $parts, function( $carry, $part ) {
+                if( str_starts_with( $part, 'SELECT' ) && strlen( $part ) > 100 ) {
+                    $part = preg_replace( '/\s*(,)\s*/', ',' . PHP_EOL . '  ', $part );
                 }
-                if (str_starts_with($part, 'WHERE')) {
-                    $part = str_replace('AND', PHP_EOL.'  AND', $part);
+                if( str_starts_with( $part, 'WHERE' ) ) {
+                    $part = str_replace( 'AND', PHP_EOL . '  AND', $part );
                 }
-                return $carry.$part.PHP_EOL;
+                return $carry . $part . PHP_EOL;
             });
-            $trace = explode(', ', $query[2]);
-            $entries[] = [
+            $trace = explode( ', ', $query[ 2 ] );
+            $entries[ ] = [
                 'index' => $index++,
                 'sql' => $sql,
                 'time' => $miliseconds,
-                'trace' => array_reverse($trace, true),
+                'trace' => array_reverse( $trace, true ),
             ];
         }
-        uasort($entries, [$this, 'sortByTime']);
+        uasort( $entries, [ $this, 'sortByTime' ] );
         return $entries;
     }
 
     public function hasEntries(): bool
     {
         global $wpdb;
-        return !empty($wpdb->queries);
+        return !empty( $wpdb->queries );
     }
 
     public function label(): string
     {
-        $label = __('SQL', 'blackbar');
-        if (!defined('SAVEQUERIES') || !SAVEQUERIES) {
+        $label = __( 'SQL', 'blackbar' );
+        if( !defined( 'SAVEQUERIES' ) || !SAVEQUERIES ) {
             return $label;
         }
         global $wpdb;
         $queryTime = 0;
-        foreach ($wpdb->queries as $query) {
-            $queryTime += $query[1];
+        foreach( $wpdb->queries as $query ) {
+            $queryTime += $query[ 1 ];
         }
-        $queryTime = number_format($queryTime * 1000, 2);
-        $count = sprintf('<span class="glbb-queries-count">%s</span>', count($wpdb->queries));
-        $time = sprintf('<span class="glbb-queries-time">%s</span>', $queryTime);
-        return sprintf('%s <span class="glbb-link-info">%s / %s ms</span>', $label, $count, $time);
+        $queryTime = number_format( $queryTime * 1000, 2 );
+        $count = sprintf( '<span class="glbb-queries-count">%s</span>', count( $wpdb->queries ) );
+        $time = sprintf( '<span class="glbb-queries-time">%s</span>', $queryTime );
+        return sprintf( '%s <span class="glbb-link-info">%s / %s ms</span>', $label, $count, $time );
     }
 
-    protected function sortByTime(array $a, array $b): int
+    protected function sortByTime( array $a, array $b ): int
     {
-        if ($a['time'] !== $b['time']) {
-            return ($a['time'] > $b['time']) ? -1 : 1;
+        if( $a[ 'time' ] !== $b[ 'time' ] ) {
+            return ( $a[ 'time' ] > $b[ 'time' ] ) ? -1 : 1;
         }
         return 0;
     }

views/panels/queries.php

Braces +5 added lines, -2 removed lines

@@ -8,9 +8,12 @@
             </tr>
         </tbody>
     </table>
-<?php else : ?>
+<?php else {
+	: ?>
     <form>
-        <input type="text" id="glbb_queries_sql" placeholder="<?= esc_attr__('Find SQL containing', 'blackbar'); ?>">
+        <input type="text" id="glbb_queries_sql" placeholder="<?= esc_attr__('Find SQL containing', 'blackbar');
+}
+?>">
         <input type="text" id="glbb_queries_min_time" placeholder="<?= esc_attr__('Minimum execution time', 'blackbar'); ?>">
         <select id="glbb_queries_sort_by">
             <option value><?= esc_html__('Sort by execution time', 'blackbar'); ?></option>

Spacing +13 added lines, -13 removed lines

@@ -1,32 +1,32 @@
-<?php defined('WPINC') || die; ?>
+<?php defined( 'WPINC' ) || die; ?>
 
-<?php if (!defined('SAVEQUERIES') || !SAVEQUERIES) : ?>
+<?php if( !defined( 'SAVEQUERIES' ) || !SAVEQUERIES ) : ?>
     <table>
         <tbody>
             <tr>
-                <td><a href="https://wordpress.org/documentation/article/debugging-in-wordpress/#savequeries" target="_blank">SAVEQUERIES</a> <?= esc_html_x('must be enabled to view SQL queries', 'SAVEQUERIES', 'blackbar'); ?>.</td>
+                <td><a href="https://wordpress.org/documentation/article/debugging-in-wordpress/#savequeries" target="_blank">SAVEQUERIES</a> <?= esc_html_x( 'must be enabled to view SQL queries', 'SAVEQUERIES', 'blackbar' ); ?>.</td>
             </tr>
         </tbody>
     </table>
 <?php else : ?>
     <form>
-        <input type="text" id="glbb_queries_sql" placeholder="<?= esc_attr__('Find SQL containing', 'blackbar'); ?>">
-        <input type="text" id="glbb_queries_min_time" placeholder="<?= esc_attr__('Minimum execution time', 'blackbar'); ?>">
+        <input type="text" id="glbb_queries_sql" placeholder="<?= esc_attr__( 'Find SQL containing', 'blackbar' ); ?>">
+        <input type="text" id="glbb_queries_min_time" placeholder="<?= esc_attr__( 'Minimum execution time', 'blackbar' ); ?>">
         <select id="glbb_queries_sort_by">
-            <option value><?= esc_html__('Sort by execution time', 'blackbar'); ?></option>
-            <option value="order"><?= esc_html__('Sort by execution order', 'blackbar'); ?></option>
+            <option value><?= esc_html__( 'Sort by execution time', 'blackbar' ); ?></option>
+            <option value="order"><?= esc_html__( 'Sort by execution order', 'blackbar' ); ?></option>
         </select>
     </form>
     <table class="glbb-grid">
         <tbody>
-            <?php foreach ($module->entries() as $entry) : ?>
-                <tr class="glbb-row-collapsed" data-index="<?= esc_attr($entry['index']); ?>" data-time="<?= esc_attr($entry['time']); ?>">
-                    <td data-time="<?= esc_attr($entry['time']); ?>"><div class="glbb-row-toggle dashicons-before dashicons-arrow-right"><?= esc_html($entry['time']); ?></div></td>
-                    <td data-sql><pre><code class="language-sql"><?= esc_html($entry['sql']); ?></code></pre></td>
+            <?php foreach( $module->entries() as $entry ) : ?>
+                <tr class="glbb-row-collapsed" data-index="<?= esc_attr( $entry[ 'index' ] ); ?>" data-time="<?= esc_attr( $entry[ 'time' ] ); ?>">
+                    <td data-time="<?= esc_attr( $entry[ 'time' ] ); ?>"><div class="glbb-row-toggle dashicons-before dashicons-arrow-right"><?= esc_html( $entry[ 'time' ] ); ?></div></td>
+                    <td data-sql><pre><code class="language-sql"><?= esc_html( $entry[ 'sql' ] ); ?></code></pre></td>
                     <td class="glbb-row-details">
                         <ol>
-                            <?php foreach ($entry['trace'] as $index => $line) : ?>
-                                <li value="<?= esc_attr($index + 1); ?>"><?= esc_html($line); ?></li>
+                            <?php foreach( $entry[ 'trace' ] as $index => $line ) : ?>
+                                <li value="<?= esc_attr( $index + 1 ); ?>"><?= esc_html( $line ); ?></li>
                             <?php endforeach; ?>
                         </ol>
                     </td>

plugin/Dump.php

Indentation +127 added lines, -127 removed lines

@@ -7,142 +7,142 @@
  */
 class Dump
 {
-    public $depth;
-    public $ignore;
+	public $depth;
+	public $ignore;
 
-    protected $level = 0;
-    protected $result = [];
-    protected $stack = [];
+	protected $level = 0;
+	protected $result = [];
+	protected $stack = [];
 
-    /**
-     * @param mixed $value
-     */
-    public function dump($value, int $depth = 3, array $ignore = []): string
-    {
-        $this->depth = $depth;
-        $this->ignore = $ignore;
-        $this->reset();
-        $this->inspect($value);
-        $result = implode('', $this->result);
-        $result = rtrim($result, "\n");
-        $this->reset();
-        return $result;
-    }
+	/**
+	 * @param mixed $value
+	 */
+	public function dump($value, int $depth = 3, array $ignore = []): string
+	{
+		$this->depth = $depth;
+		$this->ignore = $ignore;
+		$this->reset();
+		$this->inspect($value);
+		$result = implode('', $this->result);
+		$result = rtrim($result, "\n");
+		$this->reset();
+		return $result;
+	}
 
-    protected function formatKey(string $key): string
-    {
-        $result = [];
-        $result[] = str_repeat(' ', $this->level * 4).'[';
-        if (is_string($key) && "\0" === $key[0]) {
-            $keyParts = explode("\0", $key);
-            $result[] = $keyParts[2].(('*' === $keyParts[1]) ? ':protected' : ':private');
-        } else {
-            $result[] = $key;
-        }
-        $result[] = '] => ';
-        return implode('', $result);
-    }
+	protected function formatKey(string $key): string
+	{
+		$result = [];
+		$result[] = str_repeat(' ', $this->level * 4).'[';
+		if (is_string($key) && "\0" === $key[0]) {
+			$keyParts = explode("\0", $key);
+			$result[] = $keyParts[2].(('*' === $keyParts[1]) ? ':protected' : ':private');
+		} else {
+			$result[] = $key;
+		}
+		$result[] = '] => ';
+		return implode('', $result);
+	}
 
-    /**
-     * @param mixed $subject
-     */
-    protected function inspect($subject): void
-    {
-        ++$this->level;
-        if ($subject instanceof \Closure) {
-            $this->inspectClosure($subject);
-        } elseif (is_object($subject)) {
-            $this->inspectObject($subject);
-        } elseif (is_array($subject)) {
-            $this->inspectArray($subject);
-        } else {
-            $this->inspectPrimitive($subject);
-        }
-        --$this->level;
-    }
+	/**
+	 * @param mixed $subject
+	 */
+	protected function inspect($subject): void
+	{
+		++$this->level;
+		if ($subject instanceof \Closure) {
+			$this->inspectClosure($subject);
+		} elseif (is_object($subject)) {
+			$this->inspectObject($subject);
+		} elseif (is_array($subject)) {
+			$this->inspectArray($subject);
+		} else {
+			$this->inspectPrimitive($subject);
+		}
+		--$this->level;
+	}
 
-    protected function inspectArray(array $subject): void
-    {
-        if ($this->level > $this->depth) {
-            $this->result[] = "Nested Array\n";
-            return;
-        }
-        if (empty($subject)) {
-            $this->result[] = "Array ()\n";
-            return;
-        }
-        $this->result[] = "Array (\n";
-        foreach ($subject as $key => $val) {
-            if (false === $this->isIgnoredKey($key)) {
-                $this->result[] = str_repeat(' ', $this->level * 4).'['.$key.'] => ';
-                $this->inspect($val);
-            }
-        }
-        $this->result[] = str_repeat(' ', ($this->level - 1) * 4).")\n";
-    }
+	protected function inspectArray(array $subject): void
+	{
+		if ($this->level > $this->depth) {
+			$this->result[] = "Nested Array\n";
+			return;
+		}
+		if (empty($subject)) {
+			$this->result[] = "Array ()\n";
+			return;
+		}
+		$this->result[] = "Array (\n";
+		foreach ($subject as $key => $val) {
+			if (false === $this->isIgnoredKey($key)) {
+				$this->result[] = str_repeat(' ', $this->level * 4).'['.$key.'] => ';
+				$this->inspect($val);
+			}
+		}
+		$this->result[] = str_repeat(' ', ($this->level - 1) * 4).")\n";
+	}
 
-    protected function inspectClosure(\Closure $subject): void
-    {
-        $reflection = new \ReflectionFunction($subject);
-        $params = array_map(function ($param) {
-            return ($param->isPassedByReference() ? '&$' : '$').$param->name;
-        }, $reflection->getParameters());
-        $this->result[] = 'Closure ('.implode(', ', $params).') { ... }'."\n";
-    }
+	protected function inspectClosure(\Closure $subject): void
+	{
+		$reflection = new \ReflectionFunction($subject);
+		$params = array_map(function ($param) {
+			return ($param->isPassedByReference() ? '&$' : '$').$param->name;
+		}, $reflection->getParameters());
+		$this->result[] = 'Closure ('.implode(', ', $params).') { ... }'."\n";
+	}
 
-    /**
-     * @param object $subject
-     */
-    protected function inspectObject($subject): void
-    {
-        $classname = get_class($subject);
-        if ($this->level > $this->depth) {
-            $this->result[] = 'Nested '.$classname." Object\n";
-            return;
-        }
-        if ($subject instanceof \ArrayObject) {
-            $this->result[] = $classname." ArrayObject (\n";
-        } else {
-            $this->result[] = $classname." Object (\n";
-            $subject = (array) $subject;
-        }
-        foreach ($subject as $key => $val) {
-            if (false === $this->isIgnoredKey($key)) {
-                $this->result[] = $this->formatKey($key);
-                $this->inspect($val);
-            }
-        }
-        $this->result[] = str_repeat(' ', ($this->level - 1) * 4).")\n";
-    }
+	/**
+	 * @param object $subject
+	 */
+	protected function inspectObject($subject): void
+	{
+		$classname = get_class($subject);
+		if ($this->level > $this->depth) {
+			$this->result[] = 'Nested '.$classname." Object\n";
+			return;
+		}
+		if ($subject instanceof \ArrayObject) {
+			$this->result[] = $classname." ArrayObject (\n";
+		} else {
+			$this->result[] = $classname." Object (\n";
+			$subject = (array) $subject;
+		}
+		foreach ($subject as $key => $val) {
+			if (false === $this->isIgnoredKey($key)) {
+				$this->result[] = $this->formatKey($key);
+				$this->inspect($val);
+			}
+		}
+		$this->result[] = str_repeat(' ', ($this->level - 1) * 4).")\n";
+	}
 
-    /**
-     * @param mixed $subject
-     */
-    protected function inspectPrimitive($subject): void
-    {
-        if (true === $subject) {
-            $subject = '(bool) true';
-        } elseif (false === $subject) {
-            $subject = '(bool) false';
-        } elseif (null === $subject) {
-            $subject = '(null)';
-        }
-        $this->result[] = $subject."\n";
-    }
+	/**
+	 * @param mixed $subject
+	 */
+	protected function inspectPrimitive($subject): void
+	{
+		if (true === $subject) {
+			$subject = '(bool) true';
+		} elseif (false === $subject) {
+			$subject = '(bool) false';
+		} elseif (null === $subject) {
+			$subject = '(null)';
+		}
+		$this->result[] = $subject."\n";
+	}
 
-    /**
-     * @param string $key
-     */
-    protected function isIgnoredKey($key): bool
-    {
-        return in_array($key, $this->ignore);
-    }
+	/**
+	 * @param string $key
+	 */
+	protected function isIgnoredKey($key): bool
+	{
+		return in_array($key, $this->ignore);
+	}
 
-    protected function reset(): void
-    {
-        $this->level = 0;
-        $this->result = [];
-        $this->stack = [];
-    }
+	protected function reset(): void
+	{
+		$this->level = 0;
+		$this->result = [];
+		$this->stack = [];
+	}
 }
 

Spacing +61 added lines, -61 removed lines

@@ -11,138 +11,138 @@
     public $ignore;
 
     protected $level = 0;
-    protected $result = [];
-    protected $stack = [];
+    protected $result = [ ];
+    protected $stack = [ ];
 
     /**
      * @param mixed $value
      */
-    public function dump($value, int $depth = 3, array $ignore = []): string
+    public function dump( $value, int $depth = 3, array $ignore = [ ] ): string
     {
         $this->depth = $depth;
         $this->ignore = $ignore;
         $this->reset();
-        $this->inspect($value);
-        $result = implode('', $this->result);
-        $result = rtrim($result, "\n");
+        $this->inspect( $value );
+        $result = implode( '', $this->result );
+        $result = rtrim( $result, "\n" );
         $this->reset();
         return $result;
     }
 
-    protected function formatKey(string $key): string
+    protected function formatKey( string $key ): string
     {
-        $result = [];
-        $result[] = str_repeat(' ', $this->level * 4).'[';
-        if (is_string($key) && "\0" === $key[0]) {
-            $keyParts = explode("\0", $key);
-            $result[] = $keyParts[2].(('*' === $keyParts[1]) ? ':protected' : ':private');
+        $result = [ ];
+        $result[ ] = str_repeat( ' ', $this->level * 4 ) . '[';
+        if( is_string( $key ) && "\0" === $key[ 0 ] ) {
+            $keyParts = explode( "\0", $key );
+            $result[ ] = $keyParts[ 2 ] . ( ( '*' === $keyParts[ 1 ] ) ? ':protected' : ':private' );
         } else {
-            $result[] = $key;
+            $result[ ] = $key;
         }
-        $result[] = '] => ';
-        return implode('', $result);
+        $result[ ] = '] => ';
+        return implode( '', $result );
     }
 
     /**
      * @param mixed $subject
      */
-    protected function inspect($subject): void
+    protected function inspect( $subject ): void
     {
         ++$this->level;
-        if ($subject instanceof \Closure) {
-            $this->inspectClosure($subject);
-        } elseif (is_object($subject)) {
-            $this->inspectObject($subject);
-        } elseif (is_array($subject)) {
-            $this->inspectArray($subject);
+        if( $subject instanceof \Closure ) {
+            $this->inspectClosure( $subject );
+        } elseif( is_object( $subject ) ) {
+            $this->inspectObject( $subject );
+        } elseif( is_array( $subject ) ) {
+            $this->inspectArray( $subject );
         } else {
-            $this->inspectPrimitive($subject);
+            $this->inspectPrimitive( $subject );
         }
         --$this->level;
     }
 
-    protected function inspectArray(array $subject): void
+    protected function inspectArray( array $subject ): void
     {
-        if ($this->level > $this->depth) {
-            $this->result[] = "Nested Array\n";
+        if( $this->level > $this->depth ) {
+            $this->result[ ] = "Nested Array\n";
             return;
         }
-        if (empty($subject)) {
-            $this->result[] = "Array ()\n";
+        if( empty( $subject ) ) {
+            $this->result[ ] = "Array ()\n";
             return;
         }
-        $this->result[] = "Array (\n";
-        foreach ($subject as $key => $val) {
-            if (false === $this->isIgnoredKey($key)) {
-                $this->result[] = str_repeat(' ', $this->level * 4).'['.$key.'] => ';
-                $this->inspect($val);
+        $this->result[ ] = "Array (\n";
+        foreach( $subject as $key => $val ) {
+            if( false === $this->isIgnoredKey( $key ) ) {
+                $this->result[ ] = str_repeat( ' ', $this->level * 4 ) . '[' . $key . '] => ';
+                $this->inspect( $val );
             }
         }
-        $this->result[] = str_repeat(' ', ($this->level - 1) * 4).")\n";
+        $this->result[ ] = str_repeat( ' ', ( $this->level - 1 ) * 4 ) . ")\n";
     }
 
-    protected function inspectClosure(\Closure $subject): void
+    protected function inspectClosure( \Closure $subject ): void
     {
-        $reflection = new \ReflectionFunction($subject);
-        $params = array_map(function ($param) {
-            return ($param->isPassedByReference() ? '&$' : '$').$param->name;
-        }, $reflection->getParameters());
-        $this->result[] = 'Closure ('.implode(', ', $params).') { ... }'."\n";
+        $reflection = new \ReflectionFunction( $subject );
+        $params = array_map( function( $param ) {
+            return ( $param->isPassedByReference() ? '&$' : '$' ) . $param->name;
+        }, $reflection->getParameters() );
+        $this->result[ ] = 'Closure (' . implode( ', ', $params ) . ') { ... }' . "\n";
     }
 
     /**
      * @param object $subject
      */
-    protected function inspectObject($subject): void
+    protected function inspectObject( $subject ): void
     {
-        $classname = get_class($subject);
-        if ($this->level > $this->depth) {
-            $this->result[] = 'Nested '.$classname." Object\n";
+        $classname = get_class( $subject );
+        if( $this->level > $this->depth ) {
+            $this->result[ ] = 'Nested ' . $classname . " Object\n";
             return;
         }
-        if ($subject instanceof \ArrayObject) {
-            $this->result[] = $classname." ArrayObject (\n";
+        if( $subject instanceof \ArrayObject ) {
+            $this->result[ ] = $classname . " ArrayObject (\n";
         } else {
-            $this->result[] = $classname." Object (\n";
+            $this->result[ ] = $classname . " Object (\n";
             $subject = (array) $subject;
         }
-        foreach ($subject as $key => $val) {
-            if (false === $this->isIgnoredKey($key)) {
-                $this->result[] = $this->formatKey($key);
-                $this->inspect($val);
+        foreach( $subject as $key => $val ) {
+            if( false === $this->isIgnoredKey( $key ) ) {
+                $this->result[ ] = $this->formatKey( $key );
+                $this->inspect( $val );
             }
         }
-        $this->result[] = str_repeat(' ', ($this->level - 1) * 4).")\n";
+        $this->result[ ] = str_repeat( ' ', ( $this->level - 1 ) * 4 ) . ")\n";
     }
 
     /**
      * @param mixed $subject
      */
-    protected function inspectPrimitive($subject): void
+    protected function inspectPrimitive( $subject ): void
     {
-        if (true === $subject) {
+        if( true === $subject ) {
             $subject = '(bool) true';
-        } elseif (false === $subject) {
+        } elseif( false === $subject ) {
             $subject = '(bool) false';
-        } elseif (null === $subject) {
+        } elseif( null === $subject ) {
             $subject = '(null)';
         }
-        $this->result[] = $subject."\n";
+        $this->result[ ] = $subject . "\n";
     }
 
     /**
      * @param string $key
      */
-    protected function isIgnoredKey($key): bool
+    protected function isIgnoredKey( $key ): bool
     {
-        return in_array($key, $this->ignore);
+        return in_array( $key, $this->ignore );
     }
 
     protected function reset(): void
     {
         $this->level = 0;
-        $this->result = [];
-        $this->stack = [];
+        $this->result = [ ];
+        $this->stack = [ ];
     }
 }
 

Braces +16 added lines, -8 removed lines

@@ -36,7 +36,8 @@ 
         if (is_string($key) && "\0" === $key[0]) {
             $keyParts = explode("\0", $key);
             $result[] = $keyParts[2].(('*' === $keyParts[1]) ? ':protected' : ':private');
-        } else {
+        }
+        else {
             $result[] = $key;
         }
         $result[] = '] => ';
@@ -51,11 +52,14 @@ 
         ++$this->level;
         if ($subject instanceof \Closure) {
             $this->inspectClosure($subject);
-        } elseif (is_object($subject)) {
+        }
+        elseif (is_object($subject)) {
             $this->inspectObject($subject);
-        } elseif (is_array($subject)) {
+        }
+        elseif (is_array($subject)) {
             $this->inspectArray($subject);
-        } else {
+        }
+        else {
             $this->inspectPrimitive($subject);
         }
         --$this->level;
@@ -84,7 +88,8 @@ 
     protected function inspectClosure(\Closure $subject): void
     {
         $reflection = new \ReflectionFunction($subject);
-        $params = array_map(function ($param) {
+        $params = array_map(function ($param)
+        {
             return ($param->isPassedByReference() ? '&$' : '$').$param->name;
         }, $reflection->getParameters());
         $this->result[] = 'Closure ('.implode(', ', $params).') { ... }'."\n";
@@ -102,7 +107,8 @@ 
         }
         if ($subject instanceof \ArrayObject) {
             $this->result[] = $classname." ArrayObject (\n";
-        } else {
+        }
+        else {
             $this->result[] = $classname." Object (\n";
             $subject = (array) $subject;
         }
@@ -122,9 +128,11 @@ 
     {
         if (true === $subject) {
             $subject = '(bool) true';
-        } elseif (false === $subject) {
+        }
+        elseif (false === $subject) {
             $subject = '(bool) false';
-        } elseif (null === $subject) {
+        }
+        elseif (null === $subject) {
             $subject = '(null)';
         }
         $this->result[] = $subject."\n";