Released version 3.1

Fixes #29

CHANGELOG.md

@@ -6,6 +6,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+## 3.1 - 2019-01-22
+
+### Added
+- WooCommerce events
+- PHP version and OPcache status information
+- error message on incomplete install
+
+### Fixed
+- headers error from new line in Server Timing
+
+## 3.0.1 - 2019-01-09
+
+### Fixed
+- fatal error when HTTP request is pre–filtered
+
 ## 3.0 - 2018-12-28
 
 ### Added

composer.json

@@ -47,11 +47,6 @@
 			],
 			"symfony/stopwatch": [
 				"Tests"
-			],
-			"twbs/bootstrap"   : [
-				"docs",
-				"grunt",
-				"js/tests"
 			]
 		}
 	}

laps.php

@@ -5,7 +5,7 @@ Plugin Name: Laps
 Plugin URI: https://github.com/Rarst/laps
 Description: Light WordPress profiler.
 Author: Andrey “Rarst” Savchenko
-Version: 3.0
+Version: 3.1
 Author URI: https://www.rarst.net/
 Text Domain: laps
 Domain Path: /lang
@@ -16,6 +16,10 @@ if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
 	require __DIR__ . '/vendor/autoload.php';
 }
 
+if ( ! class_exists( '\Rarst\Laps\Plugin' ) ) {
+	trigger_error( 'Laps not fully installed! Please install with Composer or download full release archive.', E_USER_ERROR );
+}
+
 $laps = new \Rarst\Laps\Plugin();
 
 $laps->run();

src/Event/WooCommerce_Events.php

@@ -0,0 +1,24 @@
+<?php
+declare( strict_types=1 );
+
+namespace Rarst\Laps\Event;
+
+/**
+ * Events for WooCommerce plugin
+ */
+class WooCommerce_Events implements Hook_Event_Config_Interface {
+
+	/**
+	 * @return array
+	 */
+	public function get_events(): array {
+
+		return class_exists( 'WooCommerce' ) ? [
+			[ 'WooCommerce Init', 'plugin', 'before_woocommerce_init', 'woocommerce_init' ],
+			[ 'WooCommerce Shop Loop', 'plugin', 'woocommerce_before_shop_loop', 'woocommerce_after_shop_loop' ],
+			[ 'WooCommerce Single Product', 'plugin', 'woocommerce_before_single_product', 'woocommerce_after_single_product' ],
+			[ 'WooCommerce Cart', 'plugin', 'woocommerce_before_cart', 'woocommerce_after_cart' ],
+			[ 'WooCommerce Checkout', 'plugin', 'woocommerce_before_checkout_form', 'woocommerce_after_checkout_form' ],
+		] : [];
+	}
+}

src/Manager/Server_Timing_Manager.php

@@ -64,7 +64,7 @@ class Server_Timing_Manager {
 			$header .= sprintf( '%s;dur=%.2f;desc="%s", ', $record->get_category(), $duration, $record->get_name() );
 		}
 
-		header( 'Server-Timing: ' . $header );
+		header( 'Server-Timing: ' . preg_replace( '/\R/', '', $header ) );
 
 		return $input;
 	}

src/Provider/Hook_Event_Provider.php

@@ -9,6 +9,7 @@ use Rarst\Laps\Event\Core_Events;
 use Rarst\Laps\Event\Genesis_Events;
 use Rarst\Laps\Event\Hybrid_Events;
 use Rarst\Laps\Event\THA_Events;
