From 054bf2e0dfb23b96964f12c70138ca5cbcdbad79 Mon Sep 17 00:00:00 2001
From: Andrey Savchenko <contact@rarst.net>
Date: Thu, 8 Feb 2018 16:08:39 +0200
Subject: [PATCH] Moved HTTP requests events to a provider.

---
 src/Events/Http_Events_Provider.php | 61 +++++++++++++++++++++++++++++
 src/Laps.php                        | 38 +-----------------
 2 files changed, 63 insertions(+), 36 deletions(-)
 create mode 100644 src/Events/Http_Events_Provider.php

diff --git a/src/Events/Http_Events_Provider.php b/src/Events/Http_Events_Provider.php
new file mode 100644
index 0000000..404841f
--- /dev/null
+++ b/src/Events/Http_Events_Provider.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Rarst\Laps\Events;
+
+use Pimple\Container;
+use Pimple\ServiceProviderInterface;
+use Rarst\Laps\Bootable_Provider_Interface;
+use Rarst\Laps\Laps;
+use Symfony\Component\Stopwatch\Stopwatch;
+
+class Http_Events_Provider implements ServiceProviderInterface, Bootable_Provider_Interface {
+
+	/** @var Stopwatch $stopwatch */
+	protected $stopwatch;
+
+	public function register( Container $pimple ) {
+
+	}
+
+	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 );
+	}
+
+	/**
+	 * Capture start time of HTTP request
+	 *
+	 * @param boolean $false
+	 * @param array   $args
+	 * @param string  $url
+	 *
+	 * @return boolean
+	 */
+	public function pre_http_request( $false, $args, $url ) {
+
+		$this->stopwatch->start( $url, 'http' );
+
+		return $false;
+	}
+
+	/**
+	 * Capture end time of HTTP request
+	 *
+	 * @param array|\WP_Error $response
+	 * @param string          $type
+	 * @param object          $class
+	 * @param array           $args
+	 * @param string          $url
+	 *
+	 * @return mixed
+	 */
+	public function http_api_debug( $response, $type, $class, $args, $url ) {
+
+		$this->stopwatch->stop( $url );
+
+		return $response;
+	}
+}
\ No newline at end of file
diff --git a/src/Laps.php b/src/Laps.php
index fcb075f..f4121e2 100644
--- a/src/Laps.php
+++ b/src/Laps.php
@@ -6,6 +6,7 @@ use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 use Rarst\Laps\Events\Events_Provider_Interface;
 use Rarst\Laps\Events\Hook_Events_Provider;
+use Rarst\Laps\Events\Http_Events_Provider;
 use Symfony\Component\Stopwatch\Stopwatch;
 
 /**
@@ -35,6 +36,7 @@ class Laps extends Container {
 		};
 
 		$laps->register( new Hook_Events_Provider() );
+		$laps->register( new Http_Events_Provider() );
 
 		foreach ( $values as $key => $value ) {
 			$this->offsetSet( $key, $value );
@@ -70,8 +72,6 @@ class Laps extends Container {
 
 		add_action( 'pre_update_option_active_plugins', array( $this, 'pre_update_option_active_plugins' ) );
 		add_action( 'pre_update_site_option_active_sitewide_plugins', array( $this, 'pre_update_option_active_plugins' ) );
-		add_action( 'pre_http_request', array( $this, 'pre_http_request' ), 10, 3 );
-		add_action( 'http_api_debug', array( $this, 'http_api_debug' ), 10, 5 );
 		add_action( 'init', array( $this, 'init' ) );
 
 		if ( defined( 'SAVEQUERIES' ) && SAVEQUERIES ) {
@@ -121,40 +121,6 @@ class Laps extends Container {
 		return $query;
 	}
 
-	/**
-	 * Capture start time of HTTP request
-	 *
-	 * @param boolean $false
-	 * @param array   $args
-	 * @param string  $url
-	 *
-	 * @return boolean
-	 */
-	public function pre_http_request( $false, $args, $url ) {
-
-		$this['stopwatch']->start( $url, 'http' );
-
-		return $false;
-	}
-
-	/**
-	 * Capture end time of HTTP request
-	 *
-	 * @param array|\WP_Error $response
-	 * @param string          $type
-	 * @param object          $class
-	 * @param array           $args
-	 * @param string          $url
-	 *
-	 * @return mixed
-	 */
-	public function http_api_debug( $response, $type, $class, $args, $url ) {
-
-		$this['stopwatch']->stop( $url );
-
-		return $response;
-	}
-
 	public function init() {
 
 		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );