Merge pull request #105 from snapshotpl/route-listener-improvements

Small RouteListener improvements

Author: weierophinney

src/RouteListener.php

@@ -35,29 +35,29 @@ public function attach(EventManagerInterface $events, $priority = 1)
      *
      * Seeds the event with the route match on completion.
      *
-     * @param  MvcEvent $e
+     * @param  MvcEvent $event
      * @return null|RouteMatch
      */
-    public function onRoute($e)
+    public function onRoute(MvcEvent $event)
     {
-        $target     = $e->getTarget();
-        $request    = $e->getRequest();
-        $router     = $e->getRouter();
+        $request    = $event->getRequest();
+        $router     = $event->getRouter();
         $routeMatch = $router->match($request);
 
-        if (!$routeMatch instanceof RouteMatch) {
-            $e->setName(MvcEvent::EVENT_DISPATCH_ERROR);
-            $e->setError(Application::ERROR_ROUTER_NO_MATCH);
+        if ($routeMatch instanceof RouteMatch) {
+            $event->setRouteMatch($routeMatch);
+            return $routeMatch;
+        }
 
-            $results = $target->getEventManager()->triggerEvent($e);
-            if (count($results)) {
-                return $results->last();
-            }
+        $event->setName(MvcEvent::EVENT_DISPATCH_ERROR);
+        $event->setError(Application::ERROR_ROUTER_NO_MATCH);
 
-            return $e->getParams();
+        $target  = $event->getTarget();
+        $results = $target->getEventManager()->triggerEvent($event);
+        if (!empty($results)) {
+            return $results->last();
         }
 
-        $e->setRouteMatch($routeMatch);
-        return $routeMatch;
+        return $event->getParams();
     }
 }