From 53efcd28afd478e663f409d5b068d664290021d4 Mon Sep 17 00:00:00 2001 From: Andrey Savchenko Date: Tue, 13 Feb 2018 18:16:41 +0200 Subject: [PATCH] Added keys to collectors array. --- src/Provider/Record_Provider.php | 8 ++++---- src/Record/Hook_Record_Collector.php | 12 ++++-------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/Provider/Record_Provider.php b/src/Provider/Record_Provider.php index b1c64e8..2802132 100644 --- a/src/Provider/Record_Provider.php +++ b/src/Provider/Record_Provider.php @@ -21,9 +21,9 @@ class Record_Provider implements ServiceProviderInterface, Bootable_Provider_Int $pimple['collectors'] = function ( Laps $laps ) { return [ - new Hook_Record_Collector( $laps['hook.events'], $laps['stopwatch'] ), - new Http_Record_Collector( $laps['stopwatch'] ), - new Sql_Record_Collector(), + 'hook' => new Hook_Record_Collector( $laps['hook.events'], $laps['stopwatch'] ), + 'http' => new Http_Record_Collector( $laps['stopwatch'] ), + 'sql' => new Sql_Record_Collector(), ]; }; @@ -33,7 +33,7 @@ class Record_Provider implements ServiceProviderInterface, Bootable_Provider_Int /** @var Record_Collector_Interface $collector */ foreach ( $laps['collectors'] as $collector ) { - $records[] = $collector->get_records(); + $records[] = $collector->get_records(); } return array_merge( ...$records ); diff --git a/src/Record/Hook_Record_Collector.php b/src/Record/Hook_Record_Collector.php index 2b1b08c..5a5966e 100644 --- a/src/Record/Hook_Record_Collector.php +++ b/src/Record/Hook_Record_Collector.php @@ -3,7 +3,6 @@ namespace Rarst\Laps\Record; use Rarst\Laps\Event\Hook_Event_Config_Interface; -use Rarst\Laps\Events\Laps_Events; use Symfony\Component\Stopwatch\Stopwatch; use Symfony\Component\Stopwatch\StopwatchEvent; @@ -79,13 +78,10 @@ class Hook_Record_Collector implements Record_Collector_Interface { return $input; } - $event = wp_parse_args( - $this->events[ $filter_name ][ $priority ], - [ - 'action' => 'start', - 'category' => null, - ] - ); + $event = wp_parse_args( $this->events[ $filter_name ][ $priority ], [ + 'action' => 'start', + 'category' => null, + ] ); if ( 'stop' === $event['action'] && ! $this->stopwatch->isStarted( $event['event'] ) ) { return $input;