Added proper providers to handle registration and boot.

src/Laps.php

@@ -4,14 +4,9 @@ namespace Rarst\Laps;
 
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
-use Rarst\Laps\Record\Record_Collector_Interface;
+use Rarst\Laps\Provider\Bootable_Provider_Interface;
-use Rarst\Laps\Record\Hook_Record_Collector;
+use Rarst\Laps\Provider\Manager_Provider;
-use Rarst\Laps\Record\Http_Record_Collector;
+use Rarst\Laps\Provider\Record_Provider;
-use Rarst\Laps\Record\Sql_Record_Collector;
-use Rarst\Laps\Manager\Asset_Manager;
-use Rarst\Laps\Manager\Load_Order_Manager;
-use Rarst\Laps\Manager\Toolbar_Manager;
-use Symfony\Component\Stopwatch\Stopwatch;
 
 /**
  * Main plugin's class.
@@ -33,30 +28,8 @@ class Laps extends Container {
 			] );
 		};
 
-		$laps['stopwatch'] = $laps->factory( function () {
+		$laps->register( new Manager_Provider() );
-			return new Stopwatch();
+		$laps->register( new Record_Provider() );
-		} );
-
-		$laps['records'] = function() {
-
-			$records = [];
-
-			foreach ( $this->providers as $provider ) {
-				if ( $provider instanceof Record_Collector_Interface ) {
-					$records[] = $provider->get_records();
-				}
-			}
-
-			return array_merge( ...$records );
-		};
-
-		$laps->register( new Load_Order_Manager() );
-		$laps->register( new Asset_Manager() );
-		$laps->register( new Toolbar_Manager() );
-
-		$laps->register( new Hook_Record_Collector() );
-		$laps->register( new Http_Record_Collector() );
-		$laps->register( new Sql_Record_Collector() );
 
 		foreach ( $values as $key => $value ) {
 			$this->offsetSet( $key, $value );

src/Manager/Asset_Manager.php

@@ -2,18 +2,10 @@
 
 namespace Rarst\Laps\Manager;
 
-use Pimple\Container;
+class Asset_Manager {
-use Pimple\ServiceProviderInterface;
-use Rarst\Laps\Bootable_Provider_Interface;
-use Rarst\Laps\Laps;
 
-class Asset_Manager implements ServiceProviderInterface, Bootable_Provider_Interface {
+	public function __construct() {
 
-	public function register( Container $pimple ) {
-
-	}
-
-	public function boot( Laps $laps ) {
 		add_action( 'wp_enqueue_scripts', [ $this, 'enqueue_scripts' ] );
 		add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_scripts' ] );
 	}

src/Manager/Load_Order_Manager.php

@@ -2,21 +2,12 @@
 
 namespace Rarst\Laps\Manager;
 
-use Pimple\Container;
-use Pimple\ServiceProviderInterface;
-use Rarst\Laps\Bootable_Provider_Interface;
-use Rarst\Laps\Laps;
-
 /**
- * Reorders
+ * Reorders plugin load to put Laps first and time this core boot stage.
  */
