From ffae4f6d6569f75c8fb357d556535a5879d9bff5 Mon Sep 17 00:00:00 2001
From: mgrauer <michael.grauer@kitware.com>
Date: Fri, 4 Mar 2016 17:03:21 -0500
Subject: [PATCH] Applied fixes from StyleCI

---
 .../controllers/components/ApiComponent.php       |  3 ++-
 .../models/pdo/AggregateMetricSpecModel.php       | 15 +++++++++++----
 .../tests/controllers/ApiComponentTest.php        |  4 ++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/modules/tracker/controllers/components/ApiComponent.php b/modules/tracker/controllers/components/ApiComponent.php
index fb5abebe5..a8cba1bca 100644
--- a/modules/tracker/controllers/components/ApiComponent.php
+++ b/modules/tracker/controllers/components/ApiComponent.php
@@ -763,7 +763,8 @@ public function aggregatemetricsUpdate($args)
      * @return AggregateMetricSpecDao aggregate metric spec DAO
      * @throws Exception
      */
-    private function _loadAggregateMetricSpec($userDao, $aggregateMetricSpecId, $policy = MIDAS_POLICY_READ) {
+    private function _loadAggregateMetricSpec($userDao, $aggregateMetricSpecId, $policy = MIDAS_POLICY_READ)
+    {
         /** @var Tracker_AggregateMetricSpecModel $aggregateMetricSpecModel */
         $aggregateMetricSpecModel = MidasLoader::loadModel('AggregateMetricSpec', 'tracker');
         /** @var Tracker_AggregateMetricSpecDao $aggregateMetricSpecDao */
diff --git a/modules/tracker/models/pdo/AggregateMetricSpecModel.php b/modules/tracker/models/pdo/AggregateMetricSpecModel.php
index 1dfb5c00e..883287534 100644
--- a/modules/tracker/models/pdo/AggregateMetricSpecModel.php
+++ b/modules/tracker/models/pdo/AggregateMetricSpecModel.php
@@ -30,7 +30,8 @@ class Tracker_AggregateMetricSpecModel extends Tracker_AggregateMetricSpecModelB
      * @param UserDao $userDao user DAO
      * @return bool true if the notification could be created, false otherwise
      */
-    public function createUserNotification($aggregateMetricSpecDao, $userDao) {
+    public function createUserNotification($aggregateMetricSpecDao, $userDao)
+    {
         if (is_null($aggregateMetricSpecDao) || $aggregateMetricSpecDao === false) {
             return false;
         }
@@ -52,6 +53,7 @@ public function createUserNotification($aggregateMetricSpecDao, $userDao) {
                 'user_id' => $userDao->getUserId(),
             );
             $this->database->getdb()->insert('tracker_user2aggregate_metric_spec', $data);
+
             return true;
         }
     }
@@ -65,7 +67,8 @@ public function createUserNotification($aggregateMetricSpecDao, $userDao) {
      * notification does not exist for this user and aggregate metric spec upon
      * returning, false otherwise
      */
-    public function deleteUserNotification($aggregateMetricSpecDao, $userDao) {
+    public function deleteUserNotification($aggregateMetricSpecDao, $userDao)
+    {
         if (is_null($aggregateMetricSpecDao) || $aggregateMetricSpecDao === false) {
             return false;
         }
@@ -76,6 +79,7 @@ public function deleteUserNotification($aggregateMetricSpecDao, $userDao) {
             'aggregate_metric_spec_id = ?' => $aggregateMetricSpecDao->getAggregateMetricSpecId(),
             'user_id = ?' => $userDao->getUserId(),
         ));
+
         return true;
     }
 
@@ -86,7 +90,8 @@ public function deleteUserNotification($aggregateMetricSpecDao, $userDao) {
      * @return false|array of UserDao for all users with notification on the passed in $aggregateMetricSpecDao,
      * or false if the passed in spec is invalid
      */
-    public function getAllNotifiedUsers($aggregateMetricSpecDao) {
+    public function getAllNotifiedUsers($aggregateMetricSpecDao)
+    {
         if (is_null($aggregateMetricSpecDao) || $aggregateMetricSpecDao === false) {
             return false;
         }
@@ -102,6 +107,7 @@ public function getAllNotifiedUsers($aggregateMetricSpecDao) {
         foreach ($rows as $row) {
             $userDaos[] = $userModel->load($row['user_id']);
         }
+
         return $userDaos;
     }
 
@@ -111,7 +117,8 @@ public function getAllNotifiedUsers($aggregateMetricSpecDao) {
      *
      * @param Tracker_AggregateMetricSpecDao $aggregateMetricSpecDao aggregateMetricSpec DAO
      */
-    public function delete($aggregateMetricSpecDao) {
+    public function delete($aggregateMetricSpecDao)
+    {
         if (is_null($aggregateMetricSpecDao) || $aggregateMetricSpecDao === false) {
             return;
         }
diff --git a/modules/tracker/tests/controllers/ApiComponentTest.php b/modules/tracker/tests/controllers/ApiComponentTest.php
index 6ea279321..7f12895f9 100644
--- a/modules/tracker/tests/controllers/ApiComponentTest.php
+++ b/modules/tracker/tests/controllers/ApiComponentTest.php
@@ -484,7 +484,7 @@ public function testAggregatemetricspecNotificationEndpoints()
             $expectedUserIds[$notifiedUser->user_id] = true;
         }
         /** @var int $expectedUserId */
-        /** @var boolean $found */
+        /** @var bool $found */
         foreach ($expectedUserIds as $expectedUserId => $found) {
             $this->assertTrue($found);
         }
@@ -515,7 +515,7 @@ public function testAggregatemetricspecNotificationEndpoints()
             $expectedUserIds[$notifiedUser->user_id] = true;
         }
         /** @var int $expectedUserId */
-        /** @var boolean $found */
+        /** @var bool $found */
         foreach ($expectedUserIds as $expectedUserId => $found) {
             $this->assertTrue($found);
         }