pryley / blackbar

compatibility.php

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

autoload.php

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;

activate.php

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

blackbar.php

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

Spacing +16 added lines, -16 removed lines

@@ -15,36 +15,36 @@ 
      */
     protected $entries;
 
-    public function __construct(Application $app)
+    public function __construct( Application $app )
     {
         $this->app = $app;
-        $this->entries = [];
+        $this->entries = [ ];
     }
 
     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 id(): string
@@ -59,11 +59,11 @@ 
 
     public function label(): string
     {
-        return __('Templates', 'blackbar');
+        return __( 'Templates', 'blackbar' );
     }
 
     public function render(): void
     {
-        $this->app->render('panels/templates', ['templates' => $this]);
+        $this->app->render( 'panels/templates', [ 'templates' => $this ] );
     }
 }

plugin/Application.php

Spacing +38 added lines, -38 removed lines

@@ -28,44 +28,44 @@ 
 
     public function __construct()
     {
-        $file = wp_normalize_path((new \ReflectionClass($this))->getFileName());
-        $this->actions = new Actions($this);
-        $this->console = new Console($this);
-        $this->file = str_replace('plugin/Application', static::ID, $file);
-        $this->globals = new Globals($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->actions = new Actions( $this );
+        $this->console = new Console( $this );
+        $this->file = str_replace( 'plugin/Application', static::ID, $file );
+        $this->globals = new Globals( $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, 'initActions']);
-        add_action('all', [$controller, 'initConsole']);
-        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, 'initActions' ] );
+        add_action( 'all', [ $controller, 'initConsole' ] );
+        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(static::$instance)) {
+        if( empty( static::$instance ) ) {
             static::$instance = new static();
         }
         return static::$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/Globals.php

Spacing +18 added lines, -18 removed lines

@@ -15,15 +15,15 @@ 
      */
     protected $entries;
 
-    public function __construct(Application $app)
+    public function __construct( Application $app )
     {
         $this->app = $app;
-        $this->entries = [];
+        $this->entries = [ ];
     }
 
     public function entries(): array
     {
-        if (!empty($this->entries)) {
+        if( !empty( $this->entries ) ) {
             return $this->entries;
         }
         $globals = [
@@ -33,21 +33,21 @@ 
             'INPUT_POST' => $_POST,
             'INPUT_SERVER' => $_SERVER,
         ];
-        if (is_admin() && $screen = get_current_screen()) {
-            $reflection = new \ReflectionClass($screen);
-            $properties = $reflection->getProperties(\ReflectionProperty::IS_PUBLIC);
-            $values = [];
-            foreach ($properties as $property) {
-                $values[$property->getName()] = $property->getValue($screen);
+        if( is_admin() && $screen = get_current_screen() ) {
+            $reflection = new \ReflectionClass( $screen );
+            $properties = $reflection->getProperties( \ReflectionProperty::IS_PUBLIC );
+            $values = [ ];
+            foreach( $properties as $property ) {
+                $values[ $property->getName() ] = $property->getValue( $screen );
             }
-            $globals['WP_Screen'] = $values;
+            $globals[ 'WP_Screen' ] = $values;
         }
-        $globals = apply_filters('blackbar/globals', $globals);
-        $globals = array_filter($globals);
-        foreach ($globals as $key => $values) {
-            $this->entries[] = [
+        $globals = apply_filters( 'blackbar/globals', $globals );
+        $globals = array_filter( $globals );
+        foreach( $globals as $key => $values ) {
+            $this->entries[ ] = [
                 'name' => $key,
-                'value' => var_export($values, true),
+                'value' => var_export( $values, true ),
             ];
         }
         return $this->entries;
@@ -55,7 +55,7 @@ 
 
     public function hasEntries(): bool
     {
-        return !empty($this->entries());
+        return !empty( $this->entries() );
     }
 
     public function id(): string
@@ -70,11 +70,11 @@ 
 
     public function label(): string
     {
-        return __('Globals', 'blackbar');
+        return __( 'Globals', 'blackbar' );
     }
 
     public function render(): void
     {
-        $this->app->render('panels/globals', ['globals' => $this]);
+        $this->app->render( 'panels/globals', [ 'globals' => $this ] );
     }
 }

plugin/Modules/Profiler.php

Spacing +36 added lines, -36 removed lines

@@ -31,30 +31,30 @@ 
      */
     protected $timers;
 
-    public function __construct(Application $app)
+    public function __construct( Application $app )
     {
         $this->app = $app;
-        $this->noise = floatval(0);
-        $this->start = floatval(0);
-        $this->stop = floatval(0);
-        $this->timer = [];
-        $this->timers = [];
+        $this->noise = floatval( 0 );
+        $this->start = floatval( 0 );
+        $this->stop = floatval( 0 );
+        $this->timer = [ ];
+        $this->timers = [ ];
     }
 
     public function entries(): array
     {
-        $entries = [];
-        foreach ($this->timers as $timer) {
-            $timer['memory'] = round($timer['memory'] / 1000); // convert bytes to KB
-            $timer['time'] = $this->formatTime($timer['time']);
-            $entries[] = $timer;
+        $entries = [ ];
+        foreach( $this->timers as $timer ) {
+            $timer[ 'memory' ] = round( $timer[ 'memory' ] / 1000 ); // convert bytes to KB
+            $timer[ 'time' ] = $this->formatTime( $timer[ 'time' ] );
+            $entries[ ] = $timer;
         }
         return $entries;
     }
 
     public function hasEntries(): bool
     {
-        return !empty($this->timers);
+        return !empty( $this->timers );
     }
 
     public function id(): string
@@ -64,72 +64,72 @@ 
 
     public function isVisible(): bool
     {
-        return !empty($this->timers);
+        return !empty( $this->timers );
     }
 
     public function label(): string
     {
-        $label = __('Profiler', 'blackbar');
+        $label = __( 'Profiler', 'blackbar' );
         $time = $this->totalTime();
-        if ($time > 0) {
-            $info = sprintf('<span class="glbb-link-info">(%s)</span>', $this->formatTime($time));
-            $label = sprintf('%s %s', $label, $info);
+        if( $time > 0 ) {
+            $info = sprintf( '<span class="glbb-link-info">(%s)</span>', $this->formatTime( $time ) );
+            $label = sprintf( '%s %s', $label, $info );
         }
         return $label;
     }
 
     public function render(): void
     {
-        $this->app->render('panels/profiler', ['profiler' => $this]);
+        $this->app->render( 'panels/profiler', [ 'profiler' => $this ] );
     }
 
-    public function setNoise(float $microtime): void
+    public function setNoise( float $microtime ): void
     {
         $this->noise = $this->start - $microtime;
     }
 
-    public function setStart(float $microtime): void
+    public function setStart( float $microtime ): void
     {
         $this->start = $microtime;
     }
 
-    public function setStop(float $microtime): void
+    public function setStop( float $microtime ): void
     {
         $this->stop = $microtime;
     }
 
-    public function start(string $name): void
+    public function start( string $name ): void
     {
         $this->timer = [
             'memory' => memory_get_peak_usage(),
             'name' => $name,
-            'start' => microtime(true),
-            'stop' => floatval(0),
-            'time' => floatval(0),
+            'start' => microtime( true ),
+            'stop' => floatval( 0 ),
+            'time' => floatval( 0 ),
         ];
     }
 
-    public function stop(string $name): void
+    public function stop( string $name ): void
     {
-        if (empty($this->timer)) {
+        if( empty( $this->timer ) ) {
             return;
         }
-        $this->timer['stop'] = microtime(true) - $this->noise;
-        $this->timer['time'] = $this->timer['stop'] - $this->timer['start'];
-        $this->timers[] = $this->timer;
-        $this->timer = []; // reset timer
+        $this->timer[ 'stop' ] = microtime( true ) - $this->noise;
+        $this->timer[ 'time' ] = $this->timer[ 'stop' ] - $this->timer[ 'start' ];
+        $this->timers[ ] = $this->timer;
+        $this->timer = [ ]; // reset timer
     }
 
     public function totalTime(): float
     {
-        return array_sum(wp_list_pluck($this->timers, 'time'));
+        return array_sum( wp_list_pluck( $this->timers, 'time' ) );
     }
 
-    protected function formatTime(float $time): string
+    protected function formatTime( float $time ): string
     {
-        if ($time < 100) {
-            return sprintf('%.3f µs', $time);
+        if( $time < 100 ) {
+            return sprintf( '%.3f µs', $time );
         }
-        return sprintf('%.3f ms', $time * 1000);
+        return sprintf( '%.3f ms', $time * 1000 );
     }
 }

plugin/Modules/Queries.php

Spacing +36 added lines, -36 removed lines

@@ -11,7 +11,7 @@ 
      */
     protected $app;
 
-    public function __construct(Application $app)
+    public function __construct( Application $app )
     {
         $this->app = $app;
     }
@@ -19,47 +19,47 @@ 
     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 id(): string
@@ -74,31 +74,31 @@ 
 
     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);
-        $queriesCount = sprintf('<span class="glbb-queries-count">%s</span>', count($wpdb->queries));
-        $queriesTime = sprintf('<span class="glbb-queries-time">%s</span>', $queryTime);
-        $info = sprintf('<span class="glbb-link-info">(%s / %s ms)</span>', $queriesCount, $queriesTime);
-        return sprintf('%s %s', $label, $info);
+        $queryTime = number_format( $queryTime * 1000, 2 );
+        $queriesCount = sprintf( '<span class="glbb-queries-count">%s</span>', count( $wpdb->queries ) );
+        $queriesTime = sprintf( '<span class="glbb-queries-time">%s</span>', $queryTime );
+        $info = sprintf( '<span class="glbb-link-info">(%s / %s ms)</span>', $queriesCount, $queriesTime );
+        return sprintf( '%s %s', $label, $info );
     }
 
     public function render(): void
     {
-        $this->app->render('panels/queries', ['queries' => $this]);
+        $this->app->render( 'panels/queries', [ 'queries' => $this ] );
     }
 
-    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;
     }