-class Load_Order_Manager implements ServiceProviderInterface, Bootable_Provider_Interface {
+class Load_Order_Manager {
 
-	public function register( Container $pimple ) {
+	public function __construct() {
-
-	}
-
-	public function boot( Laps $laps ) {
 
 		add_action( 'pre_update_option_active_plugins', [ $this, 'pre_update_option_active_plugins' ] );
 		add_action( 'pre_update_site_option_active_sitewide_plugins', [ $this, 'pre_update_option_active_plugins' ] );

src/Manager/Toolbar_Manager.php

@@ -2,23 +2,16 @@
 
 namespace Rarst\Laps\Manager;
 
-use Pimple\Container;
-use Pimple\ServiceProviderInterface;
-use Rarst\Laps\Bootable_Provider_Interface;
 use Rarst\Laps\Record\Recursive_Record_Iterator;
 use Rarst\Laps\Laps;
 use Rarst\Laps\Timeline_Iterator;
 
-class Toolbar_Manager implements ServiceProviderInterface, Bootable_Provider_Interface {
+class Toolbar_Manager {
 
 	/** @var Laps $laps */
 	protected $laps;
 
-	public function register( Container $pimple ) {
+	public function __construct( Laps $laps ) {
-
-	}
-
-	public function boot( Laps $laps ) {
 
 		$this->laps = $laps;
 

src/Provider/Bootable_Provider_Interface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rarst\Laps;
+namespace Rarst\Laps\Provider;
 
 use Rarst\Laps\Laps;
 

src/Provider/Manager_Provider.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Rarst\Laps\Provider;
+
+use Pimple\Container;
+use Pimple\ServiceProviderInterface;
+use Rarst\Laps\Laps;
+use Rarst\Laps\Manager\Asset_Manager;
+use Rarst\Laps\Manager\Load_Order_Manager;
+use Rarst\Laps\Manager\Toolbar_Manager;
+
+class Manager_Provider implements ServiceProviderInterface, Bootable_Provider_Interface {
+
+	public function register( Container $pimple ) {
+
+		$pimple['managers'] = function ( Laps $laps ) {
+			return [
+				new Load_Order_Manager(),
+				new Asset_Manager(),
+				new Toolbar_Manager( $laps ),
+			];
+		};
+	}
+
+	public function boot( Laps $laps ) {
+		$laps['managers'];
+	}
+}

src/Provider/Record_Provider.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Rarst\Laps\Provider;
+
+use Pimple\Container;
+use Pimple\ServiceProviderInterface;
+use Rarst\Laps\Laps;
+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 Symfony\Component\Stopwatch\Stopwatch;
+
+class Record_Provider implements ServiceProviderInterface, Bootable_Provider_Interface {
+
+	public function register( Container $pimple ) {
+
+		$pimple['stopwatch'] = $pimple->factory( function () {
+			return new Stopwatch();
+		} );
+
+		$pimple['collectors'] = function ( Laps $laps ) {
+			return [
+				new Hook_Record_Collector( $laps['stopwatch'] ),
+				new Http_Record_Collector( $laps['stopwatch'] ),
+				new Sql_Record_Collector(),
+			];
+		};
+
+		$pimple['records'] = function ( Laps $laps ) {
+
+			$records = [];
+
+			/** @var Record_Collector_Interface $collector */
+			foreach ( $laps['collectors'] as $collector ) {
+					$records[] = $collector->get_records();
+			}
+
+			return array_merge( ...$records );
+		};
+	}
+
+	public function boot( Laps $laps ) {
+		$laps['collectors'];
+	}
+}

src/Record/Hook_Record_Collector.php

@@ -2,29 +2,21 @@
 
 namespace Rarst\Laps\Record;
 
-use Pimple\Container;
-use Pimple\ServiceProviderInterface;
-use Rarst\Laps\Bootable_Provider_Interface;
 use Rarst\Laps\Events\Core_Events;
 use Rarst\Laps\Events\Laps_Events;
-use Rarst\Laps\Laps;
 use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\Stopwatch\StopwatchEvent;
 
-class Hook_Record_Collector implements ServiceProviderInterface, Bootable_Provider_Interface, Record_Collector_Interface {
+class Hook_Record_Collector implements Record_Collector_Interface {
 
 	/** @var Stopwatch $stopwatch */
 	protected $stopwatch;
 
 	protected $events = [];
 
-	public function register( Container $pimple ) {
+	public function __construct( Stopwatch $stopwatch ) {
 
-	}
+		$this->stopwatch = $stopwatch;
-
-	public function boot( Laps $laps ) {
-
-		$this->stopwatch = $laps['stopwatch'];
 
 		$this->stopwatch->start( 'Plugins Load', 'plugin' );
 

src/Record/Http_Record_Collector.php

@@ -2,25 +2,17 @@
 
 namespace Rarst\Laps\Record;
 
-use Pimple\Container;
-use Pimple\ServiceProviderInterface;
-use Rarst\Laps\Bootable_Provider_Interface;
-use Rarst\Laps\Laps;
 use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\Stopwatch\StopwatchEvent;
 
-class Http_Record_Collector implements ServiceProviderInterface, Bootable_Provider_Interface, Record_Collector_Interface {
+class Http_Record_Collector implements Record_Collector_Interface {
 
 	/** @var Stopwatch $stopwatch */
 	protected $stopwatch;
 
-	public function register( Container $pimple ) {
+	public function __construct( Stopwatch $stopwatch ) {
 
-	}
+		$this->stopwatch = $stopwatch;
-
-	public function boot( Laps $laps ) {
-
-		$this->stopwatch = $laps['stopwatch'];
 
 		add_action( 'pre_http_request', [ $this, 'pre_http_request' ], 10, 3 );
 		add_action( 'http_api_debug', [ $this, 'http_api_debug' ], 10, 5 );

src/Record/Sql_Record_Collector.php

@@ -2,20 +2,11 @@
 
 namespace Rarst\Laps\Record;
 
-use Pimple\Container;
+class Sql_Record_Collector implements Record_Collector_Interface {
-use Pimple\ServiceProviderInterface;
-use Rarst\Laps\Bootable_Provider_Interface;
-use Rarst\Laps\Laps;
-
-class Sql_Record_Collector implements ServiceProviderInterface, Bootable_Provider_Interface, Record_Collector_Interface {
 
 	protected $query_starts = [];
 
-	public function register( Container $pimple ) {
+	public function __construct() {
-
-	}
-
-	public function boot( Laps $laps ) {
 
 		if ( $this->is_savequeries() ) {
 			add_filter( 'query', [ $this, 'query' ], 20 );