From 9af7b3cc01c34a992c3f40530a5c4c92f610490a Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik.hautakoski@gmail.com>
Date: Fri, 10 Aug 2018 16:48:48 +0200
Subject: [PATCH] minor cleanups.

---
 app/listeners/AclListener.php      |  6 +++---
 app/listeners/ActivityLog.php      | 10 ++++------
 app/listeners/DispatchListener.php | 10 +++++-----
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/app/listeners/AclListener.php b/app/listeners/AclListener.php
index d898e52..cd8b732 100644
--- a/app/listeners/AclListener.php
+++ b/app/listeners/AclListener.php
@@ -2,9 +2,9 @@
 
 namespace App\Listener;
 
-use Phalcon\Events\Event;
-use Phalcon\Mvc\Dispatcher;
-use Phalcon\Mvc\User\Plugin;
+use Phalcon\Events\Event,
+    Phalcon\Mvc\Dispatcher,
+    Phalcon\Mvc\User\Plugin;
 
 use Httpcb\Acl;
 
diff --git a/app/listeners/ActivityLog.php b/app/listeners/ActivityLog.php
index 6202aa4..f7f281e 100644
--- a/app/listeners/ActivityLog.php
+++ b/app/listeners/ActivityLog.php
@@ -25,7 +25,7 @@ class ActivityLog extends Plugin
      */
     public function onLogin(Event $event, Auth $auth, $type)
     {
-        $this->_log($auth->getUser(), "Logged in ({$type})");
+        $this->_log($auth->getUser(), sprintf("Logged in (%s)", $type));
     }
 
     /**
@@ -55,13 +55,11 @@ class ActivityLog extends Plugin
      */
     public function onOAuthConnected(Event $event, User $user, OAuthUserDataInterface $provider)
     {
-        $name = $provider->getProvider();
-
-        $this->_log($user, "OAuth connected ({$name})");
+        $this->_log($user, sprintf("OAuth connected (%s)", $provider->getProvider()));
     }
 
     /**
-     * Fired when a user is connected to a OAuth provider.
+     * Fired when a user is disconnected from a OAuth provider.
      *
      * @param Event $event
      * @param User $user
@@ -69,7 +67,7 @@ class ActivityLog extends Plugin
      */
     public function onOAuthDisconnect(Event $event, User $user, $providerName)
     {
-        $this->_log($user, "OAuth disconnected ({$providerName})");
+        $this->_log($user, sprintf("OAuth disconnected (%s)", $providerName));
     }
 
     protected function _log(User $user, $message)
diff --git a/app/listeners/DispatchListener.php b/app/listeners/DispatchListener.php
index aeab9f0..1cd9ff1 100644
--- a/app/listeners/DispatchListener.php
+++ b/app/listeners/DispatchListener.php
@@ -2,11 +2,11 @@
 
 namespace App\Listener;
 
-use Exception;
-use Phalcon\Events\Event;
-use Phalcon\Mvc\User\Plugin;
-use Phalcon\Mvc\Dispatcher;
-use Phalcon\Mvc\Dispatcher\Exception as DispatcherException;
+use Exception,
+    Phalcon\Events\Event,
+    Phalcon\Mvc\User\Plugin,
+    Phalcon\Mvc\Dispatcher,
+    Phalcon\Mvc\Dispatcher\Exception as DispatcherException;
 
 /**
  * Class DispatchListener