CS fixes

barryvdh · barryvdh · commit c20f7cfe0218 · 2015-08-31T11:24:38.000+02:00
diff --git a/src/DataCollector/EventCollector.php b/src/DataCollector/EventCollector.php
@@ -10,7 +10,7 @@ class EventCollector extends TimeDataCollector
     /** @var Dispatcher */
     protected $events;
 
-    /** @var ValueExporter  */
+    /** @var ValueExporter */
     protected $exporter;
 
     public function __construct($requestStartTime = null)
@@ -25,9 +25,13 @@ public function onWildcardEvent()
         $name = $this->events->firing();
         $time = microtime(true);
 
+        // Get the arguments passed to the event
         $params = $this->prepareParams(func_get_args());
 
-        foreach($this->events->getListeners($name) as $i => $listener) {
+        // Find all listeners for the current event
+        foreach ($this->events->getListeners($name) as $i => $listener) {
+
+            // Check if it's an object + method name
             if (is_array($listener) && count($listener) > 1 && is_object($listener[0])) {
                 list($class, $method) = $listener;
 
@@ -36,25 +40,29 @@ public function onWildcardEvent()
                     continue;
                 }
 
-                // Format thet listener to readable format
+                // Format the listener to readable format
                 $listener = get_class($class) . '@' . $method;
-                
+
+            // Handle closures
             } elseif ($listener instanceof \Closure) {
                 $reflector = new \ReflectionFunction($listener);
 
-                if($reflector->getNamespaceName() == 'Barryvdh\Debugbar') {
+                // Skip our own listeners
+                if ($reflector->getNamespaceName() == 'Barryvdh\Debugbar') {
                     continue;
                 }
 
+                // Format the closure to a readable format
                 $filename = ltrim(str_replace(base_path(), '', $reflector->getFileName()), '/');
-                $listener = $reflector->getName() . ' ('.$filename . ':' . $reflector->getStartLine() . '-' . $reflector->getEndLine() . ')';
+                $listener = $reflector->getName() . ' (' . $filename . ':' . $reflector->getStartLine() . '-' . $reflector->getEndLine() . ')';
             } else {
+                // Not sure if this is possible, but to prevent edge cases
                 $listener = $this->formatVar($listener);
             }
 
-            $params['listeners.'.$i] = $listener;
+            $params['listeners.' . $i] = $listener;
         }
-        $this->addMeasure($name, $time, $time,  $params);
+        $this->addMeasure($name, $time, $time, $params);
     }
 
     public function subscribe(Dispatcher $events)
@@ -69,13 +77,15 @@ protected function prepareParams($params)
         foreach ($params as $key => $value) {
             $data[$key] = htmlentities($this->exporter->exportValue($value), ENT_QUOTES, 'UTF-8', false);
         }
+
         return $data;
     }
 
     public function collect()
     {
         $data = parent::collect();
         $data['nb_measures'] = count($data['measures']);
+
         return $data;
     }
 
@@ -87,16 +97,16 @@ public function getName()
     public function getWidgets()
     {
         return array(
-            "events" => array(
-                "icon" => "tasks",
-                "widget" => "PhpDebugBar.Widgets.TimelineWidget",
-                "map" => "event",
-                "default" => "{}"
-            ),
-            'events:badge' => array(
-                'map' => 'event.nb_measures',
-                'default' => 0
-            )
+          "events" => array(
+            "icon" => "tasks",
+            "widget" => "PhpDebugBar.Widgets.TimelineWidget",
+            "map" => "event",
+            "default" => "{}",
+          ),
+          'events:badge' => array(
+            'map' => 'event.nb_measures',
+            'default' => 0,
+          ),
         );
     }
 }
