Released version 3.3.7

See #58

.github/workflows/tests.yml

@@ -0,0 +1,43 @@
+name: Tests
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  tests:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.2'
+          tools: phpunit:8,psalm
+
+      - name: Setup problem matchers for PHPUnit
+        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Get composer cache directory
+        id: composercache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.composercache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - run: composer install --no-interaction
+
+      - name: Psalm
+        run: psalm --output-format=github
+        if: always()
+
+      - name: PHPUnit
+        run: phpunit --coverage-text
+        if: always()

CHANGELOG.md

@@ -6,6 +6,113 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+## 3.3.7 - 2022-06-16
+
+### Fixed
+- PHP warning, when accessing OPcache status with `opcache.restrict_api`
+
+## 3.3.6 - 2022-02-08
+
+### Changed
+- updated dependencies (Mustache.php, Pimple)
+- minimum required PHP version 7.2.5 (was de-facto required by dependencies before)
+
+### Fixed
+- deprecation notices on PHP 8.1
+
+## 3.3.5 - 2021-09-28
+
+### Changed
+- reduced maximum Server Timing headers size to 2K (half of possible nginx defaults) 
+
+### Fixed
+- allowed Composer install on PHP 8
+
+## 3.3.4 - 2020-11-16
+
+### Fixed
+- non-ASCII characters in Server Timing headers
+
+## 3.3.3 - 2020-03-11
+
+### Fixed
+- wrong plugin version in header
+
+## 3.3.2 - 2020-03-11
+
+### Changed
+- `Bootable_Provider_Interface` to extend `ServiceProviderInterface`, so that it can be mocked in PHPUnit 9
+
+### Fixed
+- Mustache.php version to resolve issues on PHP 7.4
+- type crash when URL passed to network request filters is invalid
+- large server timing headers breaking proxies
+
+## 3.3.1 - 2019-07-02
+
+### Fixed
+- crash from broken plugin loaded hook input from global
+
+## 3.3 - 2019-03-27
+
+### Added
+- plotting of early SQL queries (WP 5.1+)
+- tracking load of individual plugin load (WP 5.1+)
+
+### Changed
+- unit tests for PHPUnit 8
+
+### Fixed
+- error when formatting empty hook.
+
+## 3.2 - 2019-01-30
+
+### Added
+- Beaver Builder events
+- error message on unsupported PHP version
+
+### Fixed
+- handling of reoccurring hook events
+- tracking of load events when network–activated
+
+### Deprecated
+- dedicated classes for extension events
+
+## 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
+- call backtraces to SQL records and HTTP calls
+- new format of hook events
+- sidebar tracking
+- list of callbacks to hook events
+- Server Timing output for Ajax and REST APIs
+- lazy records collector to pass around instead of whole container
+
+### Changed
+- required PHP version to 7.1
+- organization and names for Record classes
+
+### Deprecated
+- old format of hook events
+
+### Fixed
+- error when no SQL queries logged by core
+
 ## 2.0 - 2018-02-26
 
 ### Added

README.md

