eventespresso / event-espresso-core

core/admin/templates/admin_details_legend.template.php

Indentation +6 added lines, -6 removed lines

@@ -24,13 +24,13 @@ 
     </dl>
     <dl class="alignleft ee-list-table-legend">
                 <?php $count = 1;
-            endif; ?>
+			endif; ?>
         <dt id="ee-legend-item-<?php echo esc_attr($item); ?>">
             <?php $class = ! empty($details['class']) ? $details['class'] : 'ee-legend-img-container'; ?>
             <?php
-            if (strpos($details['class'], '<span') !== false) {
-                echo wp_kses($class, AllowedTags::getWithFormTags());
-            } else { ?>
+			if (strpos($details['class'], '<span') !== false) {
+				echo wp_kses($class, AllowedTags::getWithFormTags());
+			} else { ?>
             <span class="<?php echo esc_attr($class); ?>">
                 <?php if (! empty($details['icon'])) : ?>
                     <img alt="<?php echo esc_attr($details['desc']); ?>"
@@ -40,11 +40,11 @@ 
                 <?php endif; ?>
             </span>
                 <?php
-            } ?>
+			} ?>
             <span class="ee-legend-description"><?php echo esc_html($details['desc']); ?></span>
         </dt>
             <?php $count++;
-        endforeach; ?>
+		endforeach; ?>
     </dl>
     <div style="clear:both"></div>
 </div>

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
                 echo wp_kses($class, AllowedTags::getWithFormTags());
             } else { ?>
             <span class="<?php echo esc_attr($class); ?>">
-                <?php if (! empty($details['icon'])) : ?>
+                <?php if ( ! empty($details['icon'])) : ?>
                     <img alt="<?php echo esc_attr($details['desc']); ?>"
                          class="ee-legend-icon"
                          src="<?php echo esc_url_raw($details['icon']); ?>"

core/admin/templates/about_admin_wrapper.template.php

Indentation +4 added lines, -4 removed lines

@@ -26,9 +26,9 @@
     <?php echo wp_kses($nav_tabs, AllowedTags::getWithFormTags()); ?>
 
     <?php
-    do_action('AHEE__admin_wrapper__template__before_about_admin_page_content');
-    echo wp_kses($about_admin_page_content, AllowedTags::getWithFormTags());
-    do_action('AHEE__admin_wrapper__template__after_about_admin_page_content');
-    ?>
+	do_action('AHEE__admin_wrapper__template__before_about_admin_page_content');
+	echo wp_kses($about_admin_page_content, AllowedTags::getWithFormTags());
+	do_action('AHEE__admin_wrapper__template__after_about_admin_page_content');
+	?>
 
 </div>

core/admin/templates/admin_details_wrapper.template.php

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 do_action('add_meta_boxes', (string) $post_type, $post);
 ?>
 
-<?php if (! empty($admin_page_header)) : ?>
+<?php if ( ! empty($admin_page_header)) : ?>
     <div id="admin-page-header">
         <?php echo wp_kses($admin_page_header, AllowedTags::getWithFormTags()); ?>
     </div>
@@ -23,7 +23,7 @@ 
     <!-- admin-page-header -->
     <div id="post-body" class="metabox-holder columns-2">
 
-        <?php if (! empty($post_body_content)) : ?>
+        <?php if ( ! empty($post_body_content)) : ?>
             <div id="post-body-content">
                 <?php echo wp_kses($post_body_content, AllowedTags::getWithFormTags()); ?>
             </div>

core/admin/templates/admin_details_wrapper_no_sidebar.template.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 <div id="<?php echo esc_attr($admin_page_wrapper_div_id); ?>">
     <div id="post-body" class="metabox-holder columns-1">
 
-        <?php if (! empty($admin_page_header)) : ?>
+        <?php if ( ! empty($admin_page_header)) : ?>
             <div id="admin-page-header">
                 <?php echo wp_kses($admin_page_header, AllowedTags::getWithFormTags()); ?>
             </div>

core/admin/templates/admin_wrapper.template.php

Indentation +6 added lines, -6 removed lines

@@ -21,11 +21,11 @@
     <?php echo wp_kses($nav_tabs, AllowedTags::getWithFormTags()); ?>
 
     <?php
-    do_action('AHEE__admin_wrapper__template__before_admin_page_content');
-    echo wp_kses($before_admin_page_content, AllowedTags::getWithFormTags());
-    echo wp_kses($admin_page_content, AllowedTags::getWithFormTags());
-    echo wp_kses($after_admin_page_content, AllowedTags::getWithFormTags());
-    do_action('AHEE__admin_wrapper__template__after_admin_page_content');
-    ?>
+	do_action('AHEE__admin_wrapper__template__before_admin_page_content');
+	echo wp_kses($before_admin_page_content, AllowedTags::getWithFormTags());
+	echo wp_kses($admin_page_content, AllowedTags::getWithFormTags());
+	echo wp_kses($after_admin_page_content, AllowedTags::getWithFormTags());
+	do_action('AHEE__admin_wrapper__template__after_admin_page_content');
+	?>
 
 </div>

core/admin/templates/admin_wrapper_ajax.template.php

Indentation +6 added lines, -6 removed lines

@@ -17,11 +17,11 @@
 
     <div class="ee-notices"><?php echo isset($ajax_notices) ? $ajax_notices  : '';// already escaped ?></div>
     <?php
-    do_action('AHEE__admin_wrapper__template__before_admin_page_content');
-    echo wp_kses($before_admin_page_content, AllowedTags::getWithFormTags());
-    echo wp_kses($admin_page_content, AllowedTags::getWithFormTags());
-    echo wp_kses($after_admin_page_content, AllowedTags::getWithFormTags());
-    do_action('AHEE__admin_wrapper__template__after_admin_page_content');
-    ?>
+	do_action('AHEE__admin_wrapper__template__before_admin_page_content');
+	echo wp_kses($before_admin_page_content, AllowedTags::getWithFormTags());
+	echo wp_kses($admin_page_content, AllowedTags::getWithFormTags());
+	echo wp_kses($after_admin_page_content, AllowedTags::getWithFormTags());
+	do_action('AHEE__admin_wrapper__template__after_admin_page_content');
+	?>
 </div>
 <!-- espresso-admin -->
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 <div class="wrap espresso-admin">
     <h1><?php esc_attr_e('Event Espresso', 'event_espresso'); ?>&nbsp;-&nbsp;<?php echo wp_kses($admin_page_title, AllowedTags::getWithFormTags()); ?></h1>
 
-    <div class="ee-notices"><?php echo isset($ajax_notices) ? $ajax_notices  : '';// already escaped ?></div>
+    <div class="ee-notices"><?php echo isset($ajax_notices) ? $ajax_notices : ''; // already escaped ?></div>
     <?php
     do_action('AHEE__admin_wrapper__template__before_admin_page_content');
     echo wp_kses($before_admin_page_content, AllowedTags::getWithFormTags());

core/services/request/middleware/PreProductionVersionWarning.php

Indentation +79 added lines, -79 removed lines

@@ -19,91 +19,91 @@
 class PreProductionVersionWarning extends Middleware
 {
 
-    /**
-     * converts a Request to a Response
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     */
-    public function handleRequest(RequestInterface $request, ResponseInterface $response)
-    {
-        $this->request = $request;
-        $this->response = $response;
-        $this->displayPreProductionVersionWarning();
-        $this->response = $this->processRequestStack($this->request, $this->response);
-        return $this->response;
-    }
+	/**
+	 * converts a Request to a Response
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @return ResponseInterface
+	 */
+	public function handleRequest(RequestInterface $request, ResponseInterface $response)
+	{
+		$this->request = $request;
+		$this->response = $response;
+		$this->displayPreProductionVersionWarning();
+		$this->response = $this->processRequestStack($this->request, $this->response);
+		return $this->response;
+	}
 
 
-    /**
-     * displays message on frontend of site notifying admin that EE has been temporarily placed into maintenance mode
-     *
-     * @return void
-     */
-    public function displayPreProductionVersionWarning()
-    {
-        // skip AJAX requests
-        if ($this->request->isAjax()) {
-            return;
-        }
-        // skip stable releases
-        if (substr(EVENT_ESPRESSO_VERSION, -5) !== '.beta') {
-            return;
-        }
-        // site admin has authorized use of non-stable release candidate for production
-        if (defined('ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE') && ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE) {
-            return;
-        }
-        // post release candidate warning
-        if ($this->request->isAdmin()) {
-            add_action('admin_notices', array($this, 'preProductionVersionAdminNotice'), -999);
-        } else {
-            add_action('shutdown', array($this, 'preProductionVersionWarningNotice'), 10);
-        }
-    }
+	/**
+	 * displays message on frontend of site notifying admin that EE has been temporarily placed into maintenance mode
+	 *
+	 * @return void
+	 */
+	public function displayPreProductionVersionWarning()
+	{
+		// skip AJAX requests
+		if ($this->request->isAjax()) {
+			return;
+		}
+		// skip stable releases
+		if (substr(EVENT_ESPRESSO_VERSION, -5) !== '.beta') {
+			return;
+		}
+		// site admin has authorized use of non-stable release candidate for production
+		if (defined('ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE') && ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE) {
+			return;
+		}
+		// post release candidate warning
+		if ($this->request->isAdmin()) {
+			add_action('admin_notices', array($this, 'preProductionVersionAdminNotice'), -999);
+		} else {
+			add_action('shutdown', array($this, 'preProductionVersionWarningNotice'), 10);
+		}
+	}
 
 
-    /**
-     * displays admin notice that current version of EE is not a stable release
-     *
-     * @return void
-     * @throws InvalidDataTypeException
-     */
-    public function preProductionVersionAdminNotice()
-    {
-        new PersistentAdminNotice(
-            'preProductionVersionAdminNotice_' . EVENT_ESPRESSO_VERSION,
-            $this->warningNotice()
-        );
-    }
+	/**
+	 * displays admin notice that current version of EE is not a stable release
+	 *
+	 * @return void
+	 * @throws InvalidDataTypeException
+	 */
+	public function preProductionVersionAdminNotice()
+	{
+		new PersistentAdminNotice(
+			'preProductionVersionAdminNotice_' . EVENT_ESPRESSO_VERSION,
+			$this->warningNotice()
+		);
+	}
 
 
-    /**
-     * displays message on frontend of site notifying admin that current version of EE is not a stable release
-     *
-     * @return void
-     */
-    public function preProductionVersionWarningNotice()
-    {
-        echo '<div id="ee-release-candidate-notice-dv" class="ee-really-important-notice-dv"><p>';
-        echo wp_kses($this->warningNotice(), AllowedTags::getAllowedTags());
-        echo '</p></div>';
-    }
+	/**
+	 * displays message on frontend of site notifying admin that current version of EE is not a stable release
+	 *
+	 * @return void
+	 */
+	public function preProductionVersionWarningNotice()
+	{
+		echo '<div id="ee-release-candidate-notice-dv" class="ee-really-important-notice-dv"><p>';
+		echo wp_kses($this->warningNotice(), AllowedTags::getAllowedTags());
+		echo '</p></div>';
+	}
 
 
-    /**
-     * @return string
-     */
-    private function warningNotice()
-    {
-        return sprintf(
-            esc_html__(
-                'This version of Event Espresso is for testing and/or evaluation purposes only. It is %1$snot%2$s considered a stable release and should therefore %1$snot%2$s be activated on a live or production website.',
-                'event_espresso'
-            ),
-            '<strong>',
-            '</strong>'
-        );
-    }
+	/**
+	 * @return string
+	 */
+	private function warningNotice()
+	{
+		return sprintf(
+			esc_html__(
+				'This version of Event Espresso is for testing and/or evaluation purposes only. It is %1$snot%2$s considered a stable release and should therefore %1$snot%2$s be activated on a live or production website.',
+				'event_espresso'
+			),
+			'<strong>',
+			'</strong>'
+		);
+	}
 }

core/services/notices/AdminNotice.php

Indentation +111 added lines, -111 removed lines

@@ -15,115 +15,115 @@
 class AdminNotice
 {
 
-    const ERROR = 'notice-error';
-
-    const WARNING = 'notice-warning';
-
-    const SUCCESS = 'notice-success';
-
-    const INFORMATION = 'notice-info';
-
-    const DISMISSABLE = ' is-dismissible';
-
-    /**
-     * generic system notice to be converted into a WP admin notice
-     *
-     * @var NoticeInterface $notice
-     */
-    private $notice;
-
-
-    /**
-     * AdminNotice constructor.
-     *
-     * @param NoticeInterface $notice
-     * @param bool            $display_now
-     */
-    public function __construct(NoticeInterface $notice, $display_now = true)
-    {
-        $this->notice = $notice;
-        if (! did_action('admin_notices')) {
-            add_action('admin_notices', array($this, 'displayNotice'));
-        } elseif ($display_now) {
-            $this->displayNotice();
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    public function displayNotice()
-    {
-        echo wp_kses($this->getNotice(), AllowedTags::getAllowedTags());
-    }
-
-
-    /**
-     * produces something  like:
-     *  <div class="notice notice-success is-dismissible event-espresso-admin-notice">
-     *      <p>YOU DID IT!</p>
-     *      <button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this
-     *      notice.</span></button>
-     *  </div>
-     *
-     * @return string
-     */
-    public function getNotice()
-    {
-        return sprintf(
-            '<div class="notice %1$s%2$s event-espresso-admin-notice"><p>%3$s</p></div>',
-            $this->getType(),
-            $this->notice->isDismissible() ? AdminNotice::DISMISSABLE : '',
-            $this->getMessage()
-        );
-    }
-
-
-    /**
-     * @return string
-     */
-    private function getType()
-    {
-        switch ($this->notice->type()) {
-            case Notice::ERROR:
-                return AdminNotice::ERROR;
-            case Notice::ATTENTION:
-                return AdminNotice::WARNING;
-            case Notice::SUCCESS:
-                return AdminNotice::SUCCESS;
-            case Notice::INFORMATION:
-            default:
-                return AdminNotice::INFORMATION;
-        }
-    }
-
-
-    /**
-     * @return string
-     */
-    protected function getMessage()
-    {
-        $message = $this->notice->message();
-        if (WP_DEBUG && $this->getType() === AdminNotice::ERROR) {
-            $message .= '<br/><span class="tiny-text">' . $this->generateErrorCode() . '</span>';
-        }
-        return $message;
-    }
-
-
-    /**
-     * create error code from filepath, function name,
-     * and line number where notice was generated
-     *
-     * @return string
-     */
-    protected function generateErrorCode()
-    {
-        $file = explode('.', basename($this->notice->file()));
-        $error_code = ! empty($file[0]) ? $file[0] : '';
-        $error_code .= ! empty($error_code) ? ' - ' . $this->notice->func() : $this->notice->func();
-        $error_code .= ' - ' . $this->notice->line();
-        return $error_code;
-    }
+	const ERROR = 'notice-error';
+
+	const WARNING = 'notice-warning';
+
+	const SUCCESS = 'notice-success';
+
+	const INFORMATION = 'notice-info';
+
+	const DISMISSABLE = ' is-dismissible';
+
+	/**
+	 * generic system notice to be converted into a WP admin notice
+	 *
+	 * @var NoticeInterface $notice
+	 */
+	private $notice;
+
+
+	/**
+	 * AdminNotice constructor.
+	 *
+	 * @param NoticeInterface $notice
+	 * @param bool            $display_now
+	 */
+	public function __construct(NoticeInterface $notice, $display_now = true)
+	{
+		$this->notice = $notice;
+		if (! did_action('admin_notices')) {
+			add_action('admin_notices', array($this, 'displayNotice'));
+		} elseif ($display_now) {
+			$this->displayNotice();
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public function displayNotice()
+	{
+		echo wp_kses($this->getNotice(), AllowedTags::getAllowedTags());
+	}
+
+
+	/**
+	 * produces something  like:
+	 *  <div class="notice notice-success is-dismissible event-espresso-admin-notice">
+	 *      <p>YOU DID IT!</p>
+	 *      <button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this
+	 *      notice.</span></button>
+	 *  </div>
+	 *
+	 * @return string
+	 */
+	public function getNotice()
+	{
+		return sprintf(
+			'<div class="notice %1$s%2$s event-espresso-admin-notice"><p>%3$s</p></div>',
+			$this->getType(),
+			$this->notice->isDismissible() ? AdminNotice::DISMISSABLE : '',
+			$this->getMessage()
+		);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	private function getType()
+	{
+		switch ($this->notice->type()) {
+			case Notice::ERROR:
+				return AdminNotice::ERROR;
+			case Notice::ATTENTION:
+				return AdminNotice::WARNING;
+			case Notice::SUCCESS:
+				return AdminNotice::SUCCESS;
+			case Notice::INFORMATION:
+			default:
+				return AdminNotice::INFORMATION;
+		}
+	}
+
+
+	/**
+	 * @return string
+	 */
+	protected function getMessage()
+	{
+		$message = $this->notice->message();
+		if (WP_DEBUG && $this->getType() === AdminNotice::ERROR) {
+			$message .= '<br/><span class="tiny-text">' . $this->generateErrorCode() . '</span>';
+		}
+		return $message;
+	}
+
+
+	/**
+	 * create error code from filepath, function name,
+	 * and line number where notice was generated
+	 *
+	 * @return string
+	 */
+	protected function generateErrorCode()
+	{
+		$file = explode('.', basename($this->notice->file()));
+		$error_code = ! empty($file[0]) ? $file[0] : '';
+		$error_code .= ! empty($error_code) ? ' - ' . $this->notice->func() : $this->notice->func();
+		$error_code .= ' - ' . $this->notice->line();
+		return $error_code;
+	}
 }

core/services/Benchmark.php

Indentation +320 added lines, -320 removed lines

@@ -16,324 +16,324 @@
 class Benchmark
 {
 
-    /**
-     * @var string $output
-     */
-    private static $output;
-
-    /**
-     * @var array $start_times array containing the start time for the timers
-     */
-    private static $start_times;
-
-    /**
-     * @var array $times array containing all the timer'd times, which can be outputted via show_times()
-     */
-    private static $times = array();
-
-    /**
-     * @var array $memory_usage
-     */
-    protected static $memory_usage = array();
-
-
-    /**
-     * @param string $output
-     * @param bool   $formatted
-     */
-    public static function addOutput($output, $formatted = true)
-    {
-        Benchmark::$output .= $formatted
-            ? "<br />{$output}"
-            : "\n{$output}";
-    }
-
-
-    /**
-     * @return void
-     */
-    public static function resetOutput()
-    {
-        Benchmark::$output = '';
-    }
-
-    /**
-     * whether to benchmark code or not
-     */
-    public static function doNotRun()
-    {
-        return ! WP_DEBUG || (defined('DOING_AJAX') && DOING_AJAX);
-    }
-
-
-    /**
-     * resetTimes
-     */
-    public static function resetTimes()
-    {
-        Benchmark::$times = array();
-    }
-
-
-    /**
-     * Add Benchmark::startTimer() before a block of code you want to measure the performance of
-     *
-     * @param null $timer_name
-     */
-    public static function startTimer($timer_name = null)
-    {
-        if (Benchmark::doNotRun()) {
-            return;
-        }
-        $timer_name = $timer_name !== '' ? $timer_name : get_called_class();
-        Benchmark::$start_times[ $timer_name ] = microtime(true);
-    }
-
-
-    /**
-     * Add Benchmark::stopTimer() after a block of code you want to measure the performance of
-     *
-     * @param string $timer_name
-     */
-    public static function stopTimer($timer_name = '')
-    {
-        if (Benchmark::doNotRun()) {
-            return;
-        }
-        $timer_name = $timer_name !== '' ? $timer_name : get_called_class();
-        if (isset(Benchmark::$start_times[ $timer_name ])) {
-            $start_time = Benchmark::$start_times[ $timer_name ];
-            unset(Benchmark::$start_times[ $timer_name ]);
-        } else {
-            $start_time = array_pop(Benchmark::$start_times);
-        }
-        Benchmark::$times[ $timer_name ] = number_format(microtime(true) - $start_time, 8);
-    }
-
-
-    /**
-     * Measure the memory usage by PHP so far.
-     *
-     * @param string  $label      The label to show for this time eg "Start of calling Some_Class::some_function"
-     * @param boolean $output_now whether to echo now, or wait until EEH_Debug_Tools::show_times() is called
-     * @param bool    $formatted
-     * @return void
-     */
-    public static function measureMemory($label = 'memory usage', $output_now = false, $formatted = true)
-    {
-        if (Benchmark::doNotRun()) {
-            return;
-        }
-        $memory_used = Benchmark::convert(memory_get_usage(true));
-        Benchmark::$memory_usage[ $label ] = $memory_used;
-        if ($output_now) {
-            echo ($formatted
-                ? "<br>{$label} : {$memory_used}"
-                : "\n {$label} : {$memory_used}");
-        }
-    }
-
-
-    /**
-     * will display the benchmarking results at shutdown
-     *
-     * @param bool $formatted
-     * @return void
-     */
-    public static function displayResultsAtShutdown($formatted = true)
-    {
-        Benchmark::resetOutput();
-        add_action(
-            'shutdown',
-            function () use ($formatted) {
-                Benchmark::displayResults(true, $formatted);
-            },
-            999999
-        );
-    }
-
-
-    /**
-     * will display the benchmarking results at shutdown
-     *
-     * @param string $filepath
-     * @param bool   $formatted
-     * @param bool   $append
-     * @return void
-     */
-    public static function writeResultsAtShutdown($filepath = '', $formatted = true, $append = true)
-    {
-        Benchmark::resetOutput();
-        add_action(
-            'shutdown',
-            function () use ($filepath, $formatted, $append) {
-                Benchmark::writeResultsToFile($filepath, $formatted, $append);
-            },
-            999999
-        );
-    }
-
-
-    /**
-     * @param bool $formatted
-     * @return string
-     */
-    private static function generateResults($formatted = true)
-    {
-        if (Benchmark::doNotRun()) {
-            return '';
-        }
-        if (! empty(Benchmark::$times)) {
-            $total = 0;
-            Benchmark::$output .= $formatted
-                ? '<span style="color:#999999; font-size:.8em;">( time in milliseconds )</span><br />'
-                : '';
-            foreach (Benchmark::$times as $timer_name => $total_time) {
-                Benchmark::$output .= Benchmark::formatTime($timer_name, $total_time, $formatted);
-                Benchmark::$output .= $formatted ? '<br />' : "\n";
-                $total += $total_time;
-            }
-            if ($formatted) {
-                Benchmark::$output .= '<br />';
-                Benchmark::$output .= '<h4>TOTAL TIME</h4>';
-                Benchmark::$output .= Benchmark::formatTime('', $total, $formatted);
-                Benchmark::$output .= '<span style="color:#999999; font-size:.8em;"> milliseconds</span><br />';
-                Benchmark::$output .= '<br />';
-                Benchmark::$output .= '<h5>Performance scale (from best to worse)</h5>';
-                Benchmark::$output .= '<span style="color:mediumpurple">Like wow! How about a Scooby snack?</span><br />';
-                Benchmark::$output .= '<span style="color:deepskyblue">Like...no way man!</span><br />';
-                Benchmark::$output .= '<span style="color:limegreen">Like...groovy!</span><br />';
-                Benchmark::$output .= '<span style="color:gold">Ruh Oh</span><br />';
-                Benchmark::$output .= '<span style="color:darkorange">Zoinks!</span><br />';
-                Benchmark::$output .= '<span style="color:red">Like...HEEELLLP</span><br />';
-            }
-        }
-        if (! empty(Benchmark::$memory_usage)) {
-            Benchmark::$output .= $formatted
-                ? '<h5>Memory</h5>'
-                : "\nMemory";
-            foreach (Benchmark::$memory_usage as $label => $memory_usage) {
-                Benchmark::$output .= $formatted
-                    ? "<br />{$memory_usage} : {$label}"
-                    : "\n{$memory_usage} : {$label}";
-            }
-        }
-        if (empty(Benchmark::$output)) {
-            return '';
-        }
-        Benchmark::$output = $formatted
-            ? '<div style="border:1px solid #dddddd; background-color:#ffffff;'
-              . (is_admin()
-                ? ' margin:2em 2em 2em 180px;'
-                : ' margin:2em;')
-              . ' padding:2em;">'
-              . '<h4>BENCHMARKING</h4>'
-              . Benchmark::$output
-              . '</div>'
-            : Benchmark::$output;
-        return Benchmark::$output;
-    }
-
-
-    /**
-     * @param bool $echo
-     * @param bool $formatted
-     * @return string
-     */
-    public static function displayResults($echo = true, $formatted = true)
-    {
-        $results = Benchmark::generateResults($formatted);
-        if ($echo) {
-            echo wp_kses($results, AllowedTags::getWithFormTags());
-            return '';
-        }
-        return $results;
-    }
-
-
-    /**
-     * @param string $filepath
-     * @param bool   $formatted
-     * @param bool   $append
-     * @throws EE_Error
-     */
-    public static function writeResultsToFile($filepath = '', $formatted = true, $append = true)
-    {
-        $filepath = ! empty($filepath) && is_readable(dirname($filepath))
-            ? $filepath
-            : '';
-        if (empty($filepath)) {
-            $filepath = EVENT_ESPRESSO_UPLOAD_DIR . 'logs/benchmarking-' . date('Y-m-d') . '.html';
-        }
-        EEH_File::ensure_file_exists_and_is_writable($filepath);
-        file_put_contents(
-            $filepath,
-            "\n" . date('Y-m-d H:i:s') . Benchmark::generateResults($formatted),
-            $append ? FILE_APPEND | LOCK_EX : LOCK_EX
-        );
-    }
-
-
-    /**
-     * Converts a measure of memory bytes into the most logical units (eg kb, mb, etc)
-     *
-     * @param int $size
-     * @return string
-     */
-    public static function convert($size)
-    {
-        $unit = array('b', 'kb', 'mb', 'gb', 'tb', 'pb');
-        return round(
-            $size / pow(1024, $i = floor(log($size, 1024))),
-            2
-        ) . ' ' . $unit[ absint($i) ];
-    }
-
-
-    /**
-     * @param string $timer_name
-     * @param float  $total_time
-     * @param bool   $formatted
-     * @return string
-     */
-    public static function formatTime($timer_name, $total_time, $formatted = true)
-    {
-        $total_time *= 1000;
-        switch ($total_time) {
-            case $total_time > 12500:
-                $color = 'red';
-                $bold = 'bold';
-                break;
-            case $total_time > 2500:
-                $color = 'darkorange';
-                $bold = 'bold';
-                break;
-            case $total_time > 500:
-                $color = 'gold';
-                $bold = 'bold';
-                break;
-            case $total_time > 100:
-                $color = 'limegreen';
-                $bold = 'normal';
-                break;
-            case $total_time > 20:
-                $color = 'deepskyblue';
-                $bold = 'normal';
-                break;
-            default:
-                $color = 'mediumpurple';
-                $bold = 'normal';
-                break;
-        }
-        return $formatted
-            ? '<span style="min-width: 10px; margin:0 1em; color:'
-              . $color
-              . '; font-weight:'
-              . $bold
-              . '; font-size:1.2em;">'
-              . str_pad(number_format($total_time, 3), 9, '0', STR_PAD_LEFT)
-              . '</span> '
-              . $timer_name
-            : str_pad(number_format($total_time, 3), 9, '0', STR_PAD_LEFT);
-    }
+	/**
+	 * @var string $output
+	 */
+	private static $output;
+
+	/**
+	 * @var array $start_times array containing the start time for the timers
+	 */
+	private static $start_times;
+
+	/**
+	 * @var array $times array containing all the timer'd times, which can be outputted via show_times()
+	 */
+	private static $times = array();
+
+	/**
+	 * @var array $memory_usage
+	 */
+	protected static $memory_usage = array();
+
+
+	/**
+	 * @param string $output
+	 * @param bool   $formatted
+	 */
+	public static function addOutput($output, $formatted = true)
+	{
+		Benchmark::$output .= $formatted
+			? "<br />{$output}"
+			: "\n{$output}";
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public static function resetOutput()
+	{
+		Benchmark::$output = '';
+	}
+
+	/**
+	 * whether to benchmark code or not
+	 */
+	public static function doNotRun()
+	{
+		return ! WP_DEBUG || (defined('DOING_AJAX') && DOING_AJAX);
+	}
+
+
+	/**
+	 * resetTimes
+	 */
+	public static function resetTimes()
+	{
+		Benchmark::$times = array();
+	}
+
+
+	/**
+	 * Add Benchmark::startTimer() before a block of code you want to measure the performance of
+	 *
+	 * @param null $timer_name
+	 */
+	public static function startTimer($timer_name = null)
+	{
+		if (Benchmark::doNotRun()) {
+			return;
+		}
+		$timer_name = $timer_name !== '' ? $timer_name : get_called_class();
+		Benchmark::$start_times[ $timer_name ] = microtime(true);
+	}
+
+
+	/**
+	 * Add Benchmark::stopTimer() after a block of code you want to measure the performance of
+	 *
+	 * @param string $timer_name
+	 */
+	public static function stopTimer($timer_name = '')
+	{
+		if (Benchmark::doNotRun()) {
+			return;
+		}
+		$timer_name = $timer_name !== '' ? $timer_name : get_called_class();
+		if (isset(Benchmark::$start_times[ $timer_name ])) {
+			$start_time = Benchmark::$start_times[ $timer_name ];
+			unset(Benchmark::$start_times[ $timer_name ]);
+		} else {
+			$start_time = array_pop(Benchmark::$start_times);
+		}
+		Benchmark::$times[ $timer_name ] = number_format(microtime(true) - $start_time, 8);
+	}
+
+
+	/**
+	 * Measure the memory usage by PHP so far.
+	 *
+	 * @param string  $label      The label to show for this time eg "Start of calling Some_Class::some_function"
+	 * @param boolean $output_now whether to echo now, or wait until EEH_Debug_Tools::show_times() is called
+	 * @param bool    $formatted
+	 * @return void
+	 */
+	public static function measureMemory($label = 'memory usage', $output_now = false, $formatted = true)
+	{
+		if (Benchmark::doNotRun()) {
+			return;
+		}
+		$memory_used = Benchmark::convert(memory_get_usage(true));
+		Benchmark::$memory_usage[ $label ] = $memory_used;
+		if ($output_now) {
+			echo ($formatted
+				? "<br>{$label} : {$memory_used}"
+				: "\n {$label} : {$memory_used}");
+		}
+	}
+
+
+	/**
+	 * will display the benchmarking results at shutdown
+	 *
+	 * @param bool $formatted
+	 * @return void
+	 */
+	public static function displayResultsAtShutdown($formatted = true)
+	{
+		Benchmark::resetOutput();
+		add_action(
+			'shutdown',
+			function () use ($formatted) {
+				Benchmark::displayResults(true, $formatted);
+			},
+			999999
+		);
+	}
+
+
+	/**
+	 * will display the benchmarking results at shutdown
+	 *
+	 * @param string $filepath
+	 * @param bool   $formatted
+	 * @param bool   $append
+	 * @return void
+	 */
+	public static function writeResultsAtShutdown($filepath = '', $formatted = true, $append = true)
+	{
+		Benchmark::resetOutput();
+		add_action(
+			'shutdown',
+			function () use ($filepath, $formatted, $append) {
+				Benchmark::writeResultsToFile($filepath, $formatted, $append);
+			},
+			999999
+		);
+	}
+
+
+	/**
+	 * @param bool $formatted
+	 * @return string
+	 */
+	private static function generateResults($formatted = true)
+	{
+		if (Benchmark::doNotRun()) {
+			return '';
+		}
+		if (! empty(Benchmark::$times)) {
+			$total = 0;
+			Benchmark::$output .= $formatted
+				? '<span style="color:#999999; font-size:.8em;">( time in milliseconds )</span><br />'
+				: '';
+			foreach (Benchmark::$times as $timer_name => $total_time) {
+				Benchmark::$output .= Benchmark::formatTime($timer_name, $total_time, $formatted);
+				Benchmark::$output .= $formatted ? '<br />' : "\n";
+				$total += $total_time;
+			}
+			if ($formatted) {
+				Benchmark::$output .= '<br />';
+				Benchmark::$output .= '<h4>TOTAL TIME</h4>';
+				Benchmark::$output .= Benchmark::formatTime('', $total, $formatted);
+				Benchmark::$output .= '<span style="color:#999999; font-size:.8em;"> milliseconds</span><br />';
+				Benchmark::$output .= '<br />';
+				Benchmark::$output .= '<h5>Performance scale (from best to worse)</h5>';
+				Benchmark::$output .= '<span style="color:mediumpurple">Like wow! How about a Scooby snack?</span><br />';
+				Benchmark::$output .= '<span style="color:deepskyblue">Like...no way man!</span><br />';
+				Benchmark::$output .= '<span style="color:limegreen">Like...groovy!</span><br />';
+				Benchmark::$output .= '<span style="color:gold">Ruh Oh</span><br />';
+				Benchmark::$output .= '<span style="color:darkorange">Zoinks!</span><br />';
+				Benchmark::$output .= '<span style="color:red">Like...HEEELLLP</span><br />';
+			}
+		}
+		if (! empty(Benchmark::$memory_usage)) {
+			Benchmark::$output .= $formatted
+				? '<h5>Memory</h5>'
+				: "\nMemory";
+			foreach (Benchmark::$memory_usage as $label => $memory_usage) {
+				Benchmark::$output .= $formatted
+					? "<br />{$memory_usage} : {$label}"
+					: "\n{$memory_usage} : {$label}";
+			}
+		}
+		if (empty(Benchmark::$output)) {
+			return '';
+		}
+		Benchmark::$output = $formatted
+			? '<div style="border:1px solid #dddddd; background-color:#ffffff;'
+			  . (is_admin()
+				? ' margin:2em 2em 2em 180px;'
+				: ' margin:2em;')
+			  . ' padding:2em;">'
+			  . '<h4>BENCHMARKING</h4>'
+			  . Benchmark::$output
+			  . '</div>'
+			: Benchmark::$output;
+		return Benchmark::$output;
+	}
+
+
+	/**
+	 * @param bool $echo
+	 * @param bool $formatted
+	 * @return string
+	 */
+	public static function displayResults($echo = true, $formatted = true)
+	{
+		$results = Benchmark::generateResults($formatted);
+		if ($echo) {
+			echo wp_kses($results, AllowedTags::getWithFormTags());
+			return '';
+		}
+		return $results;
+	}
+
+
+	/**
+	 * @param string $filepath
+	 * @param bool   $formatted
+	 * @param bool   $append
+	 * @throws EE_Error
+	 */
+	public static function writeResultsToFile($filepath = '', $formatted = true, $append = true)
+	{
+		$filepath = ! empty($filepath) && is_readable(dirname($filepath))
+			? $filepath
+			: '';
+		if (empty($filepath)) {
+			$filepath = EVENT_ESPRESSO_UPLOAD_DIR . 'logs/benchmarking-' . date('Y-m-d') . '.html';
+		}
+		EEH_File::ensure_file_exists_and_is_writable($filepath);
+		file_put_contents(
+			$filepath,
+			"\n" . date('Y-m-d H:i:s') . Benchmark::generateResults($formatted),
+			$append ? FILE_APPEND | LOCK_EX : LOCK_EX
+		);
+	}
+
+
+	/**
+	 * Converts a measure of memory bytes into the most logical units (eg kb, mb, etc)
+	 *
+	 * @param int $size
+	 * @return string
+	 */
+	public static function convert($size)
+	{
+		$unit = array('b', 'kb', 'mb', 'gb', 'tb', 'pb');
+		return round(
+			$size / pow(1024, $i = floor(log($size, 1024))),
+			2
+		) . ' ' . $unit[ absint($i) ];
+	}
+
+
+	/**
+	 * @param string $timer_name
+	 * @param float  $total_time
+	 * @param bool   $formatted
+	 * @return string
+	 */
+	public static function formatTime($timer_name, $total_time, $formatted = true)
+	{
+		$total_time *= 1000;
+		switch ($total_time) {
+			case $total_time > 12500:
+				$color = 'red';
+				$bold = 'bold';
+				break;
+			case $total_time > 2500:
+				$color = 'darkorange';
+				$bold = 'bold';
+				break;
+			case $total_time > 500:
+				$color = 'gold';
+				$bold = 'bold';
+				break;
+			case $total_time > 100:
+				$color = 'limegreen';
+				$bold = 'normal';
+				break;
+			case $total_time > 20:
+				$color = 'deepskyblue';
+				$bold = 'normal';
+				break;
+			default:
+				$color = 'mediumpurple';
+				$bold = 'normal';
+				break;
+		}
+		return $formatted
+			? '<span style="min-width: 10px; margin:0 1em; color:'
+			  . $color
+			  . '; font-weight:'
+			  . $bold
+			  . '; font-size:1.2em;">'
+			  . str_pad(number_format($total_time, 3), 9, '0', STR_PAD_LEFT)
+			  . '</span> '
+			  . $timer_name
+			: str_pad(number_format($total_time, 3), 9, '0', STR_PAD_LEFT);
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -86,7 +86,7 @@ 
             return;
         }
         $timer_name = $timer_name !== '' ? $timer_name : get_called_class();
-        Benchmark::$start_times[ $timer_name ] = microtime(true);
+        Benchmark::$start_times[$timer_name] = microtime(true);
     }
 
 
@@ -101,13 +101,13 @@ 
             return;
         }
         $timer_name = $timer_name !== '' ? $timer_name : get_called_class();
-        if (isset(Benchmark::$start_times[ $timer_name ])) {
-            $start_time = Benchmark::$start_times[ $timer_name ];
-            unset(Benchmark::$start_times[ $timer_name ]);
+        if (isset(Benchmark::$start_times[$timer_name])) {
+            $start_time = Benchmark::$start_times[$timer_name];
+            unset(Benchmark::$start_times[$timer_name]);
         } else {
             $start_time = array_pop(Benchmark::$start_times);
         }
-        Benchmark::$times[ $timer_name ] = number_format(microtime(true) - $start_time, 8);
+        Benchmark::$times[$timer_name] = number_format(microtime(true) - $start_time, 8);
     }
 
 
@@ -125,7 +125,7 @@ 
             return;
         }
         $memory_used = Benchmark::convert(memory_get_usage(true));
-        Benchmark::$memory_usage[ $label ] = $memory_used;
+        Benchmark::$memory_usage[$label] = $memory_used;
         if ($output_now) {
             echo ($formatted
                 ? "<br>{$label} : {$memory_used}"
@@ -145,7 +145,7 @@ 
         Benchmark::resetOutput();
         add_action(
             'shutdown',
-            function () use ($formatted) {
+            function() use ($formatted) {
                 Benchmark::displayResults(true, $formatted);
             },
             999999
@@ -166,7 +166,7 @@ 
         Benchmark::resetOutput();
         add_action(
             'shutdown',
-            function () use ($filepath, $formatted, $append) {
+            function() use ($filepath, $formatted, $append) {
                 Benchmark::writeResultsToFile($filepath, $formatted, $append);
             },
             999999
@@ -183,7 +183,7 @@ 
         if (Benchmark::doNotRun()) {
             return '';
         }
-        if (! empty(Benchmark::$times)) {
+        if ( ! empty(Benchmark::$times)) {
             $total = 0;
             Benchmark::$output .= $formatted
                 ? '<span style="color:#999999; font-size:.8em;">( time in milliseconds )</span><br />'
@@ -208,7 +208,7 @@ 
                 Benchmark::$output .= '<span style="color:red">Like...HEEELLLP</span><br />';
             }
         }
-        if (! empty(Benchmark::$memory_usage)) {
+        if ( ! empty(Benchmark::$memory_usage)) {
             Benchmark::$output .= $formatted
                 ? '<h5>Memory</h5>'
                 : "\nMemory";
@@ -263,12 +263,12 @@ 
             ? $filepath
             : '';
         if (empty($filepath)) {
-            $filepath = EVENT_ESPRESSO_UPLOAD_DIR . 'logs/benchmarking-' . date('Y-m-d') . '.html';
+            $filepath = EVENT_ESPRESSO_UPLOAD_DIR.'logs/benchmarking-'.date('Y-m-d').'.html';
         }
         EEH_File::ensure_file_exists_and_is_writable($filepath);
         file_put_contents(
             $filepath,
-            "\n" . date('Y-m-d H:i:s') . Benchmark::generateResults($formatted),
+            "\n".date('Y-m-d H:i:s').Benchmark::generateResults($formatted),
             $append ? FILE_APPEND | LOCK_EX : LOCK_EX
         );
     }
@@ -286,7 +286,7 @@ 
         return round(
             $size / pow(1024, $i = floor(log($size, 1024))),
             2
-        ) . ' ' . $unit[ absint($i) ];
+        ).' '.$unit[absint($i)];
     }