From 204c1df755b01950427e6fa3469a97965653967e Mon Sep 17 00:00:00 2001
From: Andrey Savchenko <contact@rarst.net>
Date: Fri, 30 Nov 2018 13:58:53 +0200
Subject: [PATCH] Raised PHP requirement to 7.1 and updated types.

Fixes #25
---
 composer.json                                |  2 +-
 src/Event/Core_Events.php                    |  3 ++-
 src/Event/Genesis_Events.php                 |  5 +++--
 src/Event/Hook_Event_Config_Interface.php    |  6 +++++-
 src/Event/Hybrid_Events.php                  |  5 +++--
 src/Event/THA_Events.php                     |  5 +++--
 src/Event/Yoast_Events.php                   |  3 ++-
 src/Formatter/Backtrace_Formatter.php        |  9 +++++----
 src/Manager/Asset_Manager.php                |  5 +++--
 src/Manager/Load_Order_Manager.php           |  5 +++--
 src/Manager/Toolbar_Manager.php              |  3 ++-
 src/Mustache_Cache_FrozenCache.php           |  4 +++-
 src/Plugin.php                               |  7 ++++---
 src/Provider/Bootable_Provider_Interface.php |  6 +++++-
 src/Provider/Hook_Event_Provider.php         |  3 ++-
 src/Provider/Manager_Provider.php            |  5 +++--
 src/Provider/Record_Provider.php             |  5 +++--
 src/Record/Core_Load_Collector.php           |  5 +++--
 src/Record/Hook_Record_Collector.php         |  9 +++++----
 src/Record/Http_Record_Collector.php         |  5 +++--
 src/Record/Record.php                        | 13 +++++++------
 src/Record/Record_Collector_Interface.php    |  6 +++++-
 src/Record/Record_Interface.php              | 11 ++++++-----
 src/Record/Recursive_Record_Iterator.php     |  7 ++++---
 src/Record/Sql_Record_Collector.php          | 15 ++++++++-------
 src/Record/Stopwatch_Record.php              | 13 +++++++------
 src/Record/Stopwatch_Record_Collector.php    |  7 ++++---
 src/Record/Timeline_Iterator.php             | 15 ++++++++-------
 tests/Record/CoreTest.php                    |  3 +++
 29 files changed, 115 insertions(+), 75 deletions(-)