@@ -1,42 +1,52 @@
+![Laps v3 toolbar screenshot](https://i.imgur.com/NtgAxhp.png)
+
 # Laps — light WordPress profiler
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/Rarst/laps/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/Rarst/laps/?branch=master)
-[![Build Status](https://scrutinizer-ci.com/g/Rarst/laps/badges/build.png?b=master)](https://scrutinizer-ci.com/g/Rarst/laps/build-status/master)
-[![Code Coverage](https://scrutinizer-ci.com/g/Rarst/laps/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/Rarst/laps/?branch=master)
-[![Total Downloads](https://img.shields.io/packagist/dt/rarst/laps.svg)](https://packagist.org/packages/rarst/laps)
-[![Latest Stable Version](https://img.shields.io/packagist/v/rarst/laps.svg?label=version)](https://packagist.org/packages/rarst/laps)
-[![PHP from Packagist](https://img.shields.io/packagist/php-v/rarst/laps.svg)](https://packagist.org/packages/rarst/laps)
-[![PDS Skeleton](https://img.shields.io/badge/pds-skeleton-blue.svg)](https://github.com/php-pds/skeleton)
 
 _Make a site, make it fast._
 
-![Laps v2 screenshot](https://i.imgur.com/6n36KPE.png)
+[![Tests Status](https://github.com/rarst/laps/actions/workflows/tests.yml/badge.svg)](https://github.com/Rarst/laps/actions/workflows/tests.yml)
+[![Total Downloads](https://img.shields.io/packagist/dt/rarst/laps.svg)](https://packagist.org/packages/rarst/laps)
+[![Latest Stable Version](https://img.shields.io/packagist/v/rarst/laps.svg?label=version)](https://packagist.org/packages/rarst/laps)
+[![PHP from Packagist](https://img.shields.io/packagist/php-v/rarst/laps.svg)](https://packagist.org/packages/rarst/laps)
+[![Download Laps](https://img.shields.io/badge/download-laps.zip-blue)](https://github.com/Rarst/laps/releases/latest/download/laps.zip)
 
 Laps is a plugin that **shows performance information** about WordPress page load.
 
 It provides a visual summary in toolbar that is quick and easy to inspect.
 
-Laps tracks many events, such as:
-- PHP, core, plugins, and themes load
-- database queries (with [`SAVEQUERIES` constant](http://codex.wordpress.org/Editing_wp-config.php#Save_queries_for_analysis) enabled)
+## Page profiling
+
+Laps automatically tracks many events, such as:
+- PHP, core, plugins, and themes load, main posts loop, sidebars
+- database queries (with [`SAVEQUERIES` defined constant set to true](https://wordpress.org/support/article/editing-wp-config-php/#save-queries-for-analysis))
 - network requests to other sites 
-- main posts loop
-- events for supported theme frameworks: 
-  - [Theme Hook Alliance](http://zamoose.github.io/themehookalliance/)
-  - [Hybrid](http://themehybrid.com/)
-  - [Genesis](http://my.studiopress.com/themes/genesis/)
-- events for supported plugins:
-  - [Yoast SEO](https://wordpress.org/plugins/wordpress-seo/) 
+
+## API profiling
+
+For Ajax and REST API — Laps outputs performance information by Server Timing API, for use with clients such as Chrome Dev Tools.
+
+![Laps v3 dev tools screenshot](https://i.imgur.com/hkl1Qk9.png)
+
+### API authentication
+
+API requests need to be authenticated as admin for performance data to be sent. For Ajax requests cookies are sufficient. REST API requests also [need nonce passed](https://developer.wordpress.org/rest-api/using-the-rest-api/authentication/#cookie-authentication).
+
+`laps_can_see` check can be filtered to relax required permissions on the plugin’s side.
 
 ## Installation
 
-Require with [Composer](https://getcomposer.org/):
+| [Composer](https://getcomposer.org/) (recommended) | Release archive |
+| -------------------------------------------------- | -------- |
+| `composer require rarst/laps` | [![Download Laps](https://img.shields.io/badge/download-laps.zip-blue?style=for-the-badge)](https://github.com/Rarst/laps/releases/latest/download/laps.zip)|
+
+## Tests
+
+Tests require [Brain Monkey](https://github.com/Brain-WP/BrainMonkey) (included in dependencies) and PHPUnit 8 (not included).
 
 ```bash
-composer require rarst/laps
+phpunit
 ```
 
-Or download plugin archive from [releases section](https://github.com/Rarst/laps/releases).
-
 ## License
 
 MIT

RoboFile.php

@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 require __DIR__ . '/vendor/autoload.php';
 
@@ -15,13 +16,13 @@ class RoboFile extends \Robo\Tasks {
 	public function watch() {
 
 		$this->taskWatch()
-			 ->monitor( [ 'public/css/variables.less', 'public/css/laps.less' ], function () {
-				 $this->makeCss();
-			 } )
-			 ->monitor( 'public/js/source.js', function () {
-				 $this->makeJs();
-			 } )
-			 ->run();
+		     ->monitor( [ 'public/css/variables.less', 'public/css/laps.less' ], function () {
+			     $this->makeCss();
+		     } )
+		     ->monitor( 'public/js/source.js', function () {
+			     $this->makeJs();
+		     } )
+		     ->run();
 	}
 
 	/**
@@ -42,7 +43,7 @@ class RoboFile extends \Robo\Tasks {
 		$this->taskExec( 'lessc public/css/laps.less public/css/laps.css --source-map=public/css/laps.css.map' )->run();
 
 		$this->taskMinify( 'public/css/laps.css' )
-			 ->run();
+		     ->run();
 	}
 
 	/**
@@ -54,11 +55,11 @@ class RoboFile extends \Robo\Tasks {
 			'vendor/twbs/bootstrap/js/tooltip.js',
 			'public/js/source.js',
 		] )
-			 ->to( 'public/js/laps.js' )
-			 ->run();
+		     ->to( 'public/js/laps.js' )
+		     ->run();
 
 		$this->taskMinify( 'public/js/laps.js' )
-			 ->run();
+		     ->run();
 	}
 
 	/**
@@ -68,14 +69,65 @@ class RoboFile extends \Robo\Tasks {
 		$dir = __DIR__ . '/src/mustache/cache';
 		$this->_cleanDir( $dir );
 		$mustache = new \Mustache_Engine(
-			array(
+			[
 				'loader' => new \Mustache_Loader_FilesystemLoader( __DIR__ . '/src/mustache' ),
 				'cache'  => $dir,
-			)
+			]
 		);
 		$mustache->loadTemplate( 'laps' );
 	}
 
+	/**
+	 * Creates release zip
+	 *
+	 * @param string $php PHP version to target.
+	 */
+	public function makeArchive( $php = '7.2.5' ): void {
+
+		$composer = json_decode( file_get_contents( __DIR__ . '/composer.json' ) );
+		$package  = $composer->name;
+
+		[ $vendor, $name ] = explode( '/', $package );
+
+		if ( empty( $vendor ) || empty( $name ) ) {
+			return;
+		}
+
+		$this->_mkdir( 'release' );
+
+		$version = $this->latestTag();
+
+		$this->taskExec( "composer create-project {$package} {$name} {$version}" )
+		     ->dir( __DIR__ . '/release' )
+		     ->arg( '--prefer-dist' )
+		     ->arg( '--no-install' )
+		     ->run();
+
+		if ( $php ) {
+			$this->taskExec( "composer config platform.php {$php}" )
+			     ->dir( __DIR__ . "/release/{$name}" )
+			     ->run();
+		}
+
+		$this->taskExec( 'composer remove composer/installers --no-update' )
+		     ->dir( __DIR__ . "/release/{$name}" )
+		     ->run();
+
+		$this->taskExec( 'composer update --no-dev --optimize-autoloader' )
+		     ->dir( __DIR__ . "/release/{$name}" )
+		     ->run();
+
+		$zipFile = "release/{$name}.zip";
+
+		$this->_remove( $zipFile );
+
+		$this->taskPack( $zipFile )
+		     ->addDir( $name, "release/{$name}" )
+		     ->run();
+
+		$this->_deleteDir( "release/{$name}" );
+	}
+
 	/**
 	 * Updates version in header and makes git version tag.
 	 *
@@ -83,12 +135,13 @@ class RoboFile extends \Robo\Tasks {
 	 */
 	public function tag( $version ) {
 
-		$this->versionSet( $version );
+		$this->makeVersion( $version );
 
 		$this->taskGitStack()
 		     ->stopOnFail()
+		     ->add( 'CHANGELOG.md' )
 		     ->add( 'laps.php' )
-		     ->commit( "Updated header version to {$version}" )
+		     ->commit( "Released version $version" )
 		     ->tag( $version )
 		     ->run();
 	}
@@ -98,11 +151,31 @@ class RoboFile extends \Robo\Tasks {
 	 *
 	 * @param string $version Version string.
 	 */
-	public function versionSet( $version ) {
+	public function makeVersion( $version ) {
+
+		$this->taskReplaceInFile( 'CHANGELOG.md' )
+		     ->from( '## Unreleased' )
+		     ->to( '## Unreleased' . PHP_EOL . PHP_EOL . "## $version - " . date_format( date_create(), 'Y-m-d' ) )
+		     ->run();
 
 		$this->taskReplaceInFile( 'laps.php' )
 		     ->regex( '|^Version:.*$|m' )
 		     ->to( 'Version: ' . $version )
 		     ->run();
 	}
+
+	public function upload() {
+		$version = $this->latestTag();
+		$zipFile = __DIR__ . '/release/laps.zip';
+
+		$this->makeArchive();
+		$this->_exec("gh release upload $version $zipFile");
+		$this->_remove( $zipFile );
+	}
+
+	private function latestTag(): string {
+		$commit = escapeshellarg( exec( 'git rev-list --tags --max-count=1' ) );
+
+		return escapeshellarg( exec( "git describe --tags {$commit}" ) );
+	}
 }

composer.json

@@ -8,7 +8,7 @@
 	"authors"    : [
 		{
 			"name"    : "Andrey Savchenko",
-			"homepage": "http://www.Rarst.net/"
+			"homepage": "https://www.Rarst.net/"
 		}
 	],
 	"support"    : {
@@ -25,15 +25,37 @@
 		}
 	},
 	"require"    : {
-		"php"                : ">=5.6",
-		"composer/installers": "~1.0",
-		"symfony/stopwatch"  : "^3.4.4",
-		"mustache/mustache"  : "~2.4",
-		"pimple/pimple"      : "^3.2.3"
+		"php"                : "^7.2.5 || ^8",
+		"composer/installers": "^1.6 || ^2",
+		"symfony/stopwatch"  : "^4.2.1",
+		"mustache/mustache"  : "^2.14.1",
+		"pimple/pimple"      : "^3.5"
 	},
 	"require-dev": {
-		"twbs/bootstrap": "~3.2",
+		"twbs/bootstrap": "^3.4",
 		"brain/monkey"  : "^2.2",
 		"pds/skeleton": "^1.0"
+	},
+	"extra"      : {
+		"light-ignore-plugin": {
+			"mustache/mustache": [
+				"test"
+			],
+			"pimple/pimple"    : [
+				"ext",
+				"src/Pimple/Tests"
+			],
+			"symfony/stopwatch": [
+				"Tests"
+			]
+		}
+	},
+	"config": {
+		"allow-plugins": {
+			"composer/installers": true
+		},
+		"platform": {
+			"php": "7.2.5"
+		}
 	}
 }

composer.lock

@@ -1,42 +1,44 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b88211148a5c0893e190e574ac18bd30",
+    "content-hash": "1bf4582190f9dfcabf70f1a29f7f15e8",
     "packages": [
         {
             "name": "composer/installers",
-            "version": "v1.5.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/installers.git",
-                "reference": "049797d727261bf27f2690430d935067710049c2"
+                "reference": "af93ba6e52236418f07a278033eba6959ee5b983"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/installers/zipball/049797d727261bf27f2690430d935067710049c2",
-                "reference": "049797d727261bf27f2690430d935067710049c2",
+                "url": "https://api.github.com/repos/composer/installers/zipball/af93ba6e52236418f07a278033eba6959ee5b983",
+                "reference": "af93ba6e52236418f07a278033eba6959ee5b983",
                 "shasum": ""
             },
             "require": {
-                "composer-plugin-api": "^1.0"
-            },
-            "replace": {
-                "roundcube/plugin-installer": "*",
-                "shama/baton": "*"
+                "composer-plugin-api": "^1.0 || ^2.0",
+                "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "composer/composer": "1.0.*@dev",
-                "phpunit/phpunit": "^4.8.36"
+                "composer/composer": "1.6.* || ^2.0",
+                "composer/semver": "^1 || ^3",
+                "phpstan/phpstan": "^0.12.55",
+                "phpstan/phpstan-phpunit": "^0.12.16",
+                "symfony/phpunit-bridge": "^5.3",
+                "symfony/process": "^5"
             },
             "type": "composer-plugin",
             "extra": {
                 "class": "Composer\\Installers\\Plugin",
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
+                    "dev-main": "2.x-dev"
+                },
+                "plugin-modifies-install-path": true
             },
             "autoload": {
                 "psr-4": {
@@ -57,7 +59,6 @@
             "description": "A multi-framework Composer library installer",
             "homepage": "https://composer.github.io/installers/",
             "keywords": [
-                "Craft",
                 "Dolibarr",
                 "Eliasis",
                 "Hurad",
@@ -65,6 +66,7 @@
                 "Kanboard",
                 "Lan Management System",
                 "MODX Evo",
+                "MantisBT",
                 "Mautic",
                 "Maya",
                 "OXID",
@@ -72,10 +74,11 @@
                 "Porto",
                 "RadPHP",
                 "SMF",
+                "Starbug",
                 "Thelia",
+                "Whmcs",
                 "WolfCMS",
                 "agl",
-                "aimeos",
                 "annotatecms",
                 "attogram",
                 "bitrix",
@@ -94,7 +97,7 @@
                 "grav",
                 "installer",
                 "itop",
-                "joomla",
+                "known",
                 "kohana",
                 "laravel",
                 "lavalite",
@@ -103,13 +106,16 @@
                 "majima",
                 "mako",
                 "mediawiki",
+                "miaoxing",
                 "modulework",
                 "modx",
                 "moodle",
                 "osclass",
+                "pantheon",
                 "phpbb",
                 "piwik",
                 "ppi",
+                "processwire",
                 "puppet",
                 "pxcms",
                 "reindex",
@@ -117,27 +123,45 @@
                 "shopware",
                 "silverstripe",
                 "sydes",
-                "symfony",
-                "typo3",
+                "sylius",
+                "tastyigniter",
                 "wordpress",
                 "yawik",
                 "zend",
                 "zikula"
             ],
-            "time": "2017-12-29T09:13:20+00:00"
+            "support": {
+                "issues": "https://github.com/composer/installers/issues",
+                "source": "https://github.com/composer/installers/tree/v2.1.1"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-04-13T09:13:00+00:00"
         },
         {
             "name": "mustache/mustache",
-            "version": "v2.12.0",
+            "version": "v2.14.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/mustache.php.git",
-                "reference": "fe8fe72e9d580591854de404cc59a1b83ca4d19e"
+                "reference": "579ffa5c96e1d292c060b3dd62811ff01ad8c24e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/fe8fe72e9d580591854de404cc59a1b83ca4d19e",
-                "reference": "fe8fe72e9d580591854de404cc59a1b83ca4d19e",
+                "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/579ffa5c96e1d292c060b3dd62811ff01ad8c24e",
+                "reference": "579ffa5c96e1d292c060b3dd62811ff01ad8c24e",
                 "shasum": ""
             },
             "require": {
@@ -170,33 +194,37 @@
                 "mustache",
                 "templating"
             ],
-            "time": "2017-07-11T12:54:05+00:00"
+            "support": {
+                "issues": "https://github.com/bobthecow/mustache.php/issues",
+                "source": "https://github.com/bobthecow/mustache.php/tree/v2.14.1"
+            },
+            "time": "2022-01-21T06:08:36+00:00"
         },
         {
             "name": "pimple/pimple",
-            "version": "v3.2.3",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/silexphp/Pimple.git",
-                "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32"
+                "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/9e403941ef9d65d20cba7d54e29fe906db42cf32",
-                "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32",
+                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/a94b3a4db7fb774b3d78dad2315ddc07629e1bed",
+                "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0",
-                "psr/container": "^1.0"
+                "php": ">=7.2.5",
+                "psr/container": "^1.1 || ^2.0"
             },
             "require-dev": {
-                "symfony/phpunit-bridge": "^3.2"
+                "symfony/phpunit-bridge": "^5.4@dev"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2.x-dev"
+                    "dev-master": "3.4.x-dev"
                 }
             },
             "autoload": {
@@ -215,36 +243,34 @@
                 }
             ],
             "description": "Pimple, a simple Dependency Injection Container",
-            "homepage": "http://pimple.sensiolabs.org",
+            "homepage": "https://pimple.symfony.com",
             "keywords": [
                 "container",
                 "dependency injection"
             ],
-            "time": "2018-01-21T07:42:36+00:00"
+            "support": {
+                "source": "https://github.com/silexphp/Pimple/tree/v3.5.0"
+            },
+            "time": "2021-10-28T11:13:42+00:00"
         },
         {
             "name": "psr/container",
-            "version": "1.0.0",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
+                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=7.2.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Psr\\Container\\": "src/"
@@ -257,7 +283,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common Container Interface (PHP FIG PSR-11)",
@@ -269,31 +295,181 @@
                 "container-interop",
                 "psr"
             ],
-            "time": "2017-02-14T16:28:37+00:00"
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/1.1.1"
+            },
+            "time": "2021-03-05T17:36:06+00:00"
         },
         {
-            "name": "symfony/stopwatch",
-            "version": "v3.4.4",
+            "name": "symfony/deprecation-contracts",
+            "version": "v2.5.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "c865551df7c17e63fc1f09f763db04387f91ae4d"
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/c865551df7c17e63fc1f09f763db04387f91ae4d",
-                "reference": "c865551df7c17e63fc1f09f763db04387f91ae4d",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-main": "2.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
                 }
             },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A generic function and convention to trigger deprecation notices",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-01-02T09:53:40+00:00"
+        },
+        {
+            "name": "symfony/service-contracts",
+            "version": "v2.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/service-contracts.git",
+                "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c",
+                "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "psr/container": "^1.1",
+                "symfony/deprecation-contracts": "^2.1|^3"
+            },
+            "conflict": {
+                "ext-psr": "<1.1|>=2"
+            },
+            "suggest": {
+                "symfony/service-implementation": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\Service\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to writing services",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/service-contracts/tree/v2.5.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-03-13T20:07:29+00:00"
+        },
+        {
+            "name": "symfony/stopwatch",
+            "version": "v4.4.38",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/stopwatch.git",
+                "reference": "7f4f5a8122f7530d688cc9edf2f8c9261552fa2d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/7f4f5a8122f7530d688cc9edf2f8c9261552fa2d",
+                "reference": "7f4f5a8122f7530d688cc9edf2f8c9261552fa2d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1.3",
+                "symfony/service-contracts": "^1.0|^2"
+            },
+            "type": "library",
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Stopwatch\\": ""
@@ -316,29 +492,49 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Stopwatch Component",
+            "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
-            "time": "2018-01-03T07:37:34+00:00"
+            "support": {
+                "source": "https://github.com/symfony/stopwatch/tree/v4.4.38"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-02-18T15:34:20+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "antecedent/patchwork",
-            "version": "2.1.8",
+            "version": "2.1.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/antecedent/patchwork.git",
-                "reference": "3bb81ace3914c220aa273d1c0603d5e1b454c0d7"
+                "reference": "25c1fa0cd9a6e6d0d13863d8df8f050b6733f16d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/antecedent/patchwork/zipball/3bb81ace3914c220aa273d1c0603d5e1b454c0d7",
-                "reference": "3bb81ace3914c220aa273d1c0603d5e1b454c0d7",
+                "url": "https://api.github.com/repos/antecedent/patchwork/zipball/25c1fa0cd9a6e6d0d13863d8df8f050b6733f16d",
+                "reference": "25c1fa0cd9a6e6d0d13863d8df8f050b6733f16d",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4.0"
             },
+            "require-dev": {
+                "phpunit/phpunit": ">=4"
+            },
             "type": "library",
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -361,29 +557,35 @@
                 "runkit",
                 "testing"
             ],
-            "time": "2018-02-19T18:52:50+00:00"
+            "support": {
+                "issues": "https://github.com/antecedent/patchwork/issues",
+                "source": "https://github.com/antecedent/patchwork/tree/2.1.21"
+            },
+            "time": "2022-02-07T07:28:34+00:00"
         },
         {
             "name": "brain/monkey",
-            "version": "2.2.0",
+            "version": "2.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Brain-WP/BrainMonkey.git",
-                "reference": "ed9e0698bc1292f33698719da8ca1aa2e18acc51"
+                "reference": "a31c84515bb0d49be9310f52ef1733980ea8ffbb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Brain-WP/BrainMonkey/zipball/ed9e0698bc1292f33698719da8ca1aa2e18acc51",
-                "reference": "ed9e0698bc1292f33698719da8ca1aa2e18acc51",
+                "url": "https://api.github.com/repos/Brain-WP/BrainMonkey/zipball/a31c84515bb0d49be9310f52ef1733980ea8ffbb",
+                "reference": "a31c84515bb0d49be9310f52ef1733980ea8ffbb",
                 "shasum": ""
             },
             "require": {
-                "antecedent/patchwork": "^2.0",
-                "mockery/mockery": ">=0.9 <2",
+                "antecedent/patchwork": "^2.1.17",
+                "mockery/mockery": "^1.3.5 || ^1.4.4",
                 "php": ">=5.6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~5.7.9"
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
+                "phpcompatibility/php-compatibility": "^9.3.0",
+                "phpunit/phpunit": "^5.7.26 || ^6.0 || ^7.0 || >=8.0 <8.5.12 || ^8.5.14 || ^9.0"
             },
             "type": "library",
             "extra": {
@@ -393,12 +595,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Brain\\Monkey\\": "src/"
-                },
                 "files": [
                     "inc/api.php"
-                ]
+                ],
+                "psr-4": {
+                    "Brain\\Monkey\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -425,24 +627,28 @@
                 "test",
                 "testing"
             ],
-            "time": "2017-12-01T16:32:09+00:00"
+            "support": {
+                "issues": "https://github.com/Brain-WP/BrainMonkey/issues",
+                "source": "https://github.com/Brain-WP/BrainMonkey"
+            },
+            "time": "2021-11-11T15:53:55+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
-            "version": "v2.0.0",
+            "version": "v2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hamcrest/hamcrest-php.git",
-                "reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad"
+                "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/776503d3a8e85d4f9a1148614f95b7a608b046ad",
-                "reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad",
+                "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/8c3d0a3f6af734494ad8f6fbbee0ba92422859f3",
+                "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3|^7.0"
+                "php": "^5.3|^7.0|^8.0"
             },
             "replace": {
                 "cordoval/hamcrest-php": "*",
@@ -450,14 +656,13 @@
                 "kodova/hamcrest-php": "*"
             },
             "require-dev": {
-                "phpunit/php-file-iterator": "1.3.3",
-                "phpunit/phpunit": "~4.0",
-                "satooshi/php-coveralls": "^1.0"
+                "phpunit/php-file-iterator": "^1.4 || ^2.0",
+                "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "2.1-dev"
                 }
             },
             "autoload": {
@@ -467,40 +672,44 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD"
+                "BSD-3-Clause"
             ],
             "description": "This is the PHP port of Hamcrest Matchers",
             "keywords": [
                 "test"
             ],
-            "time": "2016-01-20T08:20:44+00:00"
+            "support": {
+                "issues": "https://github.com/hamcrest/hamcrest-php/issues",
+                "source": "https://github.com/hamcrest/hamcrest-php/tree/v2.0.1"
+            },
+            "time": "2020-07-09T08:09:16+00:00"
         },
         {
             "name": "mockery/mockery",
-            "version": "1.0",
+            "version": "1.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "1bac8c362b12f522fdd1f1fa3556284c91affa38"
+                "reference": "472fa8ca4e55483d55ee1e73c963718c4393791d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/1bac8c362b12f522fdd1f1fa3556284c91affa38",
-                "reference": "1bac8c362b12f522fdd1f1fa3556284c91affa38",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/472fa8ca4e55483d55ee1e73c963718c4393791d",
+                "reference": "472fa8ca4e55483d55ee1e73c963718c4393791d",
                 "shasum": ""
             },
             "require": {
-                "hamcrest/hamcrest-php": "~2.0",
+                "hamcrest/hamcrest-php": "^2.0.1",
                 "lib-pcre": ">=7.0",
                 "php": ">=5.6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~5.7|~6.1"
+                "phpunit/phpunit": "^5.7.10|^6.5|^7.5|^8.5|^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.3.x-dev"
                 }
             },
             "autoload": {
@@ -524,8 +733,8 @@
                     "homepage": "http://davedevelopment.co.uk"
                 }
             ],
-            "description": "Mockery is a simple yet flexible PHP mock object framework for use in unit testing with PHPUnit, PHPSpec or any other testing framework. Its core goal is to offer a test double framework with a succinct API capable of clearly defining all possible object operations and interactions using a human readable Domain Specific Language (DSL). Designed as a drop in alternative to PHPUnit's phpunit-mock-objects library, Mockery is easy to integrate with PHPUnit and can operate alongside phpunit-mock-objects without the World ending.",
-            "homepage": "http://github.com/mockery/mockery",
+            "description": "Mockery is a simple yet flexible PHP mock object framework",
+            "homepage": "https://github.com/mockery/mockery",
             "keywords": [
                 "BDD",
                 "TDD",
@@ -538,7 +747,11 @@
                 "test double",
                 "testing"
             ],
-            "time": "2017-10-06T16:20:43+00:00"
+            "support": {
+                "issues": "https://github.com/mockery/mockery/issues",
+                "source": "https://github.com/mockery/mockery/tree/1.3.5"
+            },
+            "time": "2021-09-13T15:33:03+00:00"
         },
         {
             "name": "pds/skeleton",
@@ -569,20 +782,24 @@
             ],
             "description": "Standard for PHP package skeletons.",
             "homepage": "https://github.com/php-pds/skeleton",
+            "support": {
+                "issues": "https://github.com/php-pds/skeleton/issues",
+                "source": "https://github.com/php-pds/skeleton/tree/1.x"
+            },
             "time": "2017-01-25T23:30:41+00:00"
         },
         {
             "name": "twbs/bootstrap",
-            "version": "v3.3.7",
+            "version": "v3.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twbs/bootstrap.git",
-                "reference": "0b9c4a4007c44201dce9a6cc1a38407005c26c86"
+                "reference": "68b0d231a13201eb14acd3dc84e51543d16e5f7e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twbs/bootstrap/zipball/0b9c4a4007c44201dce9a6cc1a38407005c26c86",
-                "reference": "0b9c4a4007c44201dce9a6cc1a38407005c26c86",
+                "url": "https://api.github.com/repos/twbs/bootstrap/zipball/68b0d231a13201eb14acd3dc84e51543d16e5f7e",
+                "reference": "68b0d231a13201eb14acd3dc84e51543d16e5f7e",
                 "shasum": ""
             },
             "replace": {
@@ -591,7 +808,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3.x-dev"
+                    "dev-master": "3.4.x-dev"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -609,7 +826,7 @@
                 }
             ],
             "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
-            "homepage": "http://getbootstrap.com",
+            "homepage": "https://getbootstrap.com/",
             "keywords": [
                 "JS",
                 "css",
@@ -620,7 +837,11 @@
                 "responsive",
                 "web"
             ],
-            "time": "2016-07-25T15:51:55+00:00"
+            "support": {
+                "issues": "https://github.com/twbs/bootstrap/issues",
+                "source": "https://github.com/twbs/bootstrap/tree/v3.4.1"
+            },
+            "time": "2019-02-13T15:55:38+00:00"
         }
     ],
     "aliases": [],
@@ -629,7 +850,11 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=5.6"
+        "php": "^7.2.5 || ^8"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "platform-overrides": {
+        "php": "7.2.5"
+    },
+    "plugin-api-version": "2.3.0"
 }

laps.php

@@ -5,10 +5,10 @@ Plugin Name: Laps
 Plugin URI: https://github.com/Rarst/laps
 Description: Light WordPress profiler.
 Author: Andrey “Rarst” Savchenko
-Version: 2.0
+Version: 3.3.7
 Author URI: https://www.rarst.net/
-Text Domain: laps
-Domain Path: /lang
+Requires PHP: 7.1.3
+Update URI: false
 License: MIT
 */
 
@@ -16,6 +16,14 @@ 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 );
+}
+
+if ( PHP_VERSION_ID < 70103 ) {
+	trigger_error( 'Laps requires PHP version >=7.1.3.', E_USER_ERROR );
+}
+
 $laps = new \Rarst\Laps\Plugin();
 
 $laps->run();

psalm.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<psalm
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="https://getpsalm.org/schema/config"
+        xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+        errorLevel="2"
+>
+    <projectFiles>
+        <directory name="src"/>
+        <ignoreFiles>
+            <directory name="vendor"/>
+            <directory name="src/mustache/cache"/>
+        </ignoreFiles>
+    </projectFiles>
+
+    <issueHandlers>
+        <LessSpecificReturnType errorLevel="info"/>
+        <UndefinedFunction errorLevel="suppress"/>
+        <UndefinedClass errorLevel="suppress"/>
+        <UndefinedDocblockClass errorLevel="suppress"/>
+        <UndefinedConstant errorLevel="suppress"/>
+    </issueHandlers>
+</psalm>

public/css/laps.css

@@ -17,9 +17,9 @@
   display: none;
 }
 #wpadminbar .laps-timeline {
-  overflow: hidden;
   height: 20px;
   margin-bottom: 20px;
+  overflow: hidden;
   background-color: #f5f5f5;
   border-radius: 4px;
   -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
@@ -70,8 +70,8 @@
   position: absolute;
   width: 1px;
   height: 1px;
-  margin: -1px;
   padding: 0;
+  margin: -1px;
   overflow: hidden;
   clip: rect(0, 0, 0, 0);
   border: 0;
@@ -82,57 +82,42 @@
   display: block;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-style: normal;
-  font-weight: normal;
-  letter-spacing: normal;
-  line-break: auto;
+  font-weight: 400;
   line-height: 1.42857143;
+  line-break: auto;
   text-align: left;
   text-align: start;
   text-decoration: none;
   text-shadow: none;
   text-transform: none;
-  white-space: normal;
+  letter-spacing: normal;
   word-break: normal;
   word-spacing: normal;
   word-wrap: normal;
+  white-space: normal;
   font-size: 12px;
-  opacity: 0;
   filter: alpha(opacity=0);
+  opacity: 0;
 }
 #wpadminbar .tooltip.in {
-  opacity: 0.9;
   filter: alpha(opacity=90);
+  opacity: 0.9;
 }
 #wpadminbar .tooltip.top {
-  margin-top: -3px;
   padding: 5px 0;
+  margin-top: -3px;
 }
 #wpadminbar .tooltip.right {
-  margin-left: 3px;
   padding: 0 5px;
+  margin-left: 3px;
 }
 #wpadminbar .tooltip.bottom {
-  margin-top: 3px;
   padding: 5px 0;
+  margin-top: 3px;
 }
 #wpadminbar .tooltip.left {
-  margin-left: -3px;
   padding: 0 5px;
-}
-#wpadminbar .tooltip-inner {
-  max-width: 300px;
-  padding: 3px 8px;
-  color: #eee;
-  text-align: center;
-  background-color: #464646;
-  border-radius: 4px;
-}
-#wpadminbar .tooltip-arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
+  margin-left: -3px;
 }
 #wpadminbar .tooltip.top .tooltip-arrow {
   bottom: 0;
@@ -142,8 +127,8 @@
   border-top-color: #464646;
 }
 #wpadminbar .tooltip.top-left .tooltip-arrow {
-  bottom: 0;
   right: 5px;
+  bottom: 0;
   margin-bottom: -5px;
   border-width: 5px 5px 0;
   border-top-color: #464646;
@@ -190,12 +175,30 @@
   border-width: 0 5px 5px;
   border-bottom-color: #464646;
 }
+#wpadminbar .tooltip-inner {
+  max-width: 300px;
+  padding: 3px 8px;
+  color: #eee;
+  text-align: center;
+  background-color: #464646;
+  border-radius: 4px;
+}
+#wpadminbar .tooltip-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
 #wpadminbar .tooltip.in {
-  opacity: 1;
   filter: alpha(opacity=100);
+  opacity: 1;
 }
 #wpadminbar .tooltip-inner {
   line-height: 20px;
   text-align: left;
 }
+#wpadminbar .tooltip-inner br {
+  line-height: inherit;
+}
 /*# sourceMappingURL=laps.css.map */

public/css/laps.css.map

@@ -1 +1 @@
-{"version":3,"sources":["laps.less","C:/server/www/dev/wp-content/plugins/laps/vendor/twbs/bootstrap/less/progress-bars.less","C:/server/www/dev/wp-content/plugins/laps/vendor/twbs/bootstrap/less/mixins/vendor-prefixes.less","C:/server/www/dev/wp-content/plugins/laps/vendor/twbs/bootstrap/less/scaffolding.less","C:/server/www/dev/wp-content/plugins/laps/vendor/twbs/bootstrap/less/tooltip.less","C:/server/www/dev/wp-content/plugins/laps/vendor/twbs/bootstrap/less/mixins/reset-text.less","C:/server/www/dev/wp-content/plugins/laps/vendor/twbs/bootstrap/less/variables.less","C:/server/www/dev/wp-content/plugins/laps/vendor/twbs/bootstrap/less/mixins/opacity.less"],"names":[],"mappings":"AAMA,WAEC,mBAEC;EACC,cAAA;EACA,UAAA;EACA,eAAA;EACA,QAAA;;AARH,WAEC,mBASC;EACC,UAAA;;AAZH,WAgBC;EAEC,eAAA;;AAEA,WAJD,0BAIE;EACA,6BAAA;;AArBH,WAgBC,0BAQC;EACC,aAAA;;AAzBH,WA6BC;ECTC,gBAAA;EACA,YAAA;EACA,mBAAA;EACA,yBAAA;EACA,kBAAA;ECsCA,sDAAA;EACQ,8CAAA;EFhCR,aAAA;EACA,kBAAA;;AAhCF,WA6BC,eAKC;ECJA,WAAA;EACA,SAAA;EACA,YAAA;EACA,eAAA;EACA,iBAAA;EACA,WAAA;EACA,kBAAA;EACA,yBAAA;ECyBA,sDAAA;EACQ,8CAAA;EAyHR,mCAAA;EACK,8BAAA;EACG,2BAAA;EFtJP,kBAAA;EACA,8BAAA;EACA,cAAA;;AAtCH,WA6BC,eAYC;EACC,yBAAA;;AA1CH,WA6BC,eAeC;EACC,yBAAA;;AA7CH,WA6BC,eAkBC;EACC,yBAAA;;AAhDH,WA6BC,eAqBC;EACC,yBAAA;;AAnDH,WA6BC,eAwBC;EACC,yBAAA;;AAtDH,WA6BC,eA2BC;EACC,yBAAA;;AAzDH,WA6BC,eA8BC;EACC,yBAAA;;AA5DH,WA6BC,eAkCC;EGwDA,kBAAA;EACA,UAAA;EACA,WAAA;EACA,YAAA;EACA,UAAA;EACA,gBAAA;EACA,MAAM,gBAAN;EACA,SAAA;;AH9HF,WIAA;EACE,kBAAA;EACA,eAAA;EACA,cAAA;ECRA,aC2CwB,8CD3CxB;EAEA,kBAAA;EACA,mBAAA;EACA,sBAAA;EACA,gBAAA;EACA,uBAAA;EACA,gBAAA;EACA,iBAAA;EACA,qBAAA;EACA,iBAAA;EACA,oBAAA;EACA,mBAAA;EACA,kBAAA;EACA,oBAAA;EACA,iBAAA;EDHA,eAAA;EGVA,UAAA;EAGA,wBAAA;;AHWA,WAXF,SAWG;EGdD,YAAA;EAGA,yBAAA;;AHYA,WAZF,SAYG;EAAU,gBAAA;EAAmB,cAAA;;AAC9B,WAbF,SAaG;EAAU,gBAAA;EAAmB,cAAA;;AAC9B,WAdF,SAcG;EAAU,eAAA;EAAmB,cAAA;;AAC9B,WAfF,SAeG;EAAU,iBAAA;EAAmB,cAAA;;AJfhC,WImBA;EACE,gBAAA;EACA,gBAAA;EACA,WAAA;EACA,kBAAA;EACA,yBAAA;EACA,kBAAA;;AJzBF,WI6BA;EACE,kBAAA;EACA,QAAA;EACA,SAAA;EACA,yBAAA;EACA,mBAAA;;AAIA,WADF,SACG,IAAK;EACJ,SAAA;EACA,SAAA;EACA,iBAAA;EACA,uBAAA;EACA,yBAAA;;AAEF,WARF,SAQG,SAAU;EACT,SAAA;EACA,UAAA;EACA,mBAAA;EACA,uBAAA;EACA,yBAAA;;AAEF,WAfF,SAeG,UAAW;EACV,SAAA;EACA,SAAA;EACA,mBAAA;EACA,uBAAA;EACA,yBAAA;;AAEF,WAtBF,SAsBG,MAAO;EACN,QAAA;EACA,OAAA;EACA,gBAAA;EACA,2BAAA;EACA,2BAAA;;AAEF,WA7BF,SA6BG,KAAM;EACL,QAAA;EACA,QAAA;EACA,gBAAA;EACA,2BAAA;EACA,0BAAA;;AAEF,WApCF,SAoCG,OAAQ;EACP,MAAA;EACA,SAAA;EACA,iBAAA;EACA,uBAAA;EACA,4BAAA;;AAEF,WA3CF,SA2CG,YAAa;EACZ,MAAA;EACA,UAAA;EACA,gBAAA;EACA,uBAAA;EACA,4BAAA;;AAEF,WAlDF,SAkDG,aAAc;EACb,MAAA;EACA,SAAA;EACA,gBAAA;EACA,uBAAA;EACA,4BAAA;;AJ5FJ,WAsEC,SAAQ;EOzEP,UAAA;EAGA,0BAAA;;APAF,WA0EC;EACC,iBAAA;EACA,gBAAA","file":"laps.css"}
+{"version":3,"sources":["laps.less","C:/server/www/dev/wp-content/plugins/laps/vendor/twbs/bootstrap/less/progress-bars.less","C:/server/www/dev/wp-content/plugins/laps/vendor/twbs/bootstrap/less/mixins/vendor-prefixes.less","C:/server/www/dev/wp-content/plugins/laps/vendor/twbs/bootstrap/less/scaffolding.less","C:/server/www/dev/wp-content/plugins/laps/vendor/twbs/bootstrap/less/tooltip.less","C:/server/www/dev/wp-content/plugins/laps/vendor/twbs/bootstrap/less/mixins/reset-text.less","C:/server/www/dev/wp-content/plugins/laps/vendor/twbs/bootstrap/less/variables.less","C:/server/www/dev/wp-content/plugins/laps/vendor/twbs/bootstrap/less/mixins/opacity.less"],"names":[],"mappings":"AAMA,WAEC,mBAEC;EACC,cAAA;EACA,UAAA;EACA,eAAA;EACA,QAAA;;AARH,WAEC,mBASC;EACC,UAAA;;AAZH,WAgBC;EAEC,eAAA;;AAEA,WAJD,0BAIE;EACA,6BAAA;;AArBH,WAgBC,0BAQC;EACC,aAAA;;AAzBH,WA6BC;ECPC,YAAA;EACA,mBAAA;EACA,gBAAA;EACA,yBAAA;EACA,kBAAA;ECsCA,sDAAA;EACQ,8CAAA;EFlCR,aAAA;EACA,kBAAA;;AAhCF,WA6BC,eAKC;ECFA,WAAA;EACA,SAAA;EACA,YAAA;EACA,eAAA;EACA,iBAAA;EACA,WAAA;EACA,kBAAA;EACA,yBAAA;ECyBA,sDAAA;EACQ,8CAAA;EAyHR,mCAAA;EACK,8BAAA;EACG,2BAAA;EFxJP,kBAAA;EACA,8BAAA;EACA,cAAA;;AAtCH,WA6BC,eAYC;EACC,yBAAA;;AA1CH,WA6BC,eAeC;EACC,yBAAA;;AA7CH,WA6BC,eAkBC;EACC,yBAAA;;AAhDH,WA6BC,eAqBC;EACC,yBAAA;;AAnDH,WA6BC,eAwBC;EACC,yBAAA;;AAtDH,WA6BC,eA2BC;EACC,yBAAA;;AAzDH,WA6BC,eA8BC;EACC,yBAAA;;AA5DH,WA6BC,eAkCC;EGwDA,kBAAA;EACA,UAAA;EACA,WAAA;EACA,UAAA;EACA,YAAA;EACA,gBAAA;EACA,MAAM,gBAAN;EACA,SAAA;;AH9HF,WIAA;EACE,kBAAA;EACA,eAAA;EACA,cAAA;ECRA,aC6CwB,8CD7CxB;EAEA,kBAAA;EACA,gBAAA;EACA,uBAAA;EACA,gBAAA;EACA,gBAAA;EACA,iBAAA;EACA,qBAAA;EACA,iBAAA;EACA,oBAAA;EACA,sBAAA;EACA,kBAAA;EACA,oBAAA;EACA,iBAAA;EACA,mBAAA;EDHA,eAAA;EGTA,wBAAA;EACA,UAAA;;AHYA,WAXF,SAWG;EGbD,yBAAA;EACA,YAAA;;AHaA,WAZF,SAYG;EACC,cAAA;EACA,gBAAA;;AAEF,WAhBF,SAgBG;EACC,cAAA;EACA,gBAAA;;AAEF,WApBF,SAoBG;EACC,cAAA;EACA,eAAA;;AAEF,WAxBF,SAwBG;EACC,cAAA;EACA,iBAAA;;AAIF,WA9BF,SA8BG,IAAK;EACJ,SAAA;EACA,SAAA;EACA,iBAAA;EACA,uBAAA;EACA,yBAAA;;AAEF,WArCF,SAqCG,SAAU;EACT,UAAA;EACA,SAAA;EACA,mBAAA;EACA,uBAAA;EACA,yBAAA;;AAEF,WA5CF,SA4CG,UAAW;EACV,SAAA;EACA,SAAA;EACA,mBAAA;EACA,uBAAA;EACA,yBAAA;;AAEF,WAnDF,SAmDG,MAAO;EACN,QAAA;EACA,OAAA;EACA,gBAAA;EACA,2BAAA;EACA,2BAAA;;AAEF,WA1DF,SA0DG,KAAM;EACL,QAAA;EACA,QAAA;EACA,gBAAA;EACA,2BAAA;EACA,0BAAA;;AAEF,WAjEF,SAiEG,OAAQ;EACP,MAAA;EACA,SAAA;EACA,iBAAA;EACA,uBAAA;EACA,4BAAA;;AAEF,WAxEF,SAwEG,YAAa;EACZ,MAAA;EACA,UAAA;EACA,gBAAA;EACA,uBAAA;EACA,4BAAA;;AAEF,WA/EF,SA+EG,aAAc;EACb,MAAA;EACA,SAAA;EACA,gBAAA;EACA,uBAAA;EACA,4BAAA;;AJpFJ,WIyFA;EACE,gBAAA;EACA,gBAAA;EACA,WAAA;EACA,kBAAA;EACA,yBAAA;EACA,kBAAA;;AJ/FF,WImGA;EACE,kBAAA;EACA,QAAA;EACA,SAAA;EACA,yBAAA;EACA,mBAAA;;AJxGF,WAsEC,SAAQ;EOxEP,0BAAA;EACA,UAAA;;APCF,WA0EC;EACC,iBAAA;EACA,gBAAA;;AA5EF,WA0EC,eAIC;EACC,oBAAA","file":"laps.css"}

public/css/laps.less

@@ -81,6 +81,10 @@
 	.tooltip-inner {
 		line-height: 20px;
 		text-align:  left;
+
+		br {
+			line-height: inherit;
+		}
 	}
 }
 

public/css/laps.min.css

@@ -1 +1 @@
-#wpadminbar #wp-admin-bar-laps .ab-sub-wrapper{min-width:90%;width:90%;position:fixed;left:5%}#wpadminbar #wp-admin-bar-laps .ab-submenu{padding:0}#wpadminbar #wp-admin-bar-laps_output{padding:0 10px}#wpadminbar #wp-admin-bar-laps_output:hover{background-color:transparent}#wpadminbar #wp-admin-bar-laps_output .ab-empty-item{display:none}#wpadminbar .laps-timeline{overflow:hidden;height:20px;margin-bottom:20px;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);margin:6px 0;position:relative}#wpadminbar .laps-timeline .event{float:left;width:0%;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#AAAAAA;-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;position:absolute;border-left:1px solid #f5f5f5;min-width:2px}#wpadminbar .laps-timeline .event-php{background-color:#B10DC9}#wpadminbar .laps-timeline .event-theme{background-color:#2ECC40}#wpadminbar .laps-timeline .event-plugin{background-color:#0074D9}#wpadminbar .laps-timeline .event-core{background-color:#FF851B}#wpadminbar .laps-timeline .event-sql-read{background-color:#7FDBFF}#wpadminbar .laps-timeline .event-sql-write{background-color:#FF4136}#wpadminbar .laps-timeline .event-http{background-color:#FF4136}#wpadminbar .laps-timeline .sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}#wpadminbar .tooltip{position:absolute;z-index:100000;display:block;font-family:"Helvetica Neue", Helvetica, Arial, sans-serif;font-style:normal;font-weight:normal;letter-spacing:normal;line-break:auto;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;white-space:normal;word-break:normal;word-spacing:normal;word-wrap:normal;font-size:12px;opacity:0;filter:alpha(opacity=0)}#wpadminbar .tooltip.in{opacity:0.9;filter:alpha(opacity=90)}#wpadminbar .tooltip.top{margin-top:-3px;padding:5px 0}#wpadminbar .tooltip.right{margin-left:3px;padding:0 5px}#wpadminbar .tooltip.bottom{margin-top:3px;padding:5px 0}#wpadminbar .tooltip.left{margin-left:-3px;padding:0 5px}#wpadminbar .tooltip-inner{max-width:300px;padding:3px 8px;color:#eee;text-align:center;background-color:#464646;border-radius:4px}#wpadminbar .tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}#wpadminbar .tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#464646}#wpadminbar .tooltip.top-left .tooltip-arrow{bottom:0;right:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#464646}#wpadminbar .tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#464646}#wpadminbar .tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#464646}#wpadminbar .tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#464646}#wpadminbar .tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#464646}#wpadminbar .tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#464646}#wpadminbar .tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#464646}#wpadminbar .tooltip.in{opacity:1;filter:alpha(opacity=100)}#wpadminbar .tooltip-inner{line-height:20px;text-align:left}
+#wpadminbar #wp-admin-bar-laps .ab-sub-wrapper{min-width:90%;width:90%;position:fixed;left:5%}#wpadminbar #wp-admin-bar-laps .ab-submenu{padding:0}#wpadminbar #wp-admin-bar-laps_output{padding:0 10px}#wpadminbar #wp-admin-bar-laps_output:hover{background-color:transparent}#wpadminbar #wp-admin-bar-laps_output .ab-empty-item{display:none}#wpadminbar .laps-timeline{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);margin:6px 0;position:relative}#wpadminbar .laps-timeline .event{float:left;width:0%;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#AAAAAA;-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;position:absolute;border-left:1px solid #f5f5f5;min-width:2px}#wpadminbar .laps-timeline .event-php{background-color:#B10DC9}#wpadminbar .laps-timeline .event-theme{background-color:#2ECC40}#wpadminbar .laps-timeline .event-plugin{background-color:#0074D9}#wpadminbar .laps-timeline .event-core{background-color:#FF851B}#wpadminbar .laps-timeline .event-sql-read{background-color:#7FDBFF}#wpadminbar .laps-timeline .event-sql-write{background-color:#FF4136}#wpadminbar .laps-timeline .event-http{background-color:#FF4136}#wpadminbar .laps-timeline .sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}#wpadminbar .tooltip{position:absolute;z-index:100000;display:block;font-family:"Helvetica Neue", Helvetica, Arial, sans-serif;font-style:normal;font-weight:400;line-height:1.42857143;line-break:auto;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;font-size:12px;filter:alpha(opacity=0);opacity:0}#wpadminbar .tooltip.in{filter:alpha(opacity=90);opacity:0.9}#wpadminbar .tooltip.top{padding:5px 0;margin-top:-3px}#wpadminbar .tooltip.right{padding:0 5px;margin-left:3px}#wpadminbar .tooltip.bottom{padding:5px 0;margin-top:3px}#wpadminbar .tooltip.left{padding:0 5px;margin-left:-3px}#wpadminbar .tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#464646}#wpadminbar .tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#464646}#wpadminbar .tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#464646}#wpadminbar .tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#464646}#wpadminbar .tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#464646}#wpadminbar .tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#464646}#wpadminbar .tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#464646}#wpadminbar .tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#464646}#wpadminbar .tooltip-inner{max-width:300px;padding:3px 8px;color:#eee;text-align:center;background-color:#464646;border-radius:4px}#wpadminbar .tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}#wpadminbar .tooltip.in{filter:alpha(opacity=100);opacity:1}#wpadminbar .tooltip-inner{line-height:20px;text-align:left}#wpadminbar .tooltip-inner br{line-height:inherit}

public/js/laps.js

@@ -1,9 +1,9 @@
 /* ========================================================================
- * Bootstrap: tooltip.js v3.3.7
- * http://getbootstrap.com/javascript/#tooltip
+ * Bootstrap: tooltip.js v3.4.0
+ * https://getbootstrap.com/docs/3.4/javascript/#tooltip
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
+ * Copyright 2011-2018 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
@@ -26,7 +26,7 @@
     this.init('tooltip', element, options)
   }
 
-  Tooltip.VERSION  = '3.3.7'
+  Tooltip.VERSION  = '3.4.0'
 
   Tooltip.TRANSITION_DURATION = 150
 
@@ -51,7 +51,7 @@
     this.type      = type
     this.$element  = $(element)
     this.options   = this.getOptions(options)
-    this.$viewport = this.options.viewport && $($.isFunction(this.options.viewport) ? this.options.viewport.call(this, this.$element) : (this.options.viewport.selector || this.options.viewport))
+    this.$viewport = this.options.viewport && $(document).find($.isFunction(this.options.viewport) ? this.options.viewport.call(this, this.$element) : (this.options.viewport.selector || this.options.viewport))
     this.inState   = { click: false, hover: false, focus: false }
 
     if (this.$element[0] instanceof document.constructor && !this.options.selector) {
@@ -204,7 +204,7 @@
         .addClass(placement)
         .data('bs.' + this.type, this)
 
-      this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
+      this.options.container ? $tip.appendTo($(document).find(this.options.container)) : $tip.insertAfter(this.$element)
       this.$element.trigger('inserted.bs.' + this.type)
 
       var pos          = this.getPosition()

public/js/laps.min.js

@@ -1,5 +1,5 @@
-+function(t){'use strict';var e=function(t,e){this.type=null;this.options=null;this.enabled=null;this.timeout=null;this.hoverState=null;this.$element=null;this.inState=null;this.init('tooltip',t,e)};e.VERSION='3.3.7';e.TRANSITION_DURATION=150;e.DEFAULTS={animation:!0,placement:'top',selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:'hover focus',title:'',delay:0,html:!1,container:!1,viewport:{selector:'body',padding:0}};e.prototype.init=function(e,i,o){this.enabled=!0;this.type=e;this.$element=t(i);this.options=this.getOptions(o);this.$viewport=this.options.viewport&&t(t.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):(this.options.viewport.selector||this.options.viewport));this.inState={click:!1,hover:!1,focus:!1};if(this.$element[0]instanceof document.constructor&&!this.options.selector){throw new Error('`selector` option must be specified when initializing '+this.type+' on the window.document object!')};var r=this.options.trigger.split(' ');for(var s=r.length;s--;){var n=r[s];if(n=='click'){this.$element.on('click.'+this.type,this.options.selector,t.proxy(this.toggle,this))}
-else if(n!='manual'){var l=n=='hover'?'mouseenter':'focusin',a=n=='hover'?'mouseleave':'focusout';this.$element.on(l+'.'+this.type,this.options.selector,t.proxy(this.enter,this));this.$element.on(a+'.'+this.type,this.options.selector,t.proxy(this.leave,this))}};this.options.selector?(this._options=t.extend({},this.options,{trigger:'manual',selector:''})):this.fixTitle()};e.prototype.getDefaults=function(){return e.DEFAULTS};e.prototype.getOptions=function(e){e=t.extend({},this.getDefaults(),this.$element.data(),e);if(e.delay&&typeof e.delay=='number'){e.delay={show:e.delay,hide:e.delay}};return e};e.prototype.getDelegateOptions=function(){var e={};var i=this.getDefaults();this._options&&t.each(this._options,function(t,o){if(i[t]!=o)e[t]=o});return e};e.prototype.enter=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget).data('bs.'+this.type);if(!i){i=new this.constructor(e.currentTarget,this.getDelegateOptions());t(e.currentTarget).data('bs.'+this.type,i)};if(e instanceof t.Event){i.inState[e.type=='focusin'?'focus':'hover']=!0};if(i.tip().hasClass('in')||i.hoverState=='in'){i.hoverState='in';return};clearTimeout(i.timeout);i.hoverState='in';if(!i.options.delay||!i.options.delay.show)return i.show();i.timeout=setTimeout(function(){if(i.hoverState=='in')i.show()},i.options.delay.show)};e.prototype.isInStateTrue=function(){for(var t in this.inState){if(this.inState[t])return!0};return!1};e.prototype.leave=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget).data('bs.'+this.type);if(!i){i=new this.constructor(e.currentTarget,this.getDelegateOptions());t(e.currentTarget).data('bs.'+this.type,i)};if(e instanceof t.Event){i.inState[e.type=='focusout'?'focus':'hover']=!1};if(i.isInStateTrue())return;clearTimeout(i.timeout);i.hoverState='out';if(!i.options.delay||!i.options.delay.hide)return i.hide();i.timeout=setTimeout(function(){if(i.hoverState=='out')i.hide()},i.options.delay.hide)};e.prototype.show=function(){var c=t.Event('show.bs.'+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(c);var v=t.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(c.isDefaultPrevented()||!v)return;var n=this,o=this.tip(),u=this.getUID(this.type);this.setContent();o.attr('id',u);this.$element.attr('aria-describedby',u);if(this.options.animation)o.addClass('fade');var i=typeof this.options.placement=='function'?this.options.placement.call(this,o[0],this.$element[0]):this.options.placement,h=/\s?auto?\s?/i,f=h.test(i);if(f)i=i.replace(h,'')||'top';o.detach().css({top:0,left:0,display:'block'}).addClass(i).data('bs.'+this.type,this);this.options.container?o.appendTo(this.options.container):o.insertAfter(this.$element);this.$element.trigger('inserted.bs.'+this.type);var s=this.getPosition(),l=o[0].offsetWidth,a=o[0].offsetHeight;if(f){var m=i,r=this.getPosition(this.$viewport);i=i=='bottom'&&s.bottom+a>r.bottom?'top':i=='top'&&s.top-a<r.top?'bottom':i=='right'&&s.right+l>r.width?'left':i=='left'&&s.left-l<r.left?'right':i;o.removeClass(m).addClass(i)};var d=this.getCalculatedOffset(i,s,l,a);this.applyPlacement(d,i);var p=function(){var t=n.hoverState;n.$element.trigger('shown.bs.'+n.type);n.hoverState=null;if(t=='out')n.leave(n)};t.support.transition&&this.$tip.hasClass('fade')?o.one('bsTransitionEnd',p).emulateTransitionEnd(e.TRANSITION_DURATION):p()}};e.prototype.applyPlacement=function(e,o){var i=this.tip(),c=i[0].offsetWidth,l=i[0].offsetHeight,a=parseInt(i.css('margin-top'),10),p=parseInt(i.css('margin-left'),10);if(isNaN(a))a=0;if(isNaN(p))p=0;e.top+=a;e.left+=p;t.offset.setOffset(i[0],t.extend({using:function(t){i.css({top:Math.round(t.top),left:Math.round(t.left)})}},e),0);i.addClass('in');var h=i[0].offsetWidth,s=i[0].offsetHeight;if(o=='top'&&s!=l){e.top=e.top+l-s};var n=this.getViewportAdjustedDelta(o,e,h,s);if(n.left)e.left+=n.left;else e.top+=n.top;var r=/top|bottom/.test(o),f=r?n.left*2-c+h:n.top*2-l+s,u=r?'offsetWidth':'offsetHeight';i.offset(e);this.replaceArrow(f,i[0][u],r)};e.prototype.replaceArrow=function(t,e,i){this.arrow().css(i?'left':'top',50*(1-t/e)+'%').css(i?'top':'left','')};e.prototype.setContent=function(){var t=this.tip(),e=this.getTitle();t.find('.tooltip-inner')[this.options.html?'html':'text'](e);t.removeClass('fade in top bottom left right')};e.prototype.hide=function(i){var o=this,n=t(this.$tip),s=t.Event('hide.bs.'+this.type);function r(){if(o.hoverState!='in')n.detach();if(o.$element){o.$element.removeAttr('aria-describedby').trigger('hidden.bs.'+o.type)};i&&i()};this.$element.trigger(s);if(s.isDefaultPrevented())return;n.removeClass('in');t.support.transition&&n.hasClass('fade')?n.one('bsTransitionEnd',r).emulateTransitionEnd(e.TRANSITION_DURATION):r();this.hoverState=null;return this};e.prototype.fixTitle=function(){var t=this.$element;if(t.attr('title')||typeof t.attr('data-original-title')!='string'){t.attr('data-original-title',t.attr('title')||'').attr('title','')}};e.prototype.hasContent=function(){return this.getTLine truncated
++function(t){'use strict';var e=function(t,e){this.type=null;this.options=null;this.enabled=null;this.timeout=null;this.hoverState=null;this.$element=null;this.inState=null;this.init('tooltip',t,e)};e.VERSION='3.4.0';e.TRANSITION_DURATION=150;e.DEFAULTS={animation:!0,placement:'top',selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:'hover focus',title:'',delay:0,html:!1,container:!1,viewport:{selector:'body',padding:0}};e.prototype.init=function(e,i,o){this.enabled=!0;this.type=e;this.$element=t(i);this.options=this.getOptions(o);this.$viewport=this.options.viewport&&t(document).find(t.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):(this.options.viewport.selector||this.options.viewport));this.inState={click:!1,hover:!1,focus:!1};if(this.$element[0]instanceof document.constructor&&!this.options.selector){throw new Error('`selector` option must be specified when initializing '+this.type+' on the window.document object!')};var r=this.options.trigger.split(' ');for(var s=r.length;s--;){var n=r[s];if(n=='click'){this.$element.on('click.'+this.type,this.options.selector,t.proxy(this.toggle,this))}
+else if(n!='manual'){var l=n=='hover'?'mouseenter':'focusin',a=n=='hover'?'mouseleave':'focusout';this.$element.on(l+'.'+this.type,this.options.selector,t.proxy(this.enter,this));this.$element.on(a+'.'+this.type,this.options.selector,t.proxy(this.leave,this))}};this.options.selector?(this._options=t.extend({},this.options,{trigger:'manual',selector:''})):this.fixTitle()};e.prototype.getDefaults=function(){return e.DEFAULTS};e.prototype.getOptions=function(e){e=t.extend({},this.getDefaults(),this.$element.data(),e);if(e.delay&&typeof e.delay=='number'){e.delay={show:e.delay,hide:e.delay}};return e};e.prototype.getDelegateOptions=function(){var e={};var i=this.getDefaults();this._options&&t.each(this._options,function(t,o){if(i[t]!=o)e[t]=o});return e};e.prototype.enter=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget).data('bs.'+this.type);if(!i){i=new this.constructor(e.currentTarget,this.getDelegateOptions());t(e.currentTarget).data('bs.'+this.type,i)};if(e instanceof t.Event){i.inState[e.type=='focusin'?'focus':'hover']=!0};if(i.tip().hasClass('in')||i.hoverState=='in'){i.hoverState='in';return};clearTimeout(i.timeout);i.hoverState='in';if(!i.options.delay||!i.options.delay.show)return i.show();i.timeout=setTimeout(function(){if(i.hoverState=='in')i.show()},i.options.delay.show)};e.prototype.isInStateTrue=function(){for(var t in this.inState){if(this.inState[t])return!0};return!1};e.prototype.leave=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget).data('bs.'+this.type);if(!i){i=new this.constructor(e.currentTarget,this.getDelegateOptions());t(e.currentTarget).data('bs.'+this.type,i)};if(e instanceof t.Event){i.inState[e.type=='focusout'?'focus':'hover']=!1};if(i.isInStateTrue())return;clearTimeout(i.timeout);i.hoverState='out';if(!i.options.delay||!i.options.delay.hide)return i.hide();i.timeout=setTimeout(function(){if(i.hoverState=='out')i.hide()},i.options.delay.hide)};e.prototype.show=function(){var c=t.Event('show.bs.'+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(c);var v=t.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(c.isDefaultPrevented()||!v)return;var n=this,o=this.tip(),u=this.getUID(this.type);this.setContent();o.attr('id',u);this.$element.attr('aria-describedby',u);if(this.options.animation)o.addClass('fade');var i=typeof this.options.placement=='function'?this.options.placement.call(this,o[0],this.$element[0]):this.options.placement,h=/\s?auto?\s?/i,f=h.test(i);if(f)i=i.replace(h,'')||'top';o.detach().css({top:0,left:0,display:'block'}).addClass(i).data('bs.'+this.type,this);this.options.container?o.appendTo(t(document).find(this.options.container)):o.insertAfter(this.$element);this.$element.trigger('inserted.bs.'+this.type);var s=this.getPosition(),l=o[0].offsetWidth,a=o[0].offsetHeight;if(f){var m=i,r=this.getPosition(this.$viewport);i=i=='bottom'&&s.bottom+a>r.bottom?'top':i=='top'&&s.top-a<r.top?'bottom':i=='right'&&s.right+l>r.width?'left':i=='left'&&s.left-l<r.left?'right':i;o.removeClass(m).addClass(i)};var d=this.getCalculatedOffset(i,s,l,a);this.applyPlacement(d,i);var p=function(){var t=n.hoverState;n.$element.trigger('shown.bs.'+n.type);n.hoverState=null;if(t=='out')n.leave(n)};t.support.transition&&this.$tip.hasClass('fade')?o.one('bsTransitionEnd',p).emulateTransitionEnd(e.TRANSITION_DURATION):p()}};e.prototype.applyPlacement=function(e,o){var i=this.tip(),c=i[0].offsetWidth,l=i[0].offsetHeight,a=parseInt(i.css('margin-top'),10),p=parseInt(i.css('margin-left'),10);if(isNaN(a))a=0;if(isNaN(p))p=0;e.top+=a;e.left+=p;t.offset.setOffset(i[0],t.extend({using:function(t){i.css({top:Math.round(t.top),left:Math.round(t.left)})}},e),0);i.addClass('in');var h=i[0].offsetWidth,s=i[0].offsetHeight;if(o=='top'&&s!=l){e.top=e.top+l-s};var n=this.getViewportAdjustedDelta(o,e,h,s);if(n.left)e.left+=n.left;else e.top+=n.top;var r=/top|bottom/.test(o),f=r?n.left*2-c+h:n.top*2-l+s,u=r?'offsetWidth':'offsetHeight';i.offset(e);this.replaceArrow(f,i[0][u],r)};e.prototype.replaceArrow=function(t,e,i){this.arrow().css(i?'left':'top',50*(1-t/e)+'%').css(i?'top':'left','')};e.prototype.setContent=function(){var t=this.tip(),e=this.getTitle();t.find('.tooltip-inner')[this.options.html?'html':'text'](e);t.removeClass('fade in top bottom left right')};e.prototype.hide=function(i){var o=this,n=t(this.$tip),s=t.Event('hide.bs.'+this.type);function r(){if(o.hoverState!='in')n.detach();if(o.$element){o.$element.removeAttr('aria-describedby').trigger('hidden.bs.'+o.type)};i&&i()};this.$element.trigger(s);if(s.isDefaultPrevented())return;n.removeClass('in');t.support.transition&&n.hasClass('fade')?n.one('bsTransitionEnd',r).emulateTransitionEnd(e.TRANSITION_DURATION):r();this.hoverState=null;return this};e.prototype.fixTitle=function(){var t=this.$element;if(t.attr('title')||typeof t.attr('data-original-title')!='string'){t.attr('data-original-title',t.attr('title')||'').attr('title','')}};e.prototype.hasContent=function(Line truncated
 else if(h>e.top+e.height){o.top=e.top+e.height-h}}
 else{var l=i.left-s,a=i.left+s+n;if(l<e.left){o.left=e.left-l}
 else if(a>e.right){o.left=e.left+e.width-a}};return o};e.prototype.getTitle=function(){var e,i=this.$element,t=this.options;e=i.attr('data-original-title')||(typeof t.title=='function'?t.title.call(i[0]):t.title);return e};e.prototype.getUID=function(t){do t+=~~(Math.random()*1000000);while(document.getElementById(t))return t};e.prototype.tip=function(){if(!this.$tip){this.$tip=t(this.options.template);if(this.$tip.length!=1){throw new Error(this.type+' `template` option must consist of exactly 1 top-level element!')}};return this.$tip};e.prototype.arrow=function(){return(this.$arrow=this.$arrow||this.tip().find('.tooltip-arrow'))};e.prototype.enable=function(){this.enabled=!0};e.prototype.disable=function(){this.enabled=!1};e.prototype.toggleEnabled=function(){this.enabled=!this.enabled};e.prototype.toggle=function(e){var i=this;if(e){i=t(e.currentTarget).data('bs.'+this.type);if(!i){i=new this.constructor(e.currentTarget,this.getDelegateOptions());t(e.currentTarget).data('bs.'+this.type,i)}};if(e){i.inState.click=!i.inState.click;if(i.isInStateTrue())i.enter(i);else i.leave(i)}

src/Event/Core_Events.php

@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Event;
 
@@ -8,100 +9,26 @@ namespace Rarst\Laps\Event;
 class Core_Events implements Hook_Event_Config_Interface {
 
 	/**
-	 * @return array
+	 * @inheritDoc
 	 */
-	public function get_events() {
+	public function get_events(): array {
 
-		$stops = [];
-
-		$stops['plugins_loaded'][-2] = [
-			'action'   => 'stop',
-			'event'    => 'Plugins Load',
-			'category' => 'plugin',
+		return [
+			[ 'Plugins Load', 'plugin', '', 'plugins_loaded', - 1, - 2 ],
+			[ 'Plugins Loaded Hook', 'plugin', 'plugins_loaded' ],
+			[ 'Themes Load', 'theme', 'setup_theme', 'after_setup_theme' ],
+			[ 'Init Hook', 'core', 'init' ],
+			[ 'WP Loaded Hook', 'core', 'wp_loaded' ],
+			[ 'Query Setup', 'core', 'wp_loaded', 'template_redirect', PHP_INT_MAX, -1 ],
+			[ 'Template Loader', 'theme', 'template_redirect', 'template_include' ],
+			[ 'Admin Init Hook', 'core', 'admin_init' ],
+			[ 'Admin Menu', 'core', '_admin_menu', 'admin_menu' ],
+			[ 'Admin Print Scripts', 'core', 'admin_enqueue_scripts', 'admin_print_scripts' ],
+			[ 'Head Hook', 'theme', 'wp_head' ],
+			[ 'Main Loop', 'theme', 'loop_start', 'loop_end' ],
+			[ 'Sidebar', 'theme', 'dynamic_sidebar_before', 'dynamic_sidebar_after' ],
+			[ 'Toolbar', 'core', 'admin_bar_menu', '' ],
+			[ 'Footer Hook', 'theme', 'wp_footer' ],
 		];
-
-		$stops['plugins_loaded'][-1] = [
-			'event'    => 'Plugins Loaded Hook',
-			'category' => 'plugin',
-		];
-
-		$stops['plugins_loaded'][20] = [
-			'action'   => 'stop',
-			'event'    => 'Plugins Loaded Hook',
-			'category' => 'plugin',
-		];
-
-		$stops['setup_theme'][0] = [
-			'event'    => 'Themes Load',
-			'category' => 'theme',
-		];
-
-		$stops['after_setup_theme'][20] = [
-			'action'   => 'stop',
-			'event'    => 'Themes Load',
-			'category' => 'theme',
-		];
-
-		$stops['init'][-1] = [
-			'event'    => 'Core Init',
-			'category' => 'core',
-		];
-
-		$stops['wp_loaded'][20] = [
-			'action'   => 'stop',
-			'event'    => 'Core Init',
-			'category' => 'core',
-		];
-
-		$stops['admin_init'][-1] = [
-			'event'    => 'Core Admin Init',
-			'category' => 'core',
-		];
-
-		$stops['admin_init'][ PHP_INT_MAX - 1 ] = [
-			'action'   => 'stop',
-			'event'    => 'Core Admin Init',
-			'category' => 'core',
-		];
-
-		$stops['_admin_menu'][-1] = [
-			'event'    => 'Admin Menu',
-			'category' => 'core',
-		];
-
-		$stops['admin_menu'][ PHP_INT_MAX - 1 ] = [
-			'action'   => 'stop',
-			'event'    => 'Admin Menu',
-			'category' => 'core',
-		];
-
-		$stops['admin_bar_menu'][-1] = [
-			'event'    => 'Toolbar',
-			'category' => 'core',
-		];
-
-		$stops['loop_start'][10] = [
-			'event'    => 'Main Loop',
-			'category' => 'theme',
-		];
-
-		$stops['loop_end'][10] = [
-			'action'   => 'stop',
-			'event'    => 'Main Loop',
-			'category' => 'theme',
-		];
-
-		$stops['admin_enqueue_scripts'][10] = [
-			'event'    => 'Admin Print Scripts',
-			'category' => 'core',
-		];
-
-		$stops['admin_print_scripts'][10] = [
-			'action'   => 'stop',
-			'event'    => 'Admin Print Scripts',
-			'category' => 'core',
-		];
-
-		return $stops;
 	}
 }

src/Event/Extension_Events.php

@@ -0,0 +1,52 @@
+<?php
+declare( strict_types=1 );
+
+namespace Rarst\Laps\Event;
+
+/**
+ * Events for third party themes and plugins.
+ */
+class Extension_Events implements Hook_Event_Config_Interface {
+
+	/**
+	 * @inheritDoc
+	 */
+	public function get_events(): array {
+
+		return $this->beaver_builder();
+	}
+
+	/**
+	 * Beaver Builder events.
+	 *
+	 * @return array[]
+	 */
+	private function beaver_builder(): array {
+
+		$plugin = class_exists( 'FLBuilderLoader' ) ? [
+			[
+				'Beaver Builder Post Content',
+				'plugin',
+				'fl_builder_before_render_content',
+				'fl_builder_after_render_content',
+			],
+			[
+				'Beaver Builder Module',
+				'plugin',
+				'fl_builder_before_render_module',
+				'fl_builder_after_render_module',
+			],
+		] : [];
+
+		$theme = class_exists( 'FLTheme' ) ? [
+			[ 'Beaver Builder Top Bar', 'theme', 'fl_before_top_bar', 'fl_after_top_bar' ],
+			[ 'Beaver Builder Header', 'theme', 'fl_before_header', 'fl_after_header' ],
+			[ 'Beaver Builder Page Content', 'theme', 'fl_before_content', 'fl_after_content' ],
+			[ 'Beaver Builder Post', 'theme', 'fl_before_post', 'fl_after_post' ],
+			[ 'Beaver Builder Footer Widgets', 'theme', 'fl_before_footer_widgets', 'fl_after_footer_widgets' ],
+			[ 'Beaver Builder Footer', 'theme', 'fl_before_footer', 'fl_after_footer' ],
+		] : [];
+
+		return array_merge( $plugin, $theme );
+	}
+}

src/Event/Genesis_Events.php

@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Event;
 
@@ -6,53 +7,25 @@ namespace Rarst\Laps\Event;
  * Events for Genesis Framework based themes
  *
  * @link http://my.studiopress.com/themes/genesis/
+ *
+ * @deprecated 3.2:4.0 Events going to be moved to Extension_Events class.
  */
 class Genesis_Events implements Hook_Event_Config_Interface {
 
 	/**
-	 * @return array
+	 * @inheritDoc
 	 */
-	public function get_events() {
+	public function get_events(): array {
 
-		$events = [];
-
-		if ( ! function_exists( 'genesis' ) ) {
-			return $events;
-		}
-
-		$events['genesis_before_header'][10] = [
-			'event'    => 'Header',
-			'category' => 'theme',
-		];
-
-		$events['genesis_after_header'][10] = [
-			'action'   => 'stop',
-			'event'    => 'Header',
-			'category' => 'theme',
-		];
-
-		$events['genesis_before_sidebar_widget_area'][10] = [
-			'event'    => 'Sidebar',
-			'category' => 'theme',
-		];
-
-		$events['genesis_after_sidebar_widget_area'][10] = [
-			'action'   => 'stop',
-			'event'    => 'Sidebar',
-			'category' => 'theme',
-		];
-
-		$events['genesis_before_sidebar_alt_widget_area'][10] = [
-			'event'    => 'Sidebar (alternate)',
-			'category' => 'theme',
-		];
-
-		$events['genesis_after_sidebar_alt_widget_area'][10] = [
-			'action'   => 'stop',
-			'event'    => 'Sidebar (alternate)',
-			'category' => 'theme',
-		];
-
-		return $events;
+		return \function_exists( 'genesis' ) ? [
+			[ 'Header', 'theme', 'genesis_before_header', 'genesis_after_header' ],
+			[ 'Sidebar', 'theme', 'genesis_before_sidebar_widget_area', 'genesis_after_sidebar_widget_area' ],
+			[
+				'Sidebar (alternate)',
+				'theme',
+				'genesis_before_sidebar_alt_widget_area',
+				'genesis_after_sidebar_alt_widget_area',
+			],
+		] : [];
 	}
 }

src/Event/Hook_Event_Config_Interface.php

@@ -1,11 +1,19 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Event;
 
+use Rarst\Laps\Record\Collector\Hook_Collector;
+
+/**
+ * Interface to retrieve configuration array of hook events to track.
+ */
 interface Hook_Event_Config_Interface {
 
 	/**
-	 * @return array
+	 * @see Hook_Collector::add_event()
+	 *
+	 * @return array[]
 	 */
-	public function get_events();
+	public function get_events(): array;
 }

src/Event/Hybrid_Events.php

@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Event;
 
@@ -6,47 +7,40 @@ namespace Rarst\Laps\Event;
  * Events for Hybrid Core based themes
  *
  * @link http://themehybrid.com/hybrid-core
+ *
+ * @deprecated 3.2:4.0 Events going to be moved to Extension_Events class.
  */
 class Hybrid_Events implements Hook_Event_Config_Interface {
 
 	/**
-	 * @return array
+	 * @inheritDoc
 	 */
-	public function get_events() {
+	public function get_events(): array {
 
 		$events = [];
 
-		if ( ! function_exists( 'hybrid_get_prefix' ) ) {
+		if ( ! \function_exists( 'hybrid_get_prefix' ) ) {
 			return $events;
 		}
 
+		/** @var string $prefix */
 		$prefix = hybrid_get_prefix();
 
-		$events["{$prefix}_before_header"][10] = [
-			'event'    => 'Header',
-			'category' => 'theme',
-		];
-
-		$events["{$prefix}_after_header"][10] = [
-			'action'   => 'stop',
-			'event'    => 'Header',
-			'category' => 'theme',
+		$events = [
+			[ 'Header', 'theme', "{$prefix}_before_header", "{$prefix}_after_header" ],
 		];
 
+		/** @var array $sidebars */
 		$sidebars = get_theme_support( 'hybrid-core-sidebars' );
 
 		if ( ! empty( $sidebars[0] ) ) {
+			/** @var string $sidebar */
 			foreach ( $sidebars[0] as $sidebar ) {
-
-				$events["{$prefix}_before_{$sidebar}"][10] = [
-					'event'    => "Sidebar ({$sidebar})",
-					'category' => 'theme',
-				];
-
-				$events["{$prefix}_after_{$sidebar}"][10] = [
-					'action'   => 'stop',
-					'event'    => "Sidebar ({$sidebar})",
-					'category' => 'theme',
+				$events[] = [
+					"Sidebar ({$sidebar})",
+					'theme',
+					"{$prefix}_before_{$sidebar}",
+					"{$prefix}_after_{$sidebar}",
 				];
 			}
 		}

src/Event/THA_Events.php

@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Event;
 
@@ -6,42 +7,19 @@ namespace Rarst\Laps\Event;
  * Events for Theme Hook Alliance
  *
  * @link http://zamoose.github.io/themehookalliance/
+ *
+ * @deprecated 3.2:4.0 Events going to be moved to Extension_Events class.
  */
 class THA_Events implements Hook_Event_Config_Interface {
 
 	/**
-	 * @return array
+	 * @inheritDoc
 	 */
-	public function get_events() {
+	public function get_events(): array {
 
-		$events = [];
-
-		if ( ! defined( 'THA_HOOKS_VERSION' ) ) {
-			return $events;
-		}
-
-		$events['tha_header_before'][10] = [
-			'event'    => 'Header',
-			'category' => 'theme',
-		];
-
-		$events['tha_header_after'][10] = [
-			'action'   => 'stop',
-			'event'    => 'Header',
-			'category' => 'theme',
-		];
-
-		$events['tha_sidebars_before'][10] = [
-			'event'    => 'Sidebars',
-			'category' => 'theme',
-		];
-
-		$events['tha_sidebars_after'][10] = [
-			'action'   => 'stop',
-			'event'    => 'Sidebars',
-			'category' => 'theme',
-		];
-
-		return $events;
+		return \defined( 'THA_HOOKS_VERSION' ) ? [
+			[ 'Header', 'theme', 'tha_header_before', 'tha_header_after' ],
+			[ 'Sidebars', 'theme', 'tha_sidebars_before', 'tha_sidebars_after' ],
+		] : [];
 	}
 }

src/Event/WooCommerce_Events.php

@@ -0,0 +1,27 @@
+<?php
+declare( strict_types=1 );
+
+namespace Rarst\Laps\Event;
+
+/**
+ * Events for WooCommerce plugin
+ *
+ * @deprecated 3.2:4.0 Events going to be moved to Extension_Events class.
+ */
+class WooCommerce_Events implements Hook_Event_Config_Interface {
+
+	/**
+	 * @inheritDoc
+	 */
+	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 Shop Item', 'plugin', 'woocommerce_before_shop_loop_item', 'woocommerce_after_shop_loop_item' ],
+			[ '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/Event/Yoast_Events.php

@@ -1,34 +1,22 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Event;
 
 /**
  * Events for Yoast plugins
+ *
+ * @deprecated 3.2:4.0 Events going to be moved to Extension_Events class.
  */
 class Yoast_Events implements Hook_Event_Config_Interface {
 
 	/**
-	 * @return array
+	 * @inheritDoc
 	 */
-	public function get_events() {
+	public function get_events(): array {
 
-		$stops = [];
-
-		if ( ! class_exists( 'WPSEO_Frontend' ) ) {
-			return $stops;
-		}
-
-		$stops['wpseo_head'][1] = [
-			'event'    => 'WP SEO head hook',
-			'category' => 'plugin',
-		];
-
-		$stops['wpseo_head'][100] = [
-			'action'   => 'stop',
-			'event'    => 'WP SEO head hook',
-			'category' => 'plugin',
-		];
-
-		return $stops;
+		return class_exists( 'WPSEO_Frontend' ) ? [
+			[ 'WP SEO head hook', 'plugin', 'wpseo_head' ],
+		] : [];
 	}
 }

src/Formatter/Backtrace_Formatter.php

@@ -0,0 +1,103 @@
+<?php
+declare( strict_types=1 );
+
+namespace Rarst\Laps\Formatter;
+
+/**
+ * Formatter to adjust WP backtrace output to be more short and concise.
+ */
+class Backtrace_Formatter {
+
+	/** @var string[] $skip String matches to omit. */
+	protected static $skip = [
+		'wp-blog-header.php',
+		'wp-load.php',
+		'wp-config.php',
+		'admin.php',
+		'template-loader.php',
+		'locate_template',
+		'load_template',
+		'_wp_get_current_user',
+		'WP_Hook',
+	];
+
+	/** @var array $truncate_paths Paths to truncate from includes. */
+	protected $truncate_paths = [];
+
+	/**
+	 * Set up object properties.
+	 */
+	public function __construct() {
+
+		$this->truncate_paths = [
+			wp_normalize_path( WP_CONTENT_DIR ),
+			wp_normalize_path( ABSPATH ),
+			'wp-admin/',
+			'themes/',
+			'plugins/',
+		];
+	}
+
+	/**
+	 * @param array|string $backtrace Backtrace input as produced by WP.
+	 *
+	 * @return array
+	 */
+	public function format( $backtrace ): array {
+
+		if ( \is_string( $backtrace ) ) {
+			$backtrace = explode( ', ', $backtrace );
+		} else {
+			$backtrace = array_reverse( $backtrace );
+		}
+
+		$backtrace = array_filter( $backtrace, [ $this, 'filter' ] );
+		$backtrace = array_map( [ $this, 'shorten_include' ], $backtrace );
+
+		// TODO compact redunant function sequences, such as transient into option calls.
+
+		return $backtrace;
+	}
+
+	/**
+	 * @param string $item Backtrace item.
+	 *
+	 * @return bool Keep or drop.
+	 */
+	protected function filter( string $item ): bool {
+
+		foreach ( self::$skip as $match ) {
+			if ( false !== strpos( $item, $match ) ) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 *
+	 * @psalm-suppress PossiblyFalseOperand
+	 *
+	 * @param string $item Backtrace item.
+	 *
+	 * @return string
+	 */
+	protected function shorten_include( string $item ): string {
+
+		if ( 0 === strpos( $item, 'include' ) || 0 === strpos( $item, 'require' ) ) {
+
+			$path = substr( $item, strpos( $item, '(\'' ) + 2, - 2 );
+			$path = wp_normalize_path( $path );
+			$path = str_replace( $this->truncate_paths, '', $path );
+			if ( ':' === $path[1] ) {
+				$path = substr( $path, 2 );
+			}
+			$path = ltrim( $path, '/' );
+
+			return $path;
+		}
+
+		return $item;
+	}
+}

src/Formatter/Hook_Formatter.php

@@ -0,0 +1,134 @@
+<?php
+declare( strict_types=1 );
+
+namespace Rarst\Laps\Formatter;
+
+/**
+ * Formatter to process callbacks from a hook instance.
+ */
+class Hook_Formatter {
+
+	/** @var array $truncate_paths Paths to truncate from includes. */
+	protected $truncate_paths = [];
+
+	/**
+	 * Set up object properties.
+	 */
+	public function __construct() {
+
+		// TODO inject paths instead of reaching for global constants.
+		$this->truncate_paths = [
+			wp_normalize_path( WP_CONTENT_DIR ),
+			wp_normalize_path( ABSPATH ),
+			'wp-admin/',
+		];
+	}
+
+	/**
+	 * @psalm-type  Callback = string|object|array
+	 * @psalm-type  AcceptedArgs = int
+	 * @psalm-type  Hook = array{function: Callback, accepted_args: AcceptedArgs}
+	 * @psalm-type  Priority = array-key
+	 * @psalm-type  Hooks = array<Priority, array<Hook>>
+	 *
+	 * @param \WP_Hook|array $hook Hook instance.
+	 * @psalm-param \WP_Hook|Hooks $hook
+	 *
+	 * @return array
+	 */
+	public function format( $hook ): array {
+
+		$callbacks = [];
+
+		if ( $hook instanceof \WP_Hook ) {
+			/** @psalm-var Hooks $hook->callbacks */
+			$hook = $hook->callbacks;
+		}
+
+		if ( empty( $hook ) ) {
+			return $callbacks;
+		}
+
+		ksort( $hook );
+
+		$functions = array_merge( ...$hook );
+
+		foreach ( $functions as $function ) {
+			$callback = $this->get_callback_name( $function['function'], $function['accepted_args'] );
+
+			if ( false !== strpos( $callback, 'Hook_Collector' ) ) {
+				continue;
+			}
+
+			$callbacks[] = $callback;
+		}
+
+		return $callbacks;
+	}
+
+	/**
+	 * @param string|object|array $callback Hook callback.
+	 * @param int                 $args     Number of accepted arguments.
+	 */
+	protected function get_callback_name( $callback, int $args ): string {
+
+		switch ( gettype( $callback ) ) {
+			case 'object':
+				$name = $this->get_class_name( $callback );
+				break;
+
+			case 'array':
+				/** @psalm-var array{0: object|string, 1: string} $callback */
+				$class = is_string( $callback[0] )
+					? $callback[0] . '::'
+					: $this->get_class_name( $callback[0] ) . '->';
+				$name  = $class . $callback[1];
+				break;
+
+			default:
+				$name = $callback;
+		}
+
+		return $name . ( ( 1 === $args ) ? '' : "({$args})" );
+	}
+
+	/**
+	 * @param object $object Object to retrieve name for.
+	 *
+	 * @return string
+	 */
+	protected function get_class_name( $object ): string {
+
+		if ( $object instanceof \Closure ) {
+			$class = new \ReflectionFunction( $object );
+
+			return 'closure from ' . $this->shorten_path( $class->getFileName() ) . ':' . $class->getStartLine();
+		}
+
+		$class = new \ReflectionClass( $object );
+		$name  = $class->getName();
+
+		if ( 0 === strpos( $name, 'class@anonymous' ) ) {
+			return 'anonymous class from ' . $this->shorten_path( $class->getFileName() ) . ':' . $class->getStartLine();
+		}
+
+		return $name;
+	}
+
+	/**
+	 * @param string $path Path to shorten.
+	 *
+	 * @return string
+	 */
+	protected function shorten_path( string $path ): string {
+		$path = wp_normalize_path( $path );
+		$path = str_replace( $this->truncate_paths, '', $path );
+		if ( ':' === $path[1] ) {
+			$path = substr( $path, 2 );
+		}
+		$path = ltrim( $path, '/' );
+
+		return $path;
+	}
+}
+

src/Manager/Asset_Manager.php

@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Manager;
 
@@ -19,10 +20,10 @@ class Asset_Manager {
 	/**
 	 * Registers assets and queues as necessary.
 	 */
-	public function enqueue_scripts() {
+	public function enqueue_scripts(): void {
 
-		$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
-		wp_register_script( 'laps', plugins_url( "public/js/laps{$suffix}.js", dirname( __DIR__ ) ), [ 'jquery' ], '3.3.1', true );
+		$suffix = ( \defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
+		wp_register_script( 'laps', plugins_url( "public/js/laps{$suffix}.js", dirname( __DIR__ ) ), [ 'jquery' ], '3.4.0', true );
 		wp_register_style( 'laps', plugins_url( "public/css/laps{$suffix}.css", dirname( __DIR__ ) ) );
 
 		if ( is_admin_bar_showing() ) {

src/Manager/Load_Order_Manager.php

@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Manager;
 
@@ -20,12 +21,10 @@ class Load_Order_Manager {
 	 * Reorder active plugins so Laps is first and starts timing load early.
 	 *
 	 * @param array $plugins Filtered array of active plugins’ basenames.
-	 *
-	 * @return array
 	 */
-	public function pre_update_option_active_plugins( $plugins ) {
+	public function pre_update_option_active_plugins( array $plugins ): array {
 
-		$plugin = plugin_basename( dirname( dirname( __DIR__ ) ) . '/laps.php' );
+		$plugin = plugin_basename( \dirname( __DIR__, 2 ) . '/laps.php' );
 		$key    = array_search( $plugin, $plugins, true );
 
 		if ( false !== $key && $key > 0 ) {

src/Manager/Server_Timing_Manager.php

@@ -0,0 +1,76 @@
+<?php
+declare( strict_types=1 );
+
+namespace Rarst\Laps\Manager;
+
+use Rarst\Laps\Plugin;
+use Rarst\Laps\Record\Collector\Record_Collector_Interface;
+use Rarst\Laps\Record\Record_Interface;
+
+/**
+ * Implements Server Timing API headers.
+ */
+class Server_Timing_Manager {
+
+	/** @var Record_Collector_Interface */
+	private $collector;
+
+	/**
+	 * @param Record_Collector_Interface $collector Collector of all records.
+	 */
+	public function __construct( Record_Collector_Interface $collector ) {
+
+		$this->collector = $collector;
+
+		add_action( 'admin_init', [ $this, 'send_timing_header' ], PHP_INT_MAX );
+		add_action( 'rest_pre_serve_request', [ $this, 'send_timing_header' ] );
+	}
+
+	/**
+	 * Sends Server Timing API header with records data.
+	 *
+	 * @param mixed $input Pass-through input for attaching to a filter hook.
+	 *
+	 * @return mixed
+	 */
+	public function send_timing_header( $input ) {
+
+		if ( headers_sent() ) {
+			return $input;
+		}
+
+		$ajax = defined( 'DOING_AJAX' ) && DOING_AJAX;
+		$rest = defined( 'REST_REQUEST' ) && REST_REQUEST;
+
+		if ( ! $ajax && ! $rest ) {
+			return $input;
+		}
+
+		// This will be false in REST API w/o nonce, even with valid cookie. Might make sense to filter to true in dev.
+		if ( ! apply_filters( 'laps_can_see', current_user_can( 'manage_options' ) ) ) {
+			return $input;
+		}
+
+		$header  = '';
+
+		/** @var Record_Interface $record */
+		foreach ( $this->collector->get_records() as $record ) {
+			$duration = $record->get_duration() * 1000;
+
+			if ( $duration < 1 ) { // Filter out less than 1ms events as too noisy.
+				continue;
+			}
+
+			$header .= sprintf( '%s;dur=%.2f;desc="%s", ', $record->get_category(), $duration, $record->get_name() );
+
+			if ( strlen( $header ) > 2000 ) { // 8+KB headers break proxies, 4+KB nginx, so we cut off at 1/2 that limit.
+				break;
+			}
+		}
+
+		// Sanitize to visible US ASCII character range (32-126).
+		header( 'Server-Timing: ' . preg_replace( '/[^\x20-\x7E]/', '', $header ) );
+
+		return $input;
+	}
+}

src/Manager/Toolbar_Manager.php

@@ -1,27 +1,35 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Manager;
 
-use Rarst\Laps\Record\Recursive_Record_Iterator;
+use Mustache_Engine;
+use Rarst\Laps\Record\Collector\Record_Collector_Interface;
+use Rarst\Laps\Record\Iterator\Recursive_Record_Iterator;
 use Rarst\Laps\Plugin;
-use Rarst\Laps\Record\Timeline_Iterator;
+use Rarst\Laps\Record\Iterator\Timeline_Iterator;
 
 /**
  * Implements toolbar menu and visualization.
  */
 class Toolbar_Manager {
 
-	/** @var Plugin $laps */
-	protected $laps;
+	/** @var Record_Collector_Interface $collector */
+	protected $collector;
+
+	/** @var Mustache_Engine */
+	private $mustache;
 
 	/**
-	 * @param Plugin $laps Container instance.
+	 * @param Record_Collector_Interface $collector Collector of all records..
+	 * @param Mustache_Engine            $mustache  Mustache instance.
 	 */
-	public function __construct( Plugin $laps ) {
+	public function __construct( Record_Collector_Interface $collector, Mustache_Engine $mustache ) {
 
-		$this->laps = $laps;
+		$this->collector = $collector;
+		$this->mustache  = $mustache;
 
-		add_action( 'admin_bar_menu', [ $this, 'admin_bar_menu' ], 100 );
+		add_action( 'admin_bar_menu', [ $this, 'admin_bar_menu' ], 1000 );
 	}
 
 	/**
@@ -29,7 +37,7 @@ class Toolbar_Manager {
 	 *
 	 * @param \WP_Admin_Bar $wp_admin_bar WordPress core toolbar object.
 	 */
-	public function admin_bar_menu( $wp_admin_bar ) {
+	public function admin_bar_menu( \WP_Admin_Bar $wp_admin_bar ): void {
 
 		if ( ! apply_filters( 'laps_can_see', current_user_can( 'manage_options' ) ) ) {
 			return;
@@ -45,9 +53,9 @@ class Toolbar_Manager {
 		$wp_admin_bar->add_node( [
 			'id'     => 'laps_output',
 			'parent' => 'laps',
-			'meta'   => [
-				'html' => $this->laps['mustache']->render( 'laps', [
-					'timelines' => new Timeline_Iterator( new Recursive_Record_Iterator( $this->laps['records'] ) ),
+			'meta'   => [ // TODO consider doing render lazily, but might not be worth the effort.
+				'html' => $this->mustache->render( 'laps', [
+					'timelines' => new Timeline_Iterator( new Recursive_Record_Iterator( $this->collector->get_records() ) ),
 				] ),
 			],
 		] );

src/Mustache_Cache_FrozenCache.php

@@ -1,4 +1,6 @@
 <?php
+declare( strict_types=1 );
+
 namespace Rarst\Laps;
 
 /**
@@ -9,12 +11,14 @@ class Mustache_Cache_FrozenCache extends \Mustache_Cache_FilesystemCache {
 	/**
 	 * Cache and load a compiled Mustache_Template class.
 	 *
+	 * @psalm-suppress InvalidScalarArgument
+	 *
 	 * @param string $key   Key.
 	 * @param string $value Value.
 	 *
 	 * @return void
 	 */
-	public function cache( $key, $value ) {
+	public function cache( $key, $value ): void {
 
 		$this->log(
 			\Mustache_Logger::WARNING,

src/Plugin.php

@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps;
 
@@ -19,6 +20,7 @@ class Plugin extends Container {
 
 	/**
 	 * @param array $values Configuration values to apply.
+	 * @psalm-param array<string, mixed> $values
 	 */
 	public function __construct( array $values = [] ) {
 
@@ -26,7 +28,7 @@ class Plugin extends Container {
 
 		$laps = $this;
 
-		$laps['mustache'] = function () {
+		$laps['mustache'] = function (): \Mustache_Engine {
 			return new \Mustache_Engine( [
 				'loader' => new \Mustache_Loader_FilesystemLoader( dirname( __DIR__ ) . '/src/mustache' ),
 				'cache'  => new Mustache_Cache_FrozenCache( dirname( __DIR__ ) . '/src/mustache/cache' ),
@@ -48,7 +50,7 @@ class Plugin extends Container {
 	 *
 	 * @return $this|static
 	 */
-	public function register( ServiceProviderInterface $provider, array $values = [] ) {
+	public function register( ServiceProviderInterface $provider, array $values = [] ): self {
 
 		$this->providers[] = $provider;
 
@@ -60,11 +62,7 @@ class Plugin extends Container {
 	/**
 	 * Start Stopwatch and timing plugin load immediately, then set up core events and needed hooks.
 	 */
-	public function run() {
-
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-			return;
-		}
+	public function run(): void {
 
 		foreach ( $this->providers as $provider ) {
 

src/Provider/Bootable_Provider_Interface.php

@@ -1,15 +1,20 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Provider;
 
+use Pimple\ServiceProviderInterface;
 use Rarst\Laps\Plugin;
 
-interface Bootable_Provider_Interface {
+/**
+ * Interface for providers that need to boot up once plugin is ready to start.
+ */
+interface Bootable_Provider_Interface extends ServiceProviderInterface {
 
 	/**
 	 * @param Plugin $laps Container instance.
 	 *
 	 * @return void
 	 */
-	public function boot( Plugin $laps );
+	public function boot( Plugin $laps ): void;
 }

src/Provider/Hook_Event_Provider.php

@@ -1,13 +1,16 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Provider;
 
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 use Rarst\Laps\Event\Core_Events;
+use Rarst\Laps\Event\Extension_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;
 
 /**
@@ -17,16 +20,20 @@ class Hook_Event_Provider implements ServiceProviderInterface {
 
 	/**
 	 * @param Container $pimple Container instance.
+	 *
+	 * @psalm-suppress DeprecatedClass
 	 */
-	public function register( Container $pimple ) {
+	public function register( Container $pimple ): void {
 
-		$pimple['hook.events'] = function () {
+		$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(),
+				'extension'   => new Extension_Events(),
+				'genesis'     => new Genesis_Events(),
+				'hybrid'      => new Hybrid_Events(),
+				'tha'         => new THA_Events(),
+				'woocommerce' => new WooCommerce_Events(),
+				'yoast'       => new Yoast_Events(),
 			];
 		};
 	}

src/Provider/Manager_Provider.php

@@ -1,9 +1,11 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Provider;
 
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
+use Rarst\Laps\Manager\Server_Timing_Manager;
 use Rarst\Laps\Plugin;
 use Rarst\Laps\Manager\Asset_Manager;
 use Rarst\Laps\Manager\Load_Order_Manager;
@@ -17,13 +19,14 @@ class Manager_Provider implements ServiceProviderInterface, Bootable_Provider_In
 	/**
 	 * @param Container $pimple Container instance.
 	 */
-	public function register( Container $pimple ) {
+	public function register( Container $pimple ): void {
 
-		$pimple['managers'] = function ( Plugin $laps ) {
+		$pimple['managers'] = function ( Plugin $laps ): array {
 			return [
 				new Load_Order_Manager(),
 				new Asset_Manager(),
-				new Toolbar_Manager( $laps ),
+				new Toolbar_Manager( $laps['records.lazy'], $laps['mustache'] ),
+				new Server_Timing_Manager( $laps['records.lazy'] ),
 			];
 		};
 	}
@@ -31,7 +34,7 @@ class Manager_Provider implements ServiceProviderInterface, Bootable_Provider_In
 	/**
 	 * @param Plugin $laps Container instance.
 	 */
-	public function boot( Plugin $laps ) {
+	public function boot( Plugin $laps ): void {
 		$laps['managers'];
 	}
 }

src/Provider/Record_Provider.php

@@ -1,15 +1,17 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Provider;
 
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 use Rarst\Laps\Plugin;
-use Rarst\Laps\Record\Core_Load_Collector;
-use Rarst\Laps\Record\Hook_Record_Collector;
-use Rarst\Laps\Record\Http_Record_Collector;
-use Rarst\Laps\Record\Record_Collector_Interface;
-use Rarst\Laps\Record\Sql_Record_Collector;
+use Rarst\Laps\Record\Collector\Core_Load_Collector;
+use Rarst\Laps\Record\Collector\Hook_Collector;
+use Rarst\Laps\Record\Collector\Http_Collector;
+use Rarst\Laps\Record\Collector\Lazy_Proxy_Collector;
+use Rarst\Laps\Record\Collector\Plugin_Load_Collector;
+use Rarst\Laps\Record\Collector\Sql_Collector;
 use Symfony\Component\Stopwatch\Stopwatch;
 
 /**
@@ -20,38 +22,35 @@ class Record_Provider implements ServiceProviderInterface, Bootable_Provider_Int
 	/**
 	 * @param Container $pimple Container instance.
 	 */
-	public function register( Container $pimple ) {
+	public function register( Container $pimple ): void {
 
-		$pimple['stopwatch'] = $pimple->factory( function () {
+		$pimple['stopwatch'] = $pimple->factory( function (): Stopwatch {
 			return new Stopwatch( true );
 		} );
 
-		$pimple['collectors'] = function ( Plugin $laps ) {
+		$pimple['collectors'] = function ( Plugin $laps ): array {
 			return [
-				'core' => new Core_Load_Collector(),
-				'hook' => new Hook_Record_Collector( $laps['stopwatch'], $laps['hook.events'] ),
-				'http' => new Http_Record_Collector( $laps['stopwatch'] ),
-				'sql'  => new Sql_Record_Collector(),
+				'core'    => new Core_Load_Collector(),
+				'hook'    => new Hook_Collector( $laps['stopwatch'], $laps['hook.events'] ),
+				'plugins' => new Plugin_Load_Collector(),
+				'http'    => new Http_Collector( $laps['stopwatch'] ),
+				'sql'     => new Sql_Collector(),
 			];
 		};
 
-		$pimple['records'] = function ( Plugin $laps ) {
+		$pimple['records.lazy'] = function ( Plugin $laps ): Lazy_Proxy_Collector {
+			return new Lazy_Proxy_Collector( $laps['collectors'] );
+		};
 
-			$records = [];
-
-			/** @var Record_Collector_Interface $collector */
-			foreach ( $laps['collectors'] as $collector ) {
-				$records[] = $collector->get_records();
-			}
-
-			return array_merge( ...$records );
+		$pimple['records'] = function ( Plugin $laps ): array {
+			return $laps['records.lazy']->get_records();
 		};
 	}
 
 	/**
 	 * @param Plugin $laps Container instance.
 	 */
-	public function boot( Plugin $laps ) {
+	public function boot( Plugin $laps ): void {
 		$laps['collectors'];
 	}
 }

src/Record/Collector/Core_Load_Collector.php

@@ -0,0 +1,77 @@
+<?php
+declare( strict_types=1 );
+
+namespace Rarst\Laps\Record\Collector;
+
+use Rarst\Laps\Record\Record;
+use Rarst\Laps\Record\Record_Interface;
+
+/**
+ * Covers pre–plugin load time from available data.
+ */
+class Core_Load_Collector implements Record_Collector_Interface {
+
+	/** @var float $timeload */
+	protected $timeload;
+
+	/** @var bool Flag if Laps is network activated. */
+	private $network_activated;
+
+	/**
+	 * Store plugin load start mark.
+	 */
+	public function __construct() {
+		$this->timeload          = microtime( true );
+		$this->network_activated = ! did_action( 'muplugins_loaded' );
+	}
+
+	/**
+	 * @return Record_Interface[]
+	 */
+	public function get_records(): array {
+
+		global $timestart;
+
+		$request_time = filter_var( $_SERVER['REQUEST_TIME_FLOAT'], FILTER_VALIDATE_FLOAT );
+
+		$php = 'PHP Load – ' . PHP_VERSION;
+
+		if ( $this->opcache_api_available() ) {
+			/**
+			 * This is silenced since it might still emit warning for correct `opcache.resrict_api` configuration.
+			 * @see https://github.com/php/php-src/issues/8799
+			 */
+			$zend_status = @opcache_get_status();
+			$php         .= empty( $zend_status['opcache_enabled'] ) ? '' : ' – OPcache';
+		}
+
+		$load = $this->network_activated ? 'Core Load' : 'Core & MU Plugins Load';
+
+		/**
+		 * @var float $request_time
+		 * @var float $timestart
+		 */
+		return [
+			new Record( $php, $request_time, $timestart - $request_time, '', 'php' ),
+			new Record( $load, $timestart, $this->timeload - $timestart, '', 'core' ),
+		];
+	}
+
+	private function opcache_api_available(): bool {
+		if ( ! function_exists( 'opcache_get_status' ) ) {
+			return false;
+		}
+
+		$restrict_api = ini_get( 'opcache.restrict_api' );
+
+		if ( ! $restrict_api ) {
+			return true;
+		}
+
+		/**
+		 * The paths aren't normalized, because it is unclear if they are in PHP itself
+		 * and this should rather be false negative to prevent warning emitted.
+		 */
+		return 0 === stripos( __FILE__, $restrict_api );
+	}
+}

src/Record/Collector/Hook_Collector.php

@@ -0,0 +1,263 @@
+<?php
+declare( strict_types=1 );
+
+namespace Rarst\Laps\Record\Collector;
+
+use Rarst\Laps\Event\Hook_Event_Config_Interface;
+use Rarst\Laps\Formatter\Hook_Formatter;
+use Rarst\Laps\Record\Stopwatch_Record;
+use Symfony\Component\Stopwatch\Stopwatch;
+use Symfony\Component\Stopwatch\StopwatchEvent;
+
+/**
+ * Processes events based on hooked starts and stops.
+ */
+class Hook_Collector extends Stopwatch_Collector {
+
+	/** @var Hook_Event_Config_Interface[] $event_configs */
+	protected $event_configs = [];
+
+	/** @var array $events */
+	protected $events = [];
+
+	/**
+	 * @var array $callbacks
+	 * @psalm-var array<string, \WP_Hook> $callbacks
+	 */
+	protected $callbacks = [];
+
+	/** @var Hook_Formatter */
+	protected $formatter;
+
+	/**
+	 * @var array $calls Tracks number of calls for recurrent events.
+	 * @psalm-var array<string, int> $calls
+	 */
+	private $calls = [];
+
+	/**
+	 * @param Stopwatch                     $stopwatch     Stopwatch instance.
+	 * @param Hook_Event_Config_Interface[] $event_configs Starts and stops configuration.
+	 */
+	public function __construct( Stopwatch $stopwatch, array $event_configs ) {
+
+		parent::__construct( $stopwatch );
+
+		if ( did_action( 'muplugins_loaded' ) ) {
+			$this->start( 'Plugins Load', 'plugin' );
+		} else {
+			$this->start( 'Network & MU Plugins Load', 'plugin' );
+			add_action( 'muplugins_loaded', [ $this, 'muplugins_loaded' ], PHP_INT_MAX );
+		}
+		$this->add_events( $event_configs['core']->get_events() );
+		unset( $event_configs['core'] );
+		$this->event_configs = $event_configs;
+
+		add_action( 'after_setup_theme', [ $this, 'after_setup_theme' ], 15 );
+
+		$this->formatter = new Hook_Formatter();
+	}
+
+	/**
+	 * Time the point between network/MU plugins and regular if network activated.
+	 */
+	public function muplugins_loaded(): void {
+		$this->stop( 'Network & MU Plugins Load' );
+		$this->start( 'Plugins Load', 'plugin' );
+	}
+
+	/**
+	 * Hook events by name and priority from array.
+	 *
+	 * @param array $stops Starts and stops to hook.
+	 */
+	public function add_events( array $stops ): void {
+
+		$this->events = array_merge( $this->events, $stops );
+
+		/**
+		 * @var int|string $key
+		 * @var array      $data
+		 */
+		foreach ( $stops as $key => $data ) {
+
+			if ( is_int( $key ) ) {
+				$this->add_event( ...$data );
+				continue;
+			}
+
+			/** @var int $priority */
+			foreach ( array_keys( $data ) as $priority ) {
+				add_action( $key, [ $this, 'tick' ], $priority );
+			}
+		}
+	}
+
+	/**
+	 * Add a start/stop pair of hook event.
+	 *
+	 * @param string      $event          Hook event name.
+	 * @param string      $category       Hook event category.
+	 * @param string      $start          Start hook name. Pass empty string to ignore.
+	 * @param string|null $stop           Stop hook name (defaults to start name). Pass empty string to ignore.
+	 * @param int         $start_priority Start hook priority (defaults to -1).
+	 * @param int         $stop_priority  Stop hook priority (defaults to max int).
+	 *
+	 * @psalm-suppress MissingClosureReturnType
+	 * @psalm-suppress MissingClosureParamType
+	 */
+	private function add_event(
+		string $event,
+		string $category,
+		string $start,
+		?string $stop = null,
+		int $start_priority = - 1,
+		int $stop_priority = PHP_INT_MAX
+	): void {
+		if ( null === $stop ) {
+			$stop = $start;
+		}
+
+		if ( '' !== $start ) {
+			add_action( $start, function ( $input = null ) use ( $event, $category, $start, $stop ) {
+				global $wp_filter;
+
+				$event .= $this->get_count_suffix( $event, true );
+
+				if ( 'Sidebar' === $event ) {
+					/** @var string $input */
+					$event = $input;
+				}
+
+				if ( $start === $stop ) {
+					/** @psalm-var array<string, \WP_Hook> $wp_filter */
+					$this->callbacks[ $event ] = $wp_filter[ $start ];
+				}
+
+				$this->start( $event, $category );
+
+				return $input;
+			}, $start_priority );
+		}
+
+		if ( '' !== $stop ) {
+			add_action( $stop, function ( $input = null ) use ( $event ) {
+
+				$event .= $this->get_count_suffix( $event );
+
+				if ( 'Sidebar' === $event ) {
+					/** @var string $input */
+					$event = $input;
+				}
+
+				$this->stop( $event );
+
+				return $input;
+			}, $stop_priority );
+		}
+	}
+
+	/**
+	 * Get the suffix to use if event occurs multiple times.
+	 *
+	 * @param string  $event     Event name.
+	 * @param boolean $increment Flag to increment count.
+	 *
+	 * @return string
+	 */
+	private function get_count_suffix( string $event, bool $increment = false ): string {
+
+		if ( ! isset( $this->calls[ $event ] ) ) {
+			$this->calls[ $event ] = 0;
+		}
+
+		if ( $increment ) {
+			$this->calls[ $event ] ++;
+		}
+
+		$count = (int) $this->calls[ $event ];
+
+		return $count > 1 ? " ({$count})" : '';
+	}
+
+	/**
+	 * When theme is done possibly add vendor-specific events.
+	 */
+	public function after_setup_theme(): void {
+
+		foreach ( $this->event_configs as $config ) {
+			$this->add_events( $config->get_events() );
+		}
+	}
+
+	/**
+	 * Mark action for the event on Stopwatch.
+	 *
+	 * @deprecated 3.0:4.0 Deprecated in favor of the new format.
+	 * @codeCoverageIgnore
+	 *
+	 * @param mixed $input Pass through if added to filter.
+	 *
+	 * @return mixed
+	 */
+	public function tick( $input = null ) {
+
+		global $wp_filter;
+
+		/** @var string $filter_name */
+		$filter_name     = current_filter();
+		/**
+		 * @var \WP_Hook|array $filter_instance
+		 * @var array<string,\WP_hook|array> $wp_filter
+		 */
+		$filter_instance = $wp_filter[ $filter_name ];
+		/** @var int $priority */
+		$priority        = $filter_instance instanceof \WP_Hook ? $filter_instance->current_priority() : key( $filter_instance );
+
+		// See https://core.trac.wordpress.org/ticket/41185 on broken priority, but more general sanity check.
+		if ( empty( $this->events[ $filter_name ][ $priority ] ) ) {
+			return $input;
+		}
+
+		$event = \wp_parse_args( $this->events[ $filter_name ][ $priority ], [
+			'action'   => 'start',
+			'category' => null,
+		] );
+
+		if ( 'start' === $event['action'] ) {
+			$this->start( $event['event'], $event['category'] );
+		} else {
+			$this->stop( $event['event'] );
+		}
+
+		return $input;
+	}
+
+	/**
+	 * @return Stopwatch_Record[]
+	 */
+	public function get_records(): array {
+
+		$this->stop( 'Toolbar' );
+		$this->stop( 'Footer Hook' );
+
+		return parent::get_records();
+	}
+
+	/**
+	 * @param string         $name  Event name.
+	 * @param StopwatchEvent $event Stopwatch event instance.
+	 *
+	 * @return Stopwatch_Record
+	 */
+	protected function transform( string $name, StopwatchEvent $event ): Stopwatch_Record {
+
+		$description = '';
+
+		if ( isset( $this->callbacks[ $name ] ) ) {
+			$description = implode( '<br />', $this->formatter->format( $this->callbacks[ $name ] ) );
+		}
+
+		return new Stopwatch_Record( $name, $event, $description );
+	}
+}

src/Record/Collector/Http_Collector.php

@@ -0,0 +1,95 @@
+<?php
+declare( strict_types=1 );
+
+namespace Rarst\Laps\Record\Collector;
+
+use Rarst\Laps\Formatter\Backtrace_Formatter;
+use Rarst\Laps\Record\Stopwatch_Record;
+use Symfony\Component\Stopwatch\Stopwatch;
+use Symfony\Component\Stopwatch\StopwatchEvent;
+
+/**
+ * Captures time of network requests made with HTTP API.
+ */
+class Http_Collector extends Stopwatch_Collector {
+
+	/** @var Backtrace_Formatter */
+	private $formatter;
+
+	/**
+	 * @var array $callers
+	 * @psalm-var array<string, string> $callers
+	 */
+	private $callers = [];
+
+	/**
+	 * @param Stopwatch $stopwatch Stopwatch instance.
+	 */
+	public function __construct( Stopwatch $stopwatch ) {
+
+		parent::__construct( $stopwatch );
+
+		$this->formatter = new Backtrace_Formatter();
+
+		add_action( 'pre_http_request', [ $this, 'pre_http_request' ], 10, 3 );
+		add_action( 'http_api_debug', [ $this, 'http_api_debug' ], 10, 5 );
+	}
+
+	/**
+	 * Capture start time of HTTP request
+	 *
+	 * @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 false|array|\WP_Error
+	 *
+	 * @psalm-suppress RedundantConditionGivenDocblockType
+	 * @noinspection   PhpUnusedParameterInspection
+	 */
+	public function pre_http_request( $false, $args, $url ) {
+
+		if ( $url && is_string( $url ) ) {
+			$this->start( $url, 'http' );
+			$this->callers[ $url ] = wp_debug_backtrace_summary( __CLASS__, 5 );
+		}
+
+		return $false;
+	}
+
+	/**
+	 * Capture end time of HTTP request
+	 *
+	 * @param array|\WP_Error $response HTTP response or WP_Error object.
+	 * @param string          $type     Context under which the hook is fired.
+	 * @param object          $class    HTTP transport used.
+	 * @param array           $args     HTTP request arguments.
+	 * @param string          $url      The request URL.
+	 *
+	 * @return array|\WP_Error
+	 *
+	 * @psalm-suppress RedundantConditionGivenDocblockType
+	 * @noinspection   PhpUnusedParameterInspection
+	 */
+	public function http_api_debug( $response, $type, $class, $args, $url ) {
+
+		if ( $url && is_string( $url ) ) {
+			$this->stop( $url );
+		}
+
+		return $response;
+	}
+
+	/**
+	 * @param string         $name  Event name.
+	 * @param StopwatchEvent $event Stopwatch event instance.
+	 *
+	 * @return Stopwatch_Record
+	 */
+	public function transform( string $name, StopwatchEvent $event ): Stopwatch_Record {
+
+		$backtrace = $this->formatter->format( $this->callers[ $name ] );
+
+		return new Stopwatch_Record( $name, $event, implode( '<br />', $backtrace ) );
+	}
+}

src/Record/Collector/Lazy_Proxy_Collector.php

@@ -0,0 +1,38 @@
+<?php
+declare( strict_types=1 );
+
+namespace Rarst\Laps\Record\Collector;
+
+use Rarst\Laps\Record\Record_Interface;
+
+/**
+ * Collects records from concrete collectors set on access.
+ */
+class Lazy_Proxy_Collector implements Record_Collector_Interface {
+
+	/** @var array|Record_Collector_Interface[] */
+	private $collectors;
+
+	/**
+	 * Lazy_Proxy_Collector constructor.
+	 *
+	 * @param Record_Collector_Interface[] $collectors Array of collectors to store for processing.
+	 */
+	public function __construct( array $collectors ) {
+		$this->collectors = $collectors;
+	}
+
+	/**
+	 * @return Record_Interface[]
+	 */
+	public function get_records(): array {
+		$records = [];
+
+		/** @var Record_Collector_Interface $collector */
+		foreach ( $this->collectors as $collector ) {
+			$records[] = $collector->get_records();
+		}
+
+		return count( $records ) ? array_merge( ...$records ) : [];
+	}
+}

src/Record/Collector/Plugin_Load_Collector.php

@@ -0,0 +1,76 @@
+<?php
+declare( strict_types=1 );
+
+namespace Rarst\Laps\Record\Collector;
+
+use Rarst\Laps\Record\Record;
+use Rarst\Laps\Record\Record_Interface;
+
+/**
+ * Tracks load time of individual plugins.
+ */
+class Plugin_Load_Collector implements Record_Collector_Interface {
+
+	/** @var float */
+	private $last;
+
+	/** @var array */
+	private $entries = [];
+
+	/**
+	 * Sets up start time and tracking callbacks.
+	 */
+	public function __construct() {
+		$this->last = microtime( true );
+
+		add_action( 'network_plugin_loaded', [ $this, 'plugin_loaded' ] );
+		add_action( 'plugin_loaded', [ $this, 'plugin_loaded' ] );
+	}
+
+	/**
+	 * Records time for a plugin that just finished loading.
+	 *
+	 * @param string $plugin Plugin file path.
+	 *
+	 * @psalm-suppress DocblockTypeContradiction
+	 */
+	public function plugin_loaded( $plugin ): void {
+
+		$time = microtime( true );
+
+		if ( ! is_string( $plugin ) ) { // Broken hook input from global.
+			$this->last = $time;
+
+			return;
+		}
+
+		$this->entries[] = [
+			'name'     => $plugin,
+			'origin'   => $this->last,
+			'duration' => $time - $this->last,
+		];
+		$this->last = $time;
+	}
+
+	/**
+	 * @return Record_Interface[]
+	 */
+	public function get_records(): array {
+		return array_map( [ $this, 'create_record' ], $this->entries );
+	}
+
+	/**
+	 * Converts recorded information into a Record instance.
+	 *
+	 * @param array $entry Data entry for the plugin.
+	 */
+	private function create_record( array $entry ): Record {
+		return new Record(
+			plugin_basename( $entry['name'] ),
+			$entry['origin'],
+			$entry['duration'],
+			'',
+			'plugin'
+		);
+	}
+}

src/Record/Collector/Record_Collector_Interface.php

@@ -0,0 +1,17 @@
+<?php
+declare( strict_types=1 );
+
+namespace Rarst\Laps\Record\Collector;
+
+use Rarst\Laps\Record\Record_Interface;
+
+/**
+ * Interface to retrieve a set of records form collector.
+ */
+interface Record_Collector_Interface {
+
+	/**
+	 * @return Record_Interface[]
+	 */
+	public function get_records(): array;
+}

src/Record/Collector/Sql_Collector.php

@@ -0,0 +1,110 @@
+<?php
+declare( strict_types=1 );
+
+namespace Rarst\Laps\Record\Collector;
+
+use Rarst\Laps\Formatter\Backtrace_Formatter;
+use Rarst\Laps\Record\Record;
+
+/**
+ * Processes SQL events from data logged by wpdb.
+ *
+ * @template QueryData as array{0: string, 1: float, 2: string, 3: float}
+ */
+class Sql_Collector implements Record_Collector_Interface {
+
+	/** @var array $query_starts Log of query start times. */
+	protected $query_starts = [];
+
+	/** @var Backtrace_Formatter $formatter */
+	protected $formatter;
+
+	/**
+	 * Sets up the query start time log.
+	 */
+	public function __construct() {
+
+		$this->formatter = new Backtrace_Formatter();
+
+		if ( $this->is_savequeries() ) {
+			add_filter( 'query', [ $this, 'query' ], 20 ); // TODO Drop recording time if dropping support for WP <5.1.
+		}
+	}
+
+	/**
+	 * Capture SQL queries start times
+	 *
+	 * @param string $query SQL query.
+	 *
+	 * @return string
+	 */
+	public function query( $query ): string {
+
+		global $wpdb;
+
+		if ( empty( $this->query_starts ) && ! empty( $wpdb->queries ) ) {
+			/** @var array $wpdb->queries */
+			$this->query_starts[ count( $wpdb->queries ) ] = microtime( true );
+		} else {
+			$this->query_starts[] = microtime( true );
+		}
+
+		return $query;
+	}
+
+	/**
+	 * @return Record[]
+	 */
+	public function get_records(): array {
+
+		global $wpdb;
+
+		if ( empty( $wpdb->queries ) ) {
+			return [];
+		}
+
+		/** @var array $wpdb->queries */
+		/** @psalm-var array<int, QueryData> $wpdb->queries */
+		$records = array_filter( array_map( [ $this, 'transform' ], array_keys( $wpdb->queries ), $wpdb->queries ) );
+
+		return $records;
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function is_savequeries(): bool {
+
+		return \defined( 'SAVEQUERIES' ) && SAVEQUERIES;
+	}
+
+	/**
+	 * Transform query data, captured by core, into a Record.
+	 *
+	 * @param int   $key        Query key in captured data.
+	 * @param array $query_data Array of captured query data.
+	 * @psalm-param array{0: string, 1: float, 2: string, 3: float} $query_data
+	 *
+	 * @return Record
+	 */
+	protected function transform( int $key, array $query_data ): ?Record {
+
+		[ $sql, $duration, $caller ] = $query_data;
+
+		/** @var float $query_start */
+		$query_start = $query_data[3] ?? $this->query_starts[ $key ] ?? 0;
+		if ( empty( $query_start ) ) {
+			return null;
+		}
+		$sql         = trim( $sql );
+		$category    = 'sql-read';
+		if ( 0 === stripos( $sql, 'INSERT' ) || 0 === stripos( $sql, 'UPDATE' ) ) {
+			$category = 'sql-write';
+		}
+		$desc_duration = round( $duration * 1000 );
+		$backtrace     = $this->formatter->format( $caller );
+		$description   = $sql . ' – ' . $desc_duration . 'ms<hr />' . implode( '<br />', $backtrace );
+
+		return new Record( $sql, $query_start, $duration, $description, $category );
+	}
+}

src/Record/Collector/Stopwatch_Collector.php

@@ -1,14 +1,16 @@
 <?php
+declare( strict_types=1 );
 
-namespace Rarst\Laps\Record;
+namespace Rarst\Laps\Record\Collector;
 
+use Rarst\Laps\Record\Stopwatch_Record;
 use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\Stopwatch\StopwatchEvent;
 
 /**
  * Generic Stopwatch–based collector. Can be used by itself or extended.
  */
-class Stopwatch_Record_Collector implements Record_Collector_Interface {
+class Stopwatch_Collector implements Record_Collector_Interface {
 
 	/** @var Stopwatch $stopwatch */
 	protected $stopwatch;
@@ -26,7 +28,7 @@ class Stopwatch_Record_Collector implements Record_Collector_Interface {
 	 *
 	 * @return StopwatchEvent
 	 */
-	public function start( $name, $category = null ) {
+	public function start( $name, $category = null ): StopwatchEvent {
 		return $this->stopwatch->start( $name, $category );
 	}
 
@@ -47,10 +49,12 @@ class Stopwatch_Record_Collector implements Record_Collector_Interface {
 	/**
 	 * @return Stopwatch_Record[]
 	 */
-	public function get_records() {
+	public function get_records(): array {
 
+		/** @psalm-var array<string, StopwatchEvent> $events */
 		$events = $this->stopwatch->getSectionEvents( '__root__' );
 
+		/** @var string $name */
 		foreach ( array_keys( $events ) as $name ) {
 			if ( $this->stopwatch->isStarted( $name ) ) {
 				unset( $events[ $name ] );
@@ -66,7 +70,7 @@ class Stopwatch_Record_Collector implements Record_Collector_Interface {
 	 *
 	 * @return Stopwatch_Record
 	 */
-	protected function transform( $name, StopwatchEvent $event ) {
+	protected function transform( string $name, StopwatchEvent $event ): Stopwatch_Record {
 
 		return new Stopwatch_Record( $name, $event );
 	}

src/Record/Core_Load_Collector.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Rarst\Laps\Record;
-
-/**
- * Covers pre–plugin load time from available data.
- */
-class Core_Load_Collector implements Record_Collector_Interface {
-
-	/** @var float $timeload */
-	protected $timeload;
-
-	/**
-	 * Store core load end, plugin load start mark.
-	 */
-	public function __construct() {
-		$this->timeload = microtime( true );
-	}
-
-	/**
-	 * @return Record_Interface[]
-	 */
-	public function get_records() {
-
-		global $timestart;
-
-		$request_time = $_SERVER['REQUEST_TIME_FLOAT'];
-
-		return [
-			new Record( 'PHP Load', $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/Hook_Record_Collector.php

@@ -1,104 +0,0 @@
-<?php
-
-namespace Rarst\Laps\Record;
-
-use Rarst\Laps\Event\Hook_Event_Config_Interface;
-use Symfony\Component\Stopwatch\Stopwatch;
-
-/**
- * Processes events based on hooked starts and stops.
- */
-class Hook_Record_Collector extends Stopwatch_Record_Collector {
-
-	/** @var Hook_Event_Config_Interface[] $event_configs */
-	protected $event_configs = [];
-
-	/** @var array $events */
-	protected $events = [];
-
-	/**
-	 * @param Stopwatch $stopwatch     Stopwatch instance.
-	 * @param array     $event_configs Starts and stops configuration.
-	 */
-	public function __construct( Stopwatch $stopwatch, array $event_configs ) {
-
-		parent::__construct( $stopwatch );
-
-		$this->start( 'Plugins Load', 'plugin' );
-		$this->add_events( $event_configs['core']->get_events() );
-		unset( $event_configs['core'] );
-		$this->event_configs = $event_configs;
-
-		add_action( 'after_setup_theme', [ $this, 'after_setup_theme' ], 15 );
-	}
-
-	/**
-	 * Hook events by name and priority from array.
-	 *
-	 * @param array $stops Starts and stops to hook.
-	 */
-	public function add_events( $stops ) {
-
-		$this->events = array_merge( $this->events, $stops );
-
-		foreach ( $stops as $hook_name => $data ) {
-			foreach ( array_keys( $data ) as $priority ) {
-				add_action( $hook_name, [ $this, 'tick' ], $priority );
-			}
-		}
-	}
-
-	/**
-	 * When theme is done possibly add vendor-specific events.
-	 */
-	public function after_setup_theme() {
-
-		foreach ( $this->event_configs as $config ) {
-			$this->add_events( $config->get_events() );
-		}
-	}
-
-	/**
-	 * Mark action for the event on Stopwatch.
-	 *
-	 * @param mixed $input Pass through if added to filter.
-	 *
-	 * @return mixed
-	 */
-	public function tick( $input = null ) {
-
-		global $wp_filter;
-
-		$filter_name     = current_filter();
-		$filter_instance = $wp_filter[ $filter_name ];
-		$priority        = $filter_instance instanceof \WP_Hook ? $filter_instance->current_priority() : key( $filter_instance );
-
-		// See https://core.trac.wordpress.org/ticket/41185 on broken priority, but more general sanity check.
-		if ( empty( $this->events[ $filter_name ][ $priority ] ) ) {
-			return $input;
-		}
-
-		$event = wp_parse_args( $this->events[ $filter_name ][ $priority ], [
-			'action'   => 'start',
-			'category' => null,
-		] );
-
-		if ( 'start' === $event['action'] ) {
-			$this->start( $event['event'], $event['category'] );
-		} else {
-			$this->stop( $event['event'] );
-		}
-
-		return $input;
-	}
-
-	/**
-	 * @return Stopwatch_Record[]
-	 */
-	public function get_records() {
-
-		$this->stopwatch->stop( 'Toolbar' );
-
-		return parent::get_records();
-	}
-}

src/Record/Http_Record_Collector.php

@@ -1,58 +0,0 @@
-<?php
-
-namespace Rarst\Laps\Record;
-
-use Symfony\Component\Stopwatch\Stopwatch;
-
-/**
- * Captures time of network requests made with HTTP API.
- */
-class Http_Record_Collector extends Stopwatch_Record_Collector {
-
-	/**
-	 * @param Stopwatch $stopwatch Stopwatch instance.
-	 */
-	public function __construct( Stopwatch $stopwatch ) {
-
-		parent::__construct( $stopwatch );
-
-		add_action( 'pre_http_request', [ $this, 'pre_http_request' ], 10, 3 );
-		add_action( 'http_api_debug', [ $this, 'http_api_debug' ], 10, 5 );
-	}
-
-	/**
-	 * 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.
-	 *
-	 * @return boolean
-	 */
-	public function pre_http_request( $false, $args, $url ) {
-
-		$this->start( $url, 'http' );
-
-		return $false;
-	}
-
-	/**
-	 * Capture end time of HTTP request
-	 *
-	 * @param array|\WP_Error $response HTTP response or WP_Error object.
-	 * @param string          $type     Context under which the hook is fired.
-	 * @param object          $class    HTTP transport used.
-	 * @param array           $args     HTTP request arguments.
-	 * @param string          $url      The request URL.
-	 *
-	 * @return mixed
-	 *
-	 * @noinspection MoreThanThreeArgumentsInspection
-	 */
-	public function http_api_debug( $response, $type, $class, $args, $url ) {
-
-		$this->stop( $url );
-
-		return $response;
-	}
-}

src/Record/Iterator/Recursive_Record_Iterator.php

@@ -1,20 +1,26 @@
 <?php
+declare( strict_types=1 );
 
-namespace Rarst\Laps\Record;
+namespace Rarst\Laps\Record\Iterator;
+
+use Rarst\Laps\Record\Record_Interface;
 
 /**
  * Processes records, recursively bumping overlapping ones to children.
+ *
+ * @template-extends \ArrayIterator<array-key,Record_Interface>
+ * @template-implements \RecursiveIterator<array-key,Record_Interface>
  */
 class Recursive_Record_Iterator extends \ArrayIterator implements \RecursiveIterator {
 
-	/** @var array $children */
+	/** @var Record_Interface[] $children */
 	protected $children = [];
 
 	/**
 	 * @param Record_Interface[] $records Records to process.
-	 * @param int                $flags   Configuration flags.
+	 * @psalm-param 0|1|2|3      $flags   Configuration flags.
 	 */
-	public function __construct( array $records, $flags = 0 ) {
+	public function __construct( array $records, int $flags = 0 ) {
 
 		usort( $records, [ $this, 'sort_origin' ] );
 		$end = 0;
@@ -43,12 +49,12 @@ class Recursive_Record_Iterator extends \ArrayIterator implements \RecursiveIter
 	 *
 	 * @return int
 	 */
-	protected function sort_origin( Record_Interface $record_a, Record_Interface $record_b ) {
+	protected function sort_origin( Record_Interface $record_a, Record_Interface $record_b ): int {
 
 		$origin_a = $record_a->get_origin();
 		$origin_b = $record_b->get_origin();
 
-		if ( $origin_a === $origin_b ) {
+		if ( abs( $origin_a - $origin_b ) < 0.0001 ) { // Float math! Makes nesting results more sane.
 			return 0;
 		}
 
@@ -58,16 +64,16 @@ class Recursive_Record_Iterator extends \ArrayIterator implements \RecursiveIter
 	/**
 	 * @return bool
 	 */
-	public function hasChildren() {
+	public function hasChildren(): bool {
 
 		return ! empty( $this->children );
 	}
 
 	/**
-	 * @return static
+	 * This should be `static` for possible subclassing, but problems hinting that for PHP <8, also don't subclass this.
 	 */
-	public function getChildren() {
+	public function getChildren(): self {
 
-		return new static( $this->children );
+		return new self( $this->children );
 	}
 }

src/Record/Iterator/Timeline_Iterator.php

@@ -1,9 +1,17 @@
 <?php
+declare( strict_types=1 );
 
-namespace Rarst\Laps\Record;
+namespace Rarst\Laps\Record\Iterator;
+
+use Rarst\Laps\Record\Record;
+use Rarst\Laps\Record\Record_Interface;
 
 /**
  * Processes records into sets for display by template.
+ *
+ * @template-implements \Iterator<array>
+ *
+ * @psalm-suppress PropertyNotSetInConstructor
  */
 class Timeline_Iterator implements \Iterator {
 
@@ -21,20 +29,23 @@ class Timeline_Iterator implements \Iterator {
 
 	/**
 	 * @param Recursive_Record_Iterator $iterator Record iterator.
+	 *
+	 * @psalm-suppress PossiblyFalsePropertyAssignmentValue
 	 */
 	public function __construct( Recursive_Record_Iterator $iterator ) {
 
-		$this->origin   = $_SERVER['REQUEST_TIME_FLOAT'];
+		$this->origin   = filter_var( $_SERVER['REQUEST_TIME_FLOAT'], FILTER_VALIDATE_FLOAT );
 		$this->iterator = $iterator;
 	}
 
 	/**
 	 * @return array
 	 */
-	public function current() {
+	public function current(): array {
 
 		$data = [];
 
+		/** @var Record $record */
 		foreach ( $this->current as $record ) {
 			$data[] = $this->prepare( $record );
 		}
@@ -45,30 +56,32 @@ class Timeline_Iterator implements \Iterator {
 	/**
 	 * Sets current context to the next set of nested records.
 	 */
-	public function next() {
+	public function next(): void {
 		$this->current = $this->current->getChildren();
 	}
 
 	/**
+	 * Key is unused and is only type hinted to possible `int` for PHP 8.1 `mixed` type compatibility.
+	 *
 	 * @codeCoverageIgnore
 	 *
-	 * @return void
+	 * @return null
 	 */
-	public function key() {
-
+	public function key(): ?int {
+		return null;
 	}
 
 	/**
 	 * @return bool If current set contains records.
 	 */
-	public function valid() {
+	public function valid(): bool {
 		return (bool) count( $this->current );
 	}
 
 	/**
 	 * Rewind to a topmost record set.
 	 */
-	public function rewind() {
+	public function rewind(): void {
 		$this->total   = microtime( true ) - $this->origin;
 		$this->current = $this->iterator;
 	}
@@ -78,7 +91,7 @@ class Timeline_Iterator implements \Iterator {
 	 *
 	 * @return array Record data for display by the template.
 	 */
-	protected function prepare( Record_Interface $record ) {
+	protected function prepare( Record_Interface $record ): array {
 
 		$data = [
 			'description' => $record->get_description(),

src/Record/Record.php

@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Record;
 
@@ -29,7 +30,7 @@ class Record implements Record_Interface {
 	 * @param string $description Optional description.
 	 * @param string $category    Optional category.
 	 */
-	public function __construct( $name, $origin, $duration, $description = '', $category = '' ) {
+	public function __construct( string $name, float $origin, float $duration, string $description = '', string $category = '' ) {
 		$this->name        = $name;
 		$this->origin      = $origin;
 		$this->duration    = $duration;
@@ -40,14 +41,14 @@ class Record implements Record_Interface {
 	/**
 	 * @return string
 	 */
-	public function get_name() {
+	public function get_name(): string {
 		return $this->name;
 	}
 
 	/**
 	 * @return string
 	 */
-	public function get_description() {
+	public function get_description(): string {
 
 		if ( empty( $this->description ) ) {
 			$duration = round( $this->get_duration() * 1000 );
@@ -61,21 +62,21 @@ class Record implements Record_Interface {
 	/**
 	 * @return float
 	 */
-	public function get_origin() {
+	public function get_origin(): float {
 		return $this->origin;
 	}
 
 	/**
 	 * @return float
 	 */
-	public function get_duration() {
+	public function get_duration(): float {
 		return $this->duration;
 	}
 
 	/**
 	 * @return string
 	 */
-	public function get_category() {
+	public function get_category(): string {
 		return $this->category;
 	}
 }

src/Record/Record_Collector_Interface.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace Rarst\Laps\Record;
-
-interface Record_Collector_Interface {
-
-	/**
-	 * @return Record_Interface[]
-	 */
-	public function get_records();
-}

src/Record/Record_Interface.php

@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Record;
 
@@ -10,25 +11,25 @@ interface Record_Interface {
 	/**
 	 * @return string
 	 */
-	public function get_name();
+	public function get_name(): string;
 
 	/**
 	 * @return string
 	 */
-	public function get_description();
+	public function get_description(): string;
 
 	/**
 	 * @return float Timestamp of record start.
 	 */
-	public function get_origin();
+	public function get_origin(): float;
 
 	/**
 	 * @return float Record duration in seconds.
 	 */
-	public function get_duration();
+	public function get_duration(): float;
 
 	/**
 	 * @return string
 	 */
-	public function get_category();
+	public function get_category(): string;
 }

src/Record/Sql_Record_Collector.php

@@ -1,82 +0,0 @@
-<?php
-
-namespace Rarst\Laps\Record;
-
-/**
- * Processes SQL events from data logged by wpdb.
- */
-class Sql_Record_Collector implements Record_Collector_Interface {
-
-	/** @var array $query_starts Log of query start times. */
-	protected $query_starts = [];
-
-	/**
-	 * Sets up the query start time log.
-	 */
-	public function __construct() {
-
-		if ( $this->is_savequeries() ) {
-			add_filter( 'query', [ $this, 'query' ], 20 );
-		}
-	}
-
-	/**
-	 * Capture SQL queries start times
-	 *
-	 * @param string $query SQL query.
-	 *
-	 * @return string
-	 */
-	public function query( $query ) {
-
-		global $wpdb;
-
-		if ( empty( $this->query_starts ) && ! empty( $wpdb->queries ) ) {
-			$this->query_starts[ count( $wpdb->queries ) ] = microtime( true );
-		} else {
-			$this->query_starts[] = microtime( true );
-		}
-
-		return $query;
-	}
-
-	/**
-	 * @return Record[]
-	 */
-	public function get_records() {
-
-		if ( ! $this->is_savequeries() ) {
-			return [];
-		}
-
-		global $wpdb;
-
-		$query_data     = [];
-		$last_query_end = 0;
-
-		// TODO process call trace from the data.
-		foreach ( $wpdb->queries as $key => list( $sql, $duration ) ) {
-			$query_start = isset( $this->query_starts[ $key ] ) ? $this->query_starts[ $key ] : $last_query_end;
-			$sql         = trim( $sql );
-			$category    = 'sql-read';
-
-			if ( 0 === stripos( $sql, 'INSERT' ) || 0 === stripos( $sql, 'UPDATE' ) ) {
-				$category = 'sql-write';
-			}
-
-			$last_query_end = $query_start + $duration;
-
-			$query_data[] = new Record( $sql, $query_start, $duration, '', $category );
-		}
-
-		return $query_data;
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function is_savequeries() {
-
-		return defined( 'SAVEQUERIES' ) && SAVEQUERIES;
-	}
-}

src/Record/Stopwatch_Record.php

@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Record;
 
@@ -15,51 +16,57 @@ class Stopwatch_Record implements Record_Interface {
 	/** @var StopwatchEvent */
 	protected $stopwatch_event;
 
+	/** @var string */
+	protected $description = '';
+
 	/**
 	 * @param string         $name            Event name.
 	 * @param StopwatchEvent $stopwatch_event Stopwatch event instance.
+	 * @param string         $description     Optional description for the event.
 	 */
-	public function __construct( $name, StopwatchEvent $stopwatch_event ) {
+	public function __construct( string $name, StopwatchEvent $stopwatch_event, string $description = '' ) {
 		$this->name            = $name;
 		$this->stopwatch_event = $stopwatch_event;
+		$this->description     = $description;
 	}
 
 	/**
 	 * @return string
 	 */
-	public function get_name() {
+	public function get_name(): string {
 		return $this->name;
 	}
 
 	/**
 	 * @return string
 	 */
-	public function get_description() {
+	public function get_description(): string {
 
-		$duration = round( $this->stopwatch_event->getDuration() );
-		$memory   = $this->stopwatch_event->getMemory() / 1024 / 1024;
+		$duration    = round( $this->stopwatch_event->getDuration() );
+		$memory      = round( $this->stopwatch_event->getMemory() / 1024 / 1024, 2 );
+		$description = '' !== $this->description ? "<hr />{$this->description}" : '';
 
-		return "{$this->name} – {$duration} ms – {$memory} MB";
+		return "{$this->name} – {$duration} ms – {$memory} MB{$description}";
 	}
 
 	/**
 	 * @return float Timestamp of record start.
 	 */
-	public function get_origin() {
+	public function get_origin(): float {
 		return $this->stopwatch_event->getOrigin() / 1000; // ms to s.
 	}
 
 	/**
 	 * @return float Record duration in seconds.
 	 */
-	public function get_duration() {
+	public function get_duration(): float {
 		return $this->stopwatch_event->getDuration() / 1000; // ms to s.
 	}
 
 	/**
 	 * @return string
 	 */
-	public function get_category() {
+	public function get_category(): string {
 		return $this->stopwatch_event->getCategory();
 	}
 }

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;
 
@@ -16,7 +17,7 @@ class EventTest extends LapsTestCase {
 
 		$events = ( new Core_Events() )->get_events();
 
-		$this->assertInternalType( 'array', $events );
+		$this->assertIsArray( $events );
 		$this->assertNotEmpty( $events );
 	}
 
@@ -28,7 +29,7 @@ class EventTest extends LapsTestCase {
 		Functions\expect( 'genesis' )->zeroOrMoreTimes();
 		$events = $genesis->get_events();
 
-		$this->assertInternalType( 'array', $events );
+		$this->assertIsArray( $events );
 		$this->assertNotEmpty( $events );
 	}
 
@@ -45,7 +46,7 @@ class EventTest extends LapsTestCase {
 
 		$events = $hybrid->get_events();
 
-		$this->assertInternalType( 'array', $events );
+		$this->assertIsArray( $events );
 		$this->assertNotEmpty( $events );
 	}
 
@@ -58,7 +59,20 @@ class EventTest extends LapsTestCase {
 
 		$events = $tha->get_events();
 
-		$this->assertInternalType( 'array', $events );
+		$this->assertIsArray( $events );
+		$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->assertIsArray( $events );
 		$this->assertNotEmpty( $events );
 	}
 
@@ -71,7 +85,7 @@ class EventTest extends LapsTestCase {
 
 		$events = $yoast->get_events();
 
-		$this->assertInternalType( 'array', $events );
+		$this->assertIsArray( $events );
 		$this->assertNotEmpty( $events );
 	}
 }

tests/Formatter/BacktraceTest.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace Rarst\Laps\Tests\Formatter;
+
+use Brain\Monkey\Functions;
+use Rarst\Laps\Formatter\Backtrace_Formatter;
+use Rarst\Laps\Tests\LapsTestCase;
+
+/**
+ * @coversDefaultClass Rarst\Laps\Formatter\Backtrace_Formatter
+ */
+class BacktraceTest extends LapsTestCase {
+
+	/**
+	 * @covers ::__construct
+	 *
+	 * @return Backtrace_Formatter
+	 */
+	public function test__construct() {
+
+		if ( ! defined( 'ABSPATH' ) ) {
+			define( 'ABSPATH', '/wp' );
+			define( 'WP_CONTENT_DIR', '/wp-content/' );
+		}
+
+		Functions\expect( 'wp_normalize_path' )->zeroOrMoreTimes()->andReturnFirstArg();
+
+		return new Backtrace_Formatter();
+	}
+
+	/**
+	 * @depends test__construct
+	 */
+	public function testFormat( Backtrace_Formatter $formatter ) {
+
+		if ( ! defined( 'ABSPATH' ) ) {
+			define( 'ABSPATH', '/wp' );
+			define( 'WP_CONTENT_DIR', '/wp-content/' );
+		}
+
+		Functions\expect( 'wp_normalize_path' )->zeroOrMoreTimes()->andReturnFirstArg();
+
+		$backtrace = [
+			'template-loader.php',
+			'WP_Hook->do_action',
+			'foo',
+			"include('C:/wp/path.php')",
+		];
+
+		$backtrace = implode( ', ', $backtrace );
+
+		$result = $formatter->format( $backtrace );
+
+		$this->assertIsArray( $result );
+		$result = array_values( $result );
+		$this->assertEquals( 'foo', $result[0] );
+		$this->assertEquals( 'path.php', $result[1] );
+	}
+}
+

tests/Formatter/HookTest.php

@@ -0,0 +1,62 @@
+<?php
+declare( strict_types=1 );
+
+namespace Rarst\Laps\Tests\Formatter;
+
+use Brain\Monkey\Functions;
+use Rarst\Laps\Formatter\Hook_Formatter;
+use Rarst\Laps\Tests\LapsTestCase;
+
+/**
+ * @coversDefaultClass \Rarst\Laps\Formatter\Hook_Formatter
+ */
+class HookTest extends LapsTestCase {
+
+	/**
+	 * @covers ::__construct
+	 *
+	 * @return Hook_Formatter
+	 */
+	public function test__construct() {
+
+		if ( ! defined( 'ABSPATH' ) ) {
+			define( 'ABSPATH', '/wp' );
+			define( 'WP_CONTENT_DIR', '/wp-content/' );
+		}
+
+		Functions\expect( 'wp_normalize_path' )->zeroOrMoreTimes()->andReturnFirstArg();
+
+		return new Hook_Formatter();
+	}
+
+	/**
+	 * @depends test__construct
+	 */
+	public function testFormat( Hook_Formatter $formatter ) {
+
+		if ( ! defined( 'ABSPATH' ) ) {
+			define( 'ABSPATH', '/wp' );
+			define( 'WP_CONTENT_DIR', '/wp-content/' );
+		}
+
+		Functions\expect( 'wp_normalize_path' )->zeroOrMoreTimes()->andReturnFirstArg();
+
+		$hook = [
+			[ [ 'function' => 'function', 'accepted_args' => 2 ] ],
+			[ [ 'function' => [ 'class', 'method' ], 'accepted_args' => 1 ] ],
+			[ [ 'function' => function() {}, 'accepted_args' => 1 ] ],
+			[ [ 'function' => new class(){}, 'accepted_args' => 1 ] ],
+		];
+
+		$result = $formatter->format( $hook );
+
+		$this->assertIsArray( $result );
+		$this->assertEquals( 'function(2)', $result[0] );
+		$this->assertEquals( 'class::method', $result[1] );
+		$this->assertStringStartsWith( 'closure from', $result[2] );
+		$this->assertStringStartsWith( 'anonymous class from', $result[3] );
+
+		$this->assertEquals( [], $formatter->format( [] ) );
+	}
+}
+

tests/LapsTestCase.php

@@ -10,12 +10,12 @@ class LapsTestCase extends TestCase {
 
 	use MockeryPHPUnitIntegration;
 
-	protected function setUp() {
+	protected function setUp():void {
 		parent::setUp();
 		Monkey\setUp();
 	}
 
-	protected function tearDown() {
+	protected function tearDown(): void {
 		Monkey\tearDown();
 		parent::tearDown();
 	}

tests/Manager/AssetTest.php

@@ -20,8 +20,8 @@ class AssetTest extends LapsTestCase {
 
 		$manager = new Asset_Manager();
 
-		$this->assertTrue( has_action( 'wp_enqueue_scripts', [ $manager, 'enqueue_scripts' ] ) );
-		$this->assertTrue( has_action( 'admin_enqueue_scripts', [ $manager, 'enqueue_scripts' ] ) );
+		$this->assertTrue( (bool) has_action( 'wp_enqueue_scripts', [ $manager, 'enqueue_scripts' ] ) );
+		$this->assertTrue( (bool) has_action( 'admin_enqueue_scripts', [ $manager, 'enqueue_scripts' ] ) );
 
 		return $manager;
 	}

tests/Manager/LoadOrderTest.php

@@ -20,8 +20,8 @@ class LoadOrderTest extends LapsTestCase {
 
 		$manager = new Load_Order_Manager();
 
-		$this->assertTrue( has_action( 'pre_update_option_active_plugins', [ $manager, 'pre_update_option_active_plugins' ] ) );
-		$this->assertTrue( has_action( 'pre_update_site_option_active_sitewide_plugins', [ $manager, 'pre_update_option_active_plugins' ] ) );
+		$this->assertTrue( (bool) has_action( 'pre_update_option_active_plugins', [ $manager, 'pre_update_option_active_plugins' ] ) );
+		$this->assertTrue( (bool) has_action( 'pre_update_site_option_active_sitewide_plugins', [ $manager, 'pre_update_option_active_plugins' ] ) );
 
 		return $manager;
 
@@ -43,7 +43,7 @@ class LoadOrderTest extends LapsTestCase {
 
 		$plugins = $manager->pre_update_option_active_plugins( $plugins );
 
-		$this->assertInternalType( 'array', $plugins );
+		$this->assertIsArray( $plugins );
 		$this->assertCount( 3, $plugins );
 		$this->assertEquals( 'laps/laps.php', $plugins[0] );
 	}

tests/Manager/ToolbarTest.php

@@ -1,14 +1,15 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Tests\Manager;
 
 use Brain\Monkey\Functions;
 use Rarst\Laps\Manager\Toolbar_Manager;
-use Rarst\Laps\Plugin;
+use Rarst\Laps\Record\Collector\Lazy_Proxy_Collector;
 use Rarst\Laps\Tests\LapsTestCase;
 
 /**
- * @coversDefaultClass Rarst\Laps\Manager\Toolbar_Manager
+ * @coversDefaultClass \Rarst\Laps\Manager\Toolbar_Manager
  */
 class ToolbarTest extends LapsTestCase {
 
@@ -19,10 +20,10 @@ class ToolbarTest extends LapsTestCase {
 	 */
 	public function test__construct() {
 
-		$laps    = new Plugin( [ 'records' => [] ] );
-		$manager = new Toolbar_Manager( $laps );
+		$collector = new Lazy_Proxy_Collector( [] );
+		$manager   = new Toolbar_Manager( $collector, new \Mustache_Engine() );
 
-		$this->assertTrue( has_action( 'admin_bar_menu', [ $manager, 'admin_bar_menu' ] ) );
+		$this->assertTrue( (bool) has_action( 'admin_bar_menu', [ $manager, 'admin_bar_menu' ] ) );
 
 		return $manager;
 	}

tests/PluginTest.php

@@ -2,7 +2,7 @@
 
 namespace Rarst\Laps\Tests;
 
-use Pimple\ServiceProviderInterface;
+use Brain\Monkey\Functions;
 use Rarst\Laps\Provider\Bootable_Provider_Interface;
 
 class PluginTest extends LapsTestCase {
@@ -11,7 +11,7 @@ class PluginTest extends LapsTestCase {
 
 		$container = new \Rarst\Laps\Plugin();
 
-		$service = $this->getMockBuilder( [ ServiceProviderInterface::class, Bootable_Provider_Interface::class ] )
+		$service = $this->getMockBuilder( Bootable_Provider_Interface::class )
                         ->getMock();
 
 		$service->expects( $this->once() )
@@ -24,6 +24,12 @@ class PluginTest extends LapsTestCase {
 		        ->method( 'boot' )
 		        ->with( $container );
 
+		if ( ! defined( 'ABSPATH' ) ) {
+			define( 'ABSPATH', '/wp' );
+			define( 'WP_CONTENT_DIR', '/wp-content/' );
+		}
+		Functions\expect( 'wp_normalize_path' )->zeroOrMoreTimes()->andReturnFirstArg();
+
 		$container->run();
 	}
 }

tests/Provider/ManagerTest.php

@@ -1,7 +1,9 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Tests\Provider;
 
+use function Brain\Monkey\Functions\expect;
 use Pimple\Exception\FrozenServiceException;
 use Rarst\Laps\Plugin;
 use Rarst\Laps\Provider\Manager_Provider;
@@ -14,6 +16,8 @@ class ManagerTest extends LapsTestCase {
 	 */
 	public function testProvider() {
 
+		expect( 'wp_normalize_path' )->zeroOrMoreTimes()->andReturnFirstArg();
+
 		$container = new Plugin();
 		$provider  = new Manager_Provider();
 

tests/Provider/RecordTest.php

@@ -2,6 +2,7 @@
 
 namespace Rarst\Laps\Tests\Provider;
 
+use Brain\Monkey\Functions;
 use Pimple\Exception\FrozenServiceException;
 use Rarst\Laps\Plugin;
 use Rarst\Laps\Provider\Record_Provider;
@@ -24,6 +25,12 @@ class RecordTest extends LapsTestCase {
 
 		$this->assertNotSame( $stopwatch_a, $stopwatch_b );
 
+		if ( ! defined( 'ABSPATH' ) ) {
+			define( 'ABSPATH', '/wp' );
+			define( 'WP_CONTENT_DIR', '/wp-content/' );
+		}
+		Functions\expect( 'wp_normalize_path' )->zeroOrMoreTimes()->andReturnFirstArg();
+
 		$this->assertArrayHasKey( 'records', $container );
 
 		$container->extend( 'collectors', function () {} );

tests/Record/CoreTest.php

@@ -2,7 +2,7 @@
 
 namespace Rarst\Laps\Tests\Record;
 
-use Rarst\Laps\Record\Core_Load_Collector;
+use Rarst\Laps\Record\Collector\Core_Load_Collector;
 use Rarst\Laps\Record\Record_Interface;
 use Rarst\Laps\Tests\LapsTestCase;
 
@@ -10,11 +10,14 @@ class CoreTest extends LapsTestCase {
 
 	public function testCollector() {
 
+		global $timestart;
+		$timestart = microtime( true );;
+
 		$collector = new Core_Load_Collector();
 
 		$records = $collector->get_records();
 
-		$this->assertInternalType( 'array', $records );
+		$this->assertIsArray( $records );
 		$this->assertCount( 2, $records );
 		$this->assertInstanceOf( Record_Interface::class, $records[0] );
 	}

tests/Record/HookTest.php

@@ -1,10 +1,11 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Tests\Record;
 
-use Brain\Monkey\Functions;
+use function Brain\Monkey\Functions\expect;
 use Rarst\Laps\Event\Core_Events;
-use Rarst\Laps\Record\Hook_Record_Collector;
+use Rarst\Laps\Record\Collector\Hook_Collector;
 use Rarst\Laps\Tests\LapsTestCase;
 use Symfony\Component\Stopwatch\Stopwatch;
 
@@ -12,32 +13,16 @@ class HookTest extends LapsTestCase {
 
 	public function testCollector() {
 
-		$stopwatch = new Stopwatch();
-		$collector = new Hook_Record_Collector( $stopwatch, [ 'core' => new Core_Events() ] );
+		expect( 'wp_normalize_path' )->zeroOrMoreTimes()->andReturnFirstArg();
 
-		$this->assertTrue( $stopwatch->isStarted( 'Plugins Load' ) );
-		$this->assertTrue( has_action( 'after_setup_theme', [ $collector, 'after_setup_theme' ] ) );
+		$stopwatch = new Stopwatch();
+		$collector = new Hook_Collector( $stopwatch, [ 'core' => new Core_Events() ] );
+
+		$this->assertTrue( (bool) has_action( 'after_setup_theme', [ $collector, 'after_setup_theme' ] ) );
+
+		$this->assertTrue( (bool) has_action( 'plugins_loaded', 'function ($input)' ) );
 
 		$collector->after_setup_theme();
-
-		Functions\expect( 'current_filter' )->once()->andReturn( 'plugins_loaded' );
-		Functions\expect( 'wp_parse_args' )->once()->andReturnFirstArg();
-
-		global $wp_filter;
-
-		$wp_hook = $this->getMockBuilder( 'WP_Hook' )
-		                ->allowMockingUnknownTypes()
-		                ->setMethods( [ 'current_priority' ] )
-		                ->getMock();
-
-		$wp_hook->method( 'current_priority' )->willReturn( - 2 );
-
-		$wp_filter['plugins_loaded'] = $wp_hook;
-
-		$collector->tick();
-
-		$this->assertFalse( $stopwatch->isStarted( 'Plugins Load' ) );
-
 		$stopwatch->start( 'Toolbar' );
 		$collector->get_records();
 

tests/Record/HttpTest.php

@@ -2,7 +2,8 @@
 
 namespace Rarst\Laps\Tests\Record;
 
-use Rarst\Laps\Record\Http_Record_Collector;
+use Brain\Monkey\Functions;
+use Rarst\Laps\Record\Collector\Http_Collector;
 use Rarst\Laps\Tests\LapsTestCase;
 use Symfony\Component\Stopwatch\Stopwatch;
 
@@ -10,12 +11,15 @@ class HttpTest extends LapsTestCase {
 
 	public function testCollector() {
 
+		Functions\expect( 'wp_normalize_path' )->zeroOrMoreTimes()->andReturnFirstArg();
+		Functions\expect( 'wp_debug_backtrace_summary' )->zeroOrMoreTimes()->andReturn( [] );
+
 		$stopwatch = new Stopwatch();
 		$url       = 'https://example.com/';
-		$collector = new Http_Record_Collector( $stopwatch );
+		$collector = new Http_Collector( $stopwatch );
 
-		$this->assertTrue( has_action( 'pre_http_request', [ $collector, 'pre_http_request' ] ) );
-		$this->assertTrue( has_action( 'http_api_debug', [ $collector, 'http_api_debug' ] ) );
+		$this->assertTrue( (bool) has_action( 'pre_http_request', [ $collector, 'pre_http_request' ] ) );
+		$this->assertTrue( (bool) has_action( 'http_api_debug', [ $collector, 'http_api_debug' ] ) );
 
 		$collector->pre_http_request( false, [], $url );
 

tests/Record/IteratorTest.php

@@ -2,17 +2,17 @@
 
 namespace Rarst\Laps\Tests\Record;
 
-use Rarst\Laps\Record\Recursive_Record_Iterator;
+use Rarst\Laps\Record\Iterator\Recursive_Record_Iterator;
 use Rarst\Laps\Record\Record;
-use Rarst\Laps\Record\Timeline_Iterator;
+use Rarst\Laps\Record\Iterator\Timeline_Iterator;
 use Rarst\Laps\Tests\LapsTestCase;
 
 class IteratorTest extends LapsTestCase {
 
 	/**
-	 * @covers \Rarst\Laps\Record\Recursive_Record_Iterator
+	 * @covers \Rarst\Laps\Record\Iterator\Recursive_Record_Iterator
 	 *
-	 * @return Recursive_Record_Iterator
+	 * @return \Rarst\Laps\Record\Iterator\Recursive_Record_Iterator
 	 */
 	public function testRecord() {
 
@@ -41,7 +41,7 @@ class IteratorTest extends LapsTestCase {
 	}
 
 	/**
-	 * @covers \Rarst\Laps\Record\Timeline_Iterator
+	 * @covers \Rarst\Laps\Record\Iterator\Timeline_Iterator
 	 *
 	 * @depends testRecord
 	 */
@@ -53,7 +53,7 @@ class IteratorTest extends LapsTestCase {
 		$this->assertTrue( $iterator->valid() );
 
 		$records = $iterator->current();
-		$this->assertInternalType( 'array', $records );
+		$this->assertIsArray( $records );
 
 		$this->assertArrayHasKey( 'description', $records[0] );
 		$this->assertArrayHasKey( 'category', $records[0] );
@@ -64,7 +64,7 @@ class IteratorTest extends LapsTestCase {
 		$this->assertTrue( $iterator->valid() );
 
 		$records = $iterator->current();
-		$this->assertInternalType( 'array', $records );
+		$this->assertIsArray( $records );
 
 		$iterator->next();
 		$this->assertFalse( $iterator->valid() );

tests/Record/RecordTest.php

@@ -24,8 +24,8 @@ class RecordTest extends LapsTestCase {
 		$this->assertEquals( $name, $record->get_name() );
 		$this->assertEquals( $origin, $record->get_origin() );
 		$this->assertEquals( $duration, $record->get_duration() );
-		$this->assertContains( $name, $record->get_description() );
-		$this->assertContains( (string) ( $duration * 1000 ), $record->get_description() );
+		$this->assertStringContainsString( $name, $record->get_description() );
+		$this->assertStringContainsString( (string) ( $duration * 1000 ), $record->get_description() );
 		$this->assertEmpty( $record->get_category() );
 
 		$record = new Record( $name, $origin, $duration, $description, $category );

tests/Record/SqlTest.php

@@ -2,22 +2,29 @@
 
 namespace Rarst\Laps\Tests\Record;
 
+use Brain\Monkey\Functions;
 use Rarst\Laps\Record\Record;
-use Rarst\Laps\Record\Sql_Record_Collector;
+use Rarst\Laps\Record\Collector\Sql_Collector;
 use Rarst\Laps\Tests\LapsTestCase;
 
 class SqlTest extends LapsTestCase {
 
 	/**
-	 * @covers \Rarst\Laps\Record\Sql_Record_Collector
+	 * @covers \Rarst\Laps\Record\Collector\Sql_Collector
 	 */
 	public function testCollector() {
 
 		define( 'SAVEQUERIES', true );
 
-		$collector = new Sql_Record_Collector();
+		if ( ! defined( 'ABSPATH' ) ) {
+			define( 'ABSPATH', '/wp' );
+			define( 'WP_CONTENT_DIR', '/wp-content/' );
+		}
+		Functions\expect( 'wp_normalize_path' )->zeroOrMoreTimes()->andReturnFirstArg();
 
-		$this->assertTrue( has_filter( 'query', [ $collector, 'query' ] ) );
+		$collector = new Sql_Collector();
+
+		$this->assertTrue( (bool) has_filter( 'query', [ $collector, 'query' ] ) );
 
 		$query = 'SELECT * FROM wp_posts';
 
@@ -27,19 +34,19 @@ class SqlTest extends LapsTestCase {
 
 		$wpdb            = new \stdClass();
 		$duration        = 100;
-		$wpdb->queries[] = [ $query, $duration ];
+		$wpdb->queries[] = [ $query, $duration, 'foo(), bar()' ];
 
 		$records = $collector->get_records();
 
-		$this->assertInternalType( 'array', $records );
+		$this->assertIsArray( $records );
 		$this->assertCount( 1, $records );
 
 		$record = $records[0];
 
 		$this->assertInstanceOf( Record::class, $record );
 		$this->assertEquals( $query, $record->get_name() );
-		$this->assertContains( $query, $record->get_description() );
-		$this->assertInternalType( 'float', $record->get_origin() );
+		$this->assertStringContainsString( $query, $record->get_description() );
+		$this->assertIsFloat( $record->get_origin() );
 		$this->assertEquals( $duration, $record->get_duration() );
 		$this->assertEquals( 'sql-read', $record->get_category() );
 	}

tests/Record/StopwatchTest.php

@@ -3,7 +3,7 @@
 namespace Rarst\Laps\Tests\Record;
 
 use Rarst\Laps\Record\Stopwatch_Record;
-use Rarst\Laps\Record\Stopwatch_Record_Collector;
+use Rarst\Laps\Record\Collector\Stopwatch_Collector;
 use Rarst\Laps\Tests\LapsTestCase;
 use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\Stopwatch\StopwatchEvent;
@@ -11,11 +11,11 @@ use Symfony\Component\Stopwatch\StopwatchEvent;
 class StopwatchTest extends LapsTestCase {
 
 	/**
-	 * @covers \Rarst\Laps\Record\Stopwatch_Record_Collector
+	 * @covers \Rarst\Laps\Record\Collector\Stopwatch_Collector
 	 */
 	public function testCollector() {
 
-		$collector = new Stopwatch_Record_Collector( new Stopwatch() );
+		$collector = new Stopwatch_Collector( new Stopwatch() );
 
 		$collector->start( 'Event', 'info' );
 		$collector->start( 'Not stopped', 'info' );
@@ -26,7 +26,7 @@ class StopwatchTest extends LapsTestCase {
 
 		$records = $collector->get_records();
 
-		$this->assertInternalType( 'array', $records );
+		$this->assertIsArray( $records );
 		$this->assertCount( 1, $records );
 		$this->assertInstanceOf( Stopwatch_Record::class, $records[0] );
 
@@ -47,6 +47,6 @@ class StopwatchTest extends LapsTestCase {
 		$this->assertEquals( 'info', $record->get_category() );
 		$this->assertEquals( $event->getOrigin() / 1000, $record->get_origin() );
 		$this->assertEquals( $event->getDuration() / 1000, $record->get_duration() );
-		$this->assertContains( 'Event', $record->get_description() );
+		$this->assertStringContainsString( 'Event', $record->get_description() );
 	}
 }