+use Rarst\Laps\Event\WooCommerce_Events;
 use Rarst\Laps\Event\Yoast_Events;
 
 /**
@@ -23,11 +24,12 @@ class Hook_Event_Provider implements ServiceProviderInterface {
 
 		$pimple['hook.events'] = function (): array {
 			return [
-				'core'    => new Core_Events(),
-				'genesis' => new Genesis_Events(),
-				'hybrid'  => new Hybrid_Events(),
-				'tha'     => new THA_Events(),
-				'yoast'   => new Yoast_Events(),
+				'core'        => new Core_Events(),
+				'genesis'     => new Genesis_Events(),
+				'hybrid'      => new Hybrid_Events(),
+				'tha'         => new THA_Events(),
+				'woocommerce' => new WooCommerce_Events(),
+				'yoast'       => new Yoast_Events(),
 			];
 		};
 	}

src/Record/Collector/Core_Load_Collector.php

@@ -30,12 +30,19 @@ class Core_Load_Collector implements Record_Collector_Interface {
 
 		$request_time = filter_var( $_SERVER['REQUEST_TIME_FLOAT'], FILTER_VALIDATE_FLOAT );
 
+		$php = 'PHP Load – ' . PHP_VERSION;
+
+		if ( function_exists( 'opcache_get_status' ) ) {
+			$zend_status = opcache_get_status();
+			$php         .= empty( $zend_status['opcache_enabled'] ) ? '' : ' – OPcache';
+		}
+
 		/**
 		 * @var float $request_time
 		 * @var float $timestart
 		 */
 		return [
-			new Record( 'PHP Load', $request_time, $timestart - $request_time, '', 'php' ),
+			new Record( $php, $request_time, $timestart - $request_time, '', 'php' ),
 			// TODO This includes network plugins on multisite, need conditional label if Laps is network–activated.
 			new Record( 'Core and MU Plugins Load', $timestart, $this->timeload - $timestart, '', 'core' ),
 		];

src/Record/Collector/Http_Collector.php

@@ -35,16 +35,16 @@ class Http_Collector extends Stopwatch_Collector {
 	/**
 	 * Capture start time of HTTP request
 	 *
-	 * @param boolean $false Whether to preempt an HTTP request's return value. Default false.
-	 * @param array   $args  HTTP request arguments.
-	 * @param string  $url   The request URL.
+	 * @param false|array|\WP_Error $false Whether to preempt an HTTP request's return value. Default false.
+	 * @param array                 $args  HTTP request arguments.
+	 * @param string                $url   The request URL.
 	 *
 	 * @return boolean
 	 */
-	public function pre_http_request( bool $false, array $args, string $url ): bool {
+	public function pre_http_request( $false, array $args, string $url ) {
 
 		$this->start( $url, 'http' );
-		$this->callers[ $url ] = wp_debug_backtrace_summary( __CLASS__, 5, true );
+		$this->callers[ $url ] = wp_debug_backtrace_summary( __CLASS__, 5 );
 
 		return $false;
 	}

src/Record/Stopwatch_Record.php

@@ -43,7 +43,7 @@ class Stopwatch_Record implements Record_Interface {
 	public function get_description(): string {
 
 		$duration    = round( $this->stopwatch_event->getDuration() );
-		$memory      = $this->stopwatch_event->getMemory() / 1024 / 1024;
+		$memory      = round( $this->stopwatch_event->getMemory() / 1024 / 1024, 2 );
 		$description = '' !== $this->description ? "<hr />{$this->description}" : '';
 
 		return "{$this->name} – {$duration} ms – {$memory} MB{$description}";

tests/Event/EventTest.php

@@ -7,6 +7,7 @@ use Rarst\Laps\Event\Core_Events;
 use Rarst\Laps\Event\Genesis_Events;
 use Rarst\Laps\Event\Hybrid_Events;
 use Rarst\Laps\Event\THA_Events;
+use Rarst\Laps\Event\WooCommerce_Events;
 use Rarst\Laps\Event\Yoast_Events;
 use Rarst\Laps\Tests\LapsTestCase;
 
@@ -62,6 +63,19 @@ class EventTest extends LapsTestCase {
 		$this->assertNotEmpty( $events );
 	}
 
+	public function testWooCommerce() {
+
+		$woocommerce = new WooCommerce_Events();
+		$this->assertEmpty( $woocommerce->get_events() );
+
+		$this->getMockBuilder( 'WooCommerce' )->allowMockingUnknownTypes()->getMock();
+
+		$events = $woocommerce->get_events();
+
+		$this->assertInternalType( 'array', $events );
+		$this->assertNotEmpty( $events );
+	}
+
 	public function testYoast() {
 
 		$yoast = new Yoast_Events();