diff --git a/composer.json b/composer.json
index b4d15b3..8d51c63 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
 		}
 	},
 	"require"    : {
-		"php"                : ">=5.6",
+		"php"                : "^7.1.3",
 		"composer/installers": "~1.0",
 		"symfony/stopwatch"  : "^3.4.4",
 		"mustache/mustache"  : "~2.4",
diff --git a/src/Event/Core_Events.php b/src/Event/Core_Events.php
index 04c5889..9830b86 100644
--- a/src/Event/Core_Events.php
+++ b/src/Event/Core_Events.php
@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Event;
 
@@ -10,7 +11,7 @@ class Core_Events implements Hook_Event_Config_Interface {
 	/**
 	 * @return array
 	 */
-	public function get_events() {
+	public function get_events(): array {
 
 		$stops = [];
 
diff --git a/src/Event/Genesis_Events.php b/src/Event/Genesis_Events.php
index a00e9ce..a48f94b 100644
--- a/src/Event/Genesis_Events.php
+++ b/src/Event/Genesis_Events.php
@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Event;
 
@@ -12,11 +13,11 @@ class Genesis_Events implements Hook_Event_Config_Interface {
 	/**
 	 * @return array
 	 */
-	public function get_events() {
+	public function get_events(): array {
 
 		$events = [];
 
-		if ( ! function_exists( 'genesis' ) ) {
+		if ( ! \function_exists( 'genesis' ) ) {
 			return $events;
 		}
 
diff --git a/src/Event/Hook_Event_Config_Interface.php b/src/Event/Hook_Event_Config_Interface.php
index 943d7ae..1516b83 100644
--- a/src/Event/Hook_Event_Config_Interface.php
+++ b/src/Event/Hook_Event_Config_Interface.php
@@ -1,11 +1,15 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Event;
 
+/**
+ * Interface to retrieve configuration array of hook events to track.
+ */
 interface Hook_Event_Config_Interface {
 
 	/**
 	 * @return array
 	 */
-	public function get_events();
+	public function get_events(): array;
 }
diff --git a/src/Event/Hybrid_Events.php b/src/Event/Hybrid_Events.php
index ba0dd8e..1df52d6 100644
--- a/src/Event/Hybrid_Events.php
+++ b/src/Event/Hybrid_Events.php
@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Event;
 
@@ -12,11 +13,11 @@ class Hybrid_Events implements Hook_Event_Config_Interface {
 	/**
 	 * @return array
 	 */
-	public function get_events() {
+	public function get_events(): array {
 
 		$events = [];
 
-		if ( ! function_exists( 'hybrid_get_prefix' ) ) {
+		if ( ! \function_exists( 'hybrid_get_prefix' ) ) {
 			return $events;
 		}
 
diff --git a/src/Event/THA_Events.php b/src/Event/THA_Events.php
index db7bac9..8f7975f 100644
--- a/src/Event/THA_Events.php
+++ b/src/Event/THA_Events.php
@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Event;
 
@@ -12,11 +13,11 @@ class THA_Events implements Hook_Event_Config_Interface {
 	/**
 	 * @return array
 	 */
-	public function get_events() {
+	public function get_events(): array {
 
 		$events = [];
 
-		if ( ! defined( 'THA_HOOKS_VERSION' ) ) {
+		if ( ! \defined( 'THA_HOOKS_VERSION' ) ) {
 			return $events;
 		}
 
diff --git a/src/Event/Yoast_Events.php b/src/Event/Yoast_Events.php
index eeb07a6..e8628d5 100644
--- a/src/Event/Yoast_Events.php
+++ b/src/Event/Yoast_Events.php
@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Event;
 
@@ -10,7 +11,7 @@ class Yoast_Events implements Hook_Event_Config_Interface {
 	/**
 	 * @return array
 	 */
-	public function get_events() {
+	public function get_events(): array {
 
 		$stops = [];
 
diff --git a/src/Formatter/Backtrace_Formatter.php b/src/Formatter/Backtrace_Formatter.php
index c8a4eb0..242c421 100644
--- a/src/Formatter/Backtrace_Formatter.php
+++ b/src/Formatter/Backtrace_Formatter.php
@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Formatter;
 
@@ -42,9 +43,9 @@ class Backtrace_Formatter {
 	 *
 	 * @return array
 	 */
-	public function format( $backtrace ) {
+	public function format( $backtrace ): array {
 
-		if ( is_string( $backtrace ) ) {
+		if ( \is_string( $backtrace ) ) {
 			$backtrace = explode( ', ', $backtrace );
 		}
 
@@ -61,7 +62,7 @@ class Backtrace_Formatter {
 	 *
 	 * @return bool Keep or drop.
 	 */
-	protected function filter( $item ) {
+	protected function filter( string $item ): bool {
 
 		foreach ( self::$skip as $match ) {
 			if ( false !== strpos( $item, $match ) ) {
@@ -77,7 +78,7 @@ class Backtrace_Formatter {
 	 *
 	 * @return string
 	 */
-	protected function shorten_include( $item ) {
+	protected function shorten_include( string $item ): string {
 
 		if ( 0 === strpos( $item, 'include' ) || 0 === strpos( $item, 'require' ) ) {
 
diff --git a/src/Manager/Asset_Manager.php b/src/Manager/Asset_Manager.php
index b6f002b..3e9c9d1 100644
--- a/src/Manager/Asset_Manager.php
+++ b/src/Manager/Asset_Manager.php
@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Manager;
 
@@ -19,9 +20,9 @@ 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';
+		$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 );
 		wp_register_style( 'laps', plugins_url( "public/css/laps{$suffix}.css", dirname( __DIR__ ) ) );
 
diff --git a/src/Manager/Load_Order_Manager.php b/src/Manager/Load_Order_Manager.php
index 1e8d3a7..f87c6cd 100644
--- a/src/Manager/Load_Order_Manager.php
+++ b/src/Manager/Load_Order_Manager.php
@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Manager;
 
@@ -23,9 +24,9 @@ class Load_Order_Manager {
 	 *
 	 * @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 ) {
diff --git a/src/Manager/Toolbar_Manager.php b/src/Manager/Toolbar_Manager.php
index 49def5f..073630c 100644
--- a/src/Manager/Toolbar_Manager.php
+++ b/src/Manager/Toolbar_Manager.php
@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Manager;
 
@@ -29,7 +30,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;
diff --git a/src/Mustache_Cache_FrozenCache.php b/src/Mustache_Cache_FrozenCache.php
index c2b8302..a38fef5 100644
--- a/src/Mustache_Cache_FrozenCache.php
+++ b/src/Mustache_Cache_FrozenCache.php
@@ -1,4 +1,6 @@
 <?php
+declare( strict_types=1 );
+
 namespace Rarst\Laps;
 
 /**
@@ -14,7 +16,7 @@ class Mustache_Cache_FrozenCache extends \Mustache_Cache_FilesystemCache {
 	 *
 	 * @return void
 	 */
-	public function cache( $key, $value ) {
+	public function cache( $key, $value ): void {
 
 		$this->log(
 			\Mustache_Logger::WARNING,
diff --git a/src/Plugin.php b/src/Plugin.php
index b638fd2..48c874d 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps;
 
@@ -48,7 +49,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,9 +61,9 @@ class Plugin extends Container {
 	/**
 	 * Start Stopwatch and timing plugin load immediately, then set up core events and needed hooks.
 	 */
-	public function run() {
+	public function run(): void {
 
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+		if ( \defined( 'DOING_AJAX' ) && DOING_AJAX ) {
 			return;
 		}
 
diff --git a/src/Provider/Bootable_Provider_Interface.php b/src/Provider/Bootable_Provider_Interface.php
index f0e99cc..22b419b 100644
--- a/src/Provider/Bootable_Provider_Interface.php
+++ b/src/Provider/Bootable_Provider_Interface.php
@@ -1,9 +1,13 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Provider;
 
 use Rarst\Laps\Plugin;
 
+/**
+ * Interface for providers that need to boot up once plugin is ready to start.
+ */
 interface Bootable_Provider_Interface {
 
 	/**
@@ -11,5 +15,5 @@ interface Bootable_Provider_Interface {
 	 *
 	 * @return void
 	 */
-	public function boot( Plugin $laps );
+	public function boot( Plugin $laps ): void;
 }
diff --git a/src/Provider/Hook_Event_Provider.php b/src/Provider/Hook_Event_Provider.php
index 5435ced..2d63caf 100644
--- a/src/Provider/Hook_Event_Provider.php
+++ b/src/Provider/Hook_Event_Provider.php
@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Provider;
 
@@ -18,7 +19,7 @@ class Hook_Event_Provider implements ServiceProviderInterface {
 	/**
 	 * @param Container $pimple Container instance.
 	 */
-	public function register( Container $pimple ) {
+	public function register( Container $pimple ): void {
 
 		$pimple['hook.events'] = function () {
 			return [
diff --git a/src/Provider/Manager_Provider.php b/src/Provider/Manager_Provider.php
index 9174b2e..f703225 100644
--- a/src/Provider/Manager_Provider.php
+++ b/src/Provider/Manager_Provider.php
@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Provider;
 
@@ -17,7 +18,7 @@ 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 ) {
 			return [
@@ -31,7 +32,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'];
 	}
 }
diff --git a/src/Provider/Record_Provider.php b/src/Provider/Record_Provider.php
index 268487a..4f6b779 100644
--- a/src/Provider/Record_Provider.php
+++ b/src/Provider/Record_Provider.php
@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Provider;
 
@@ -20,7 +21,7 @@ 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 () {
 			return new Stopwatch( true );
@@ -51,7 +52,7 @@ class Record_Provider implements ServiceProviderInterface, Bootable_Provider_Int
 	/**
 	 * @param Plugin $laps Container instance.
 	 */
-	public function boot( Plugin $laps ) {
+	public function boot( Plugin $laps ): void {
 		$laps['collectors'];
 	}
 }
diff --git a/src/Record/Core_Load_Collector.php b/src/Record/Core_Load_Collector.php
index 12bab35..e39c41c 100644
--- a/src/Record/Core_Load_Collector.php
+++ b/src/Record/Core_Load_Collector.php
@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Record;
 
@@ -20,11 +21,11 @@ class Core_Load_Collector implements Record_Collector_Interface {
 	/**
 	 * @return Record_Interface[]
 	 */
-	public function get_records() {
+	public function get_records(): array {
 
 		global $timestart;
 
-		$request_time = $_SERVER['REQUEST_TIME_FLOAT'];
+		$request_time = filter_var( $_SERVER['REQUEST_TIME_FLOAT'], FILTER_VALIDATE_FLOAT );
 
 		return [
 			new Record( 'PHP Load', $request_time, $timestart - $request_time, '', 'php' ),
diff --git a/src/Record/Hook_Record_Collector.php b/src/Record/Hook_Record_Collector.php
index ee15bf5..df99cba 100644
--- a/src/Record/Hook_Record_Collector.php
+++ b/src/Record/Hook_Record_Collector.php
@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Record;
 
@@ -37,7 +38,7 @@ class Hook_Record_Collector extends Stopwatch_Record_Collector {
 	 *
 	 * @param array $stops Starts and stops to hook.
 	 */
-	public function add_events( $stops ) {
+	public function add_events( array $stops ): void {
 
 		$this->events = array_merge( $this->events, $stops );
 
@@ -51,7 +52,7 @@ class Hook_Record_Collector extends Stopwatch_Record_Collector {
 	/**
 	 * When theme is done possibly add vendor-specific events.
 	 */
-	public function after_setup_theme() {
+	public function after_setup_theme(): void {
 
 		foreach ( $this->event_configs as $config ) {
 			$this->add_events( $config->get_events() );
@@ -78,7 +79,7 @@ class Hook_Record_Collector extends Stopwatch_Record_Collector {
 			return $input;
 		}
 
-		$event = wp_parse_args( $this->events[ $filter_name ][ $priority ], [
+		$event = \wp_parse_args( $this->events[ $filter_name ][ $priority ], [
 			'action'   => 'start',
 			'category' => null,
 		] );
@@ -95,7 +96,7 @@ class Hook_Record_Collector extends Stopwatch_Record_Collector {
 	/**
 	 * @return Stopwatch_Record[]
 	 */
-	public function get_records() {
+	public function get_records(): array {
 
 		$this->stopwatch->stop( 'Toolbar' );
 
diff --git a/src/Record/Http_Record_Collector.php b/src/Record/Http_Record_Collector.php
index d8c81b3..6176013 100644
--- a/src/Record/Http_Record_Collector.php
+++ b/src/Record/Http_Record_Collector.php
@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Record;
 
@@ -29,7 +30,7 @@ class Http_Record_Collector extends Stopwatch_Record_Collector {
 	 *
 	 * @return boolean
 	 */
-	public function pre_http_request( $false, $args, $url ) {
+	public function pre_http_request( bool $false, array $args, string $url ): bool {
 
 		$this->start( $url, 'http' );
 
@@ -49,7 +50,7 @@ class Http_Record_Collector extends Stopwatch_Record_Collector {
 	 *
 	 * @noinspection MoreThanThreeArgumentsInspection
 	 */
-	public function http_api_debug( $response, $type, $class, $args, $url ) {
+	public function http_api_debug( $response, string $type, $class, array $args, string $url ) {
 
 		$this->stop( $url );
 
diff --git a/src/Record/Record.php b/src/Record/Record.php
index 0dd58cb..4f3c575 100644
--- a/src/Record/Record.php
+++ b/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;
 	}
 }
diff --git a/src/Record/Record_Collector_Interface.php b/src/Record/Record_Collector_Interface.php
index 03dfaa7..f4854cb 100644
--- a/src/Record/Record_Collector_Interface.php
+++ b/src/Record/Record_Collector_Interface.php
@@ -1,11 +1,15 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Record;
 
+/**
+ * Interface to retrieve a set of records form collector.
+ */
 interface Record_Collector_Interface {
 
 	/**
 	 * @return Record_Interface[]
 	 */
-	public function get_records();
+	public function get_records(): array;
 }
diff --git a/src/Record/Record_Interface.php b/src/Record/Record_Interface.php
index 306fb23..914a3bc 100644
--- a/src/Record/Record_Interface.php
+++ b/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;
 }
diff --git a/src/Record/Recursive_Record_Iterator.php b/src/Record/Recursive_Record_Iterator.php
index 3edca48..51ba241 100644
--- a/src/Record/Recursive_Record_Iterator.php
+++ b/src/Record/Recursive_Record_Iterator.php
@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Record;
 
@@ -14,7 +15,7 @@ class Recursive_Record_Iterator extends \ArrayIterator implements \RecursiveIter
 	 * @param Record_Interface[] $records Records to process.
 	 * @param int                $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,7 +44,7 @@ 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();
@@ -58,7 +59,7 @@ class Recursive_Record_Iterator extends \ArrayIterator implements \RecursiveIter
 	/**
 	 * @return bool
 	 */
-	public function hasChildren() {
+	public function hasChildren(): bool {
 
 		return ! empty( $this->children );
 	}
diff --git a/src/Record/Sql_Record_Collector.php b/src/Record/Sql_Record_Collector.php
index 9312471..2ba0fa6 100644
--- a/src/Record/Sql_Record_Collector.php
+++ b/src/Record/Sql_Record_Collector.php
@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Record;
 
@@ -34,7 +35,7 @@ class Sql_Record_Collector implements Record_Collector_Interface {
 	 *
 	 * @return string
 	 */
-	public function query( $query ) {
+	public function query( $query ): string {
 
 		global $wpdb;
 
@@ -50,7 +51,7 @@ class Sql_Record_Collector implements Record_Collector_Interface {
 	/**
 	 * @return Record[]
 	 */
-	public function get_records() {
+	public function get_records(): array {
 
 		if ( ! $this->is_savequeries() ) {
 			return [];
@@ -64,9 +65,9 @@ class Sql_Record_Collector implements Record_Collector_Interface {
 	/**
 	 * @return bool
 	 */
-	protected function is_savequeries() {
+	protected function is_savequeries(): bool {
 
-		return defined( 'SAVEQUERIES' ) && SAVEQUERIES;
+		return \defined( 'SAVEQUERIES' ) && SAVEQUERIES;
 	}
 
 	/**
@@ -77,13 +78,13 @@ class Sql_Record_Collector implements Record_Collector_Interface {
 	 *
 	 * @return Record
 	 */
-	protected function transform( $key, $query_data ) {
+	protected function transform( int $key, array $query_data ): Record {
 
 		static $last_query_end = 0;
 
-		list( $sql, $duration, $caller ) = $query_data;
+		[ $sql, $duration, $caller ] = $query_data;
 
-		$query_start = isset( $this->query_starts[ $key ] ) ? $this->query_starts[ $key ] : $last_query_end;
+		$query_start = $this->query_starts[ $key ] ?? $last_query_end;
 		$sql         = trim( $sql );
 		$category    = 'sql-read';
 		if ( 0 === stripos( $sql, 'INSERT' ) || 0 === stripos( $sql, 'UPDATE' ) ) {
diff --git a/src/Record/Stopwatch_Record.php b/src/Record/Stopwatch_Record.php
index d954ac9..5c18e4b 100644
--- a/src/Record/Stopwatch_Record.php
+++ b/src/Record/Stopwatch_Record.php
@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Record;
 
@@ -19,7 +20,7 @@ class Stopwatch_Record implements Record_Interface {
 	 * @param string         $name            Event name.
 	 * @param StopwatchEvent $stopwatch_event Stopwatch event instance.
 	 */
-	public function __construct( $name, StopwatchEvent $stopwatch_event ) {
+	public function __construct( string $name, StopwatchEvent $stopwatch_event ) {
 		$this->name            = $name;
 		$this->stopwatch_event = $stopwatch_event;
 	}
@@ -27,14 +28,14 @@ class Stopwatch_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 {
 
 		$duration = round( $this->stopwatch_event->getDuration() );
 		$memory   = $this->stopwatch_event->getMemory() / 1024 / 1024;
@@ -45,21 +46,21 @@ class Stopwatch_Record implements Record_Interface {
 	/**
 	 * @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();
 	}
 }
diff --git a/src/Record/Stopwatch_Record_Collector.php b/src/Record/Stopwatch_Record_Collector.php
index 94a6d75..91ac9e2 100644
--- a/src/Record/Stopwatch_Record_Collector.php
+++ b/src/Record/Stopwatch_Record_Collector.php
@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Record;
 
@@ -26,7 +27,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,7 +48,7 @@ class Stopwatch_Record_Collector implements Record_Collector_Interface {
 	/**
 	 * @return Stopwatch_Record[]
 	 */
-	public function get_records() {
+	public function get_records(): array {
 
 		$events = $this->stopwatch->getSectionEvents( '__root__' );
 
@@ -66,7 +67,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 );
 	}
diff --git a/src/Record/Timeline_Iterator.php b/src/Record/Timeline_Iterator.php
index 143ddd9..213f2c7 100644
--- a/src/Record/Timeline_Iterator.php
+++ b/src/Record/Timeline_Iterator.php
@@ -1,4 +1,5 @@
 <?php
+declare( strict_types=1 );
 
 namespace Rarst\Laps\Record;
 
@@ -24,14 +25,14 @@ class Timeline_Iterator implements \Iterator {
 	 */
 	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 = [];
 
@@ -45,7 +46,7 @@ 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();
 	}
 
@@ -54,21 +55,21 @@ class Timeline_Iterator implements \Iterator {
 	 *
 	 * @return void
 	 */
-	public function key() {
+	public function key(): void {
 
 	}
 
 	/**
 	 * @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 +79,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(),
diff --git a/tests/Record/CoreTest.php b/tests/Record/CoreTest.php
index b99f141..d549467 100644
--- a/tests/Record/CoreTest.php
+++ b/tests/Record/CoreTest.php
@@ -10,6 +10,9 @@ class CoreTest extends LapsTestCase {
 
 	public function testCollector() {
 
+		global $timestart;
+		$timestart = microtime( true );;
+
 		$collector = new Core_Load_Collector();
 
 		$records = $collector->get_records();