CorWatts / fasterscale

common/models/User.php

Indentation +20 added lines, -20 removed lines

@@ -560,29 +560,29 @@
 
 
   public function cleanExportData($data) {
-   $order = array_flip(["date", "behavior", "category", "question1", "question2", "question3"]);
+    $order = array_flip(["date", "behavior", "category", "question1", "question2", "question3"]);
 
-   $ret = array_map(
-     function($row) use ($order) {
-       // change timestamp to local time (for the user)
-       $row['date'] = $this->time->convertUTCToLocal($row['date'], false);
+    $ret = array_map(
+      function($row) use ($order) {
+        // change timestamp to local time (for the user)
+        $row['date'] = $this->time->convertUTCToLocal($row['date'], false);
        
-       // clean up things we don't need
-       $row['category'] = $row['category']['name'];
-       $row['behavior'] = $row['behavior']['name'];
-       unset($row['id']);
-       unset($row['behavior_id']);
-       unset($row['category_id']);
-
-       // sort the array into a sensible order
-       uksort($row, function($a, $b) use ($order) {
+        // clean up things we don't need
+        $row['category'] = $row['category']['name'];
+        $row['behavior'] = $row['behavior']['name'];
+        unset($row['id']);
+        unset($row['behavior_id']);
+        unset($row['category_id']);
+
+        // sort the array into a sensible order
+        uksort($row, function($a, $b) use ($order) {
         return $order[$a] <=> $order[$b];
-       });
-       return $row;
-     }, 
-     $data
-   );
-   return $ret;
+        });
+        return $row;
+      }, 
+      $data
+    );
+    return $ret;
   }
 
   /*

Spacing +26 added lines, -26 removed lines

@@ -143,7 +143,7 @@ 
    */
   public function findByPasswordResetToken($token)
   {
-    if(!$this->isTokenCurrent($token)) {
+    if (!$this->isTokenCurrent($token)) {
       return null;
     }
 
@@ -161,15 +161,15 @@ 
    */
   public function findByVerifyEmailToken($token)
   {
-    if($this->isTokenConfirmed($token)) return null;
+    if ($this->isTokenConfirmed($token)) return null;
 
     $user = $this->findOne([
       'verify_email_token' => [$token, $token . self::CONFIRMED_STRING],
       'status' => self::STATUS_ACTIVE,
     ]);
 
-    if($user) {
-      if(!$this->isTokenConfirmed($token) &&
+    if ($user) {
+      if (!$this->isTokenConfirmed($token) &&
          !$this->isTokenCurrent($token, 'user.verifyAccountTokenExpire')) {
         return null;
       }
@@ -191,8 +191,8 @@ 
       'status' => self::STATUS_ACTIVE,
     ]);
 
-    if($user) {
-      if(!$user->isTokenCurrent($token, 'user.verifyAccountTokenExpire')) {
+    if ($user) {
+      if (!$user->isTokenCurrent($token, 'user.verifyAccountTokenExpire')) {
         return null;
       }
     }
@@ -210,7 +210,7 @@ 
   public function isTokenCurrent($token, String $paramPath = 'user.passwordResetTokenExpire') {
     $expire = \Yii::$app->params[$paramPath];
     $parts = explode('_', $token);
-    $timestamp = (int) end($parts);
+    $timestamp = (int)end($parts);
     if ($timestamp + $expire < time()) {
       // token expired
       return false;
@@ -225,7 +225,7 @@ 
    * @param string    $match the needle to search for
    */
   public function isTokenConfirmed($token = null, String $match = self::CONFIRMED_STRING) {
-    if(is_null($token)) $token = $this->verify_email_token;
+    if (is_null($token)) $token = $this->verify_email_token;
     return substr($token, -strlen($match)) === $match;
   }
 
@@ -250,7 +250,7 @@ 
   }
 
   public function isVerified() {
-    if(is_null($this->verify_email_token)) {
+    if (is_null($this->verify_email_token)) {
       // for old users who verified their accounts before the addition of
       // '_confirmed' to the token
       return true;
@@ -369,7 +369,7 @@ 
    * partner email address the user has set.
    */
   public function sendEmailReport($date) {
-    if(!$this->send_email) return false; // no partner emails set
+    if (!$this->send_email) return false; // no partner emails set
     list($start, $end) = $this->time->getUTCBookends($date);
 
     $user_behavior = Yii::$container->get(UserBehaviorInterface::class);
@@ -378,14 +378,14 @@ 
     // we should only proceed with sending the email if the user
     // scored above their set email threshold (User::email_category)
     $this_checkin     = $checkins_last_month[$date]; // gets the check-in
-    if(!$this_checkin)  return false;           // sanity check
-    $highest_cat_data = end($this_checkin);     // gets the data for the highest category from the check-in
-    if(!$highest_cat_data) return false;        // another sanity check
+    if (!$this_checkin)  return false; // sanity check
+    $highest_cat_data = end($this_checkin); // gets the data for the highest category from the check-in
+    if (!$highest_cat_data) return false; // another sanity check
     $highest_cat_idx  = key($this_checkin); // gets the key of the highest category
 
     // if the highest category they reached today was less than
     // the category threshold they have set, don't send the email
-    if($highest_cat_idx < $this->email_category) return false;
+    if ($highest_cat_idx < $this->email_category) return false;
 
     $graph = Yii::$container
       ->get(\common\components\Graph::class)
@@ -395,8 +395,8 @@ 
     $user_questions = $this->getUserQuestions($date);
 
     $messages = [];
-    foreach($this->getPartnerEmails() as $email) {
-      if($email) {
+    foreach ($this->getPartnerEmails() as $email) {
+      if ($email) {
         $messages[] = Yii::$app->mailer->compose('checkinReport', [
           'user'          => $this,
           'email'         => $email,
@@ -408,7 +408,7 @@ 
           'behaviors_list'  => \common\models\Behavior::$behaviors,
         ])->setFrom([Yii::$app->params['supportEmail'] => Yii::$app->name])
         ->setReplyTo($this->email)
-        ->setSubject($this->email." has completed a Faster Scale check-in")
+        ->setSubject($this->email . " has completed a Faster Scale check-in")
         ->setTo($email);
       }
     }
@@ -482,7 +482,7 @@ 
     return \Yii::$app->mailer->compose('signupNotification')
       ->setFrom([\Yii::$app->params['supportEmail'] => \Yii::$app->name])
       ->setTo(\Yii::$app->params['adminEmail'])
-      ->setSubject('A new user has signed up for '.\Yii::$app->name)
+      ->setSubject('A new user has signed up for ' . \Yii::$app->name)
       ->send();
   }
 
@@ -490,20 +490,20 @@ 
     return \Yii::$app->mailer->compose('verifyEmail', ['user' => $this])
       ->setFrom([\Yii::$app->params['supportEmail'] => \Yii::$app->name])
       ->setTo($this->email)
-      ->setSubject('Please verify your '.\Yii::$app->name .' account')
+      ->setSubject('Please verify your ' . \Yii::$app->name . ' account')
       ->send();
   }
 
   public function sendDeleteNotificationEmail() {
     $messages = [];
-    foreach(array_merge([$this->email], $this->getPartnerEmails()) as $email) {
-      if($email) {
+    foreach (array_merge([$this->email], $this->getPartnerEmails()) as $email) {
+      if ($email) {
         $messages[] = Yii::$app->mailer->compose('deleteNotification', [
           'user' => $this,
           'email' => $email
         ])->setFrom([Yii::$app->params['supportEmail'] => Yii::$app->name])
         ->setReplyTo($this->email)
-        ->setSubject($this->email." has deleted their The Faster Scale App account")
+        ->setSubject($this->email . " has deleted their The Faster Scale App account")
         ->setTo($email);
       }
     }
@@ -512,16 +512,16 @@ 
   }
 
   public function getUserQuestions($local_date = null) {
-    if(is_null($local_date)) $local_date = $this->time->getLocalDate();
+    if (is_null($local_date)) $local_date = $this->time->getLocalDate();
     $questions = $this->getQuestionData($local_date);
     return $this->parseQuestionData($questions);
   }
 
   public function parseQuestionData($questions) {
-    if(!$questions) return [];
+    if (!$questions) return [];
 
     $question_answers = [];
-    foreach($questions as $question) {
+    foreach ($questions as $question) {
       $behavior = $question['behavior'];
 
       $question_answers[$behavior['id']]['question'] = [
@@ -604,7 +604,7 @@ 
     return rtrim(
       strtr(
         base64_encode(
-          hash('sha256', $this->id."::".$this->created_at, true)
+          hash('sha256', $this->id . "::" . $this->created_at, true)
         ),
       '+/', '-_'),
     '=');

Braces +27 added lines, -8 removed lines

@@ -161,7 +161,9 @@ 
    */
   public function findByVerifyEmailToken($token)
   {
-    if($this->isTokenConfirmed($token)) return null;
+    if($this->isTokenConfirmed($token)) {
+      return null;
+    }
 
     $user = $this->findOne([
       'verify_email_token' => [$token, $token . self::CONFIRMED_STRING],
@@ -225,7 +227,9 @@ 
    * @param string    $match the needle to search for
    */
   public function isTokenConfirmed($token = null, String $match = self::CONFIRMED_STRING) {
-    if(is_null($token)) $token = $this->verify_email_token;
+    if(is_null($token)) {
+      $token = $this->verify_email_token;
+    }
     return substr($token, -strlen($match)) === $match;
   }
 
@@ -369,7 +373,10 @@ 
    * partner email address the user has set.
    */
   public function sendEmailReport($date) {
-    if(!$this->send_email) return false; // no partner emails set
+    if(!$this->send_email) {
+      return false;
+    }
+    // no partner emails set
     list($start, $end) = $this->time->getUTCBookends($date);
 
     $user_behavior = Yii::$container->get(UserBehaviorInterface::class);
@@ -378,14 +385,22 @@ 
     // we should only proceed with sending the email if the user
     // scored above their set email threshold (User::email_category)
     $this_checkin     = $checkins_last_month[$date]; // gets the check-in
-    if(!$this_checkin)  return false;           // sanity check
+    if(!$this_checkin) {
+      return false;
+    }
+    // sanity check
     $highest_cat_data = end($this_checkin);     // gets the data for the highest category from the check-in
-    if(!$highest_cat_data) return false;        // another sanity check
+    if(!$highest_cat_data) {
+      return false;
+    }
+    // another sanity check
     $highest_cat_idx  = key($this_checkin); // gets the key of the highest category
 
     // if the highest category they reached today was less than
     // the category threshold they have set, don't send the email
-    if($highest_cat_idx < $this->email_category) return false;
+    if($highest_cat_idx < $this->email_category) {
+      return false;
+    }
 
     $graph = Yii::$container
       ->get(\common\components\Graph::class)
@@ -512,13 +527,17 @@ 
   }
 
   public function getUserQuestions($local_date = null) {
-    if(is_null($local_date)) $local_date = $this->time->getLocalDate();
+    if(is_null($local_date)) {
+      $local_date = $this->time->getLocalDate();
+    }
     $questions = $this->getQuestionData($local_date);
     return $this->parseQuestionData($questions);
   }
 
   public function parseQuestionData($questions) {
-    if(!$questions) return [];
+    if(!$questions) {
+      return [];
+    }
 
     $question_answers = [];
     foreach($questions as $question) {

common/models/UserBehavior.php

Spacing +12 added lines, -12 removed lines

@@ -86,7 +86,7 @@ 
       ->groupBy('date, user_id')
       ->having('user_id = :user_id');
     $temp_dates = $query->all();
-    foreach($temp_dates as $temp_date) {
+    foreach ($temp_dates as $temp_date) {
       $past_checkin_dates[] = $this->time->convertUTCToLocal($temp_date['date']);
     }
 
@@ -115,12 +115,12 @@ 
 
   public function getCheckinBreakdown(int $period = 30) {
     $datetimes = $this->time->getDateTimesInPeriod($period);
-    $key = "checkins_".Yii::$app->user->id."_{$period}_".$this->time->getLocalDate();
+    $key = "checkins_" . Yii::$app->user->id . "_{$period}_" . $this->time->getLocalDate();
     $checkins = Yii::$app->cache->get($key);
 
-    if($checkins === false) {
+    if ($checkins === false) {
       $checkins = [];
-      foreach($datetimes as $datetime) {
+      foreach ($datetimes as $datetime) {
         $behaviors = self::decorate($this->getBehaviorsWithCounts($datetime));
         $checkins[$datetime->format('Y-m-d')] = $this->getBehaviorsByCategory($behaviors);
       }
@@ -146,7 +146,7 @@ 
   public function getBehaviorsByCategory(array $decorated_behaviors) {
     $arr = array_reduce($decorated_behaviors, function($acc, $row) {
       $cat_id = $row['category_id'];
-      if(array_key_exists($cat_id, $acc)) {
+      if (array_key_exists($cat_id, $acc)) {
         $acc[$cat_id]['count'] += $row['count'];
       } else {
         $acc[$cat_id] = [
@@ -178,11 +178,11 @@ 
       ->having('user_id = :user_id')
       ->orderBy('count DESC');
 
-    if($limit instanceof \DateTime) {
+    if ($limit instanceof \DateTime) {
       list($start, $end) = $this->time->getUTCBookends($limit->format('Y-m-d'));
       $query->params += [':start_date' => $start, ':end_date' => $end];
       $query->where('user_id=:user_id AND date > :start_date AND date <= :end_date');
-    } else if(is_int($limit)) {
+    } else if (is_int($limit)) {
       $query->limit($limit);
     }
     return $query->all();
@@ -197,7 +197,7 @@ 
    * @return array
    */
   public function getByDate(int $user_id, $local_date = null) {
-    if(is_null($local_date)) $local_date = $this->time->getLocalDate();
+    if (is_null($local_date)) $local_date = $this->time->getLocalDate();
 
     $behaviors = $this->getBehaviorData($user_id, $local_date);
     $behaviors = self::decorate($behaviors);
@@ -210,12 +210,12 @@ 
    * @return an array of decorated UserBehaviors, each with an added Category and Behavior
    */
   public static function decorate(array $uo) {
-    foreach($uo as &$o) {
+    foreach ($uo as &$o) {
       $behavior = \common\models\Behavior::getBehavior('id', $o['behavior_id']);
       $category = \common\models\Category::getCategory('id', $o['category_id']);
       // if this behavior does not have a valid behavior or category, something
       // is weird and we don't want to do this halfway.
-      if($behavior && $category) {
+      if ($behavior && $category) {
         $o['behavior'] = $behavior;
         $o['category'] = $category;
       }
@@ -242,10 +242,10 @@ 
 
   // this should probably be a private method...but unit testing is hard
   public function parseBehaviorData($behaviors) {
-    if(!$behaviors) return [];
+    if (!$behaviors) return [];
 
     $bhvrs_by_cat = [];
-    foreach($behaviors as $behavior) {
+    foreach ($behaviors as $behavior) {
       $indx = $behavior['category_id'];
 
       $bhvrs_by_cat[$indx][$behavior['behavior']['name']] = [

Braces +6 added lines, -2 removed lines

@@ -197,7 +197,9 @@ 
    * @return array
    */
   public function getByDate(int $user_id, $local_date = null) {
-    if(is_null($local_date)) $local_date = $this->time->getLocalDate();
+    if(is_null($local_date)) {
+      $local_date = $this->time->getLocalDate();
+    }
 
     $behaviors = $this->getBehaviorData($user_id, $local_date);
     $behaviors = self::decorate($behaviors);
@@ -242,7 +244,9 @@ 
 
   // this should probably be a private method...but unit testing is hard
   public function parseBehaviorData($behaviors) {
-    if(!$behaviors) return [];
+    if(!$behaviors) {
+      return [];
+    }
 
     $bhvrs_by_cat = [];
     foreach($behaviors as $behavior) {

console/migrations/m190829_141748_alter_user_behavior_link_add_category_id.php

Spacing +6 added lines, -6 removed lines

@@ -20,20 +20,20 @@
       $this->addColumn('{{%question}}', 'category_id', Schema::TYPE_INTEGER);
 
       $query = (new Query())->from('user_behavior_link');
-      foreach($query->batch() as $rows) {
-        foreach($rows as $row) {
+      foreach ($query->batch() as $rows) {
+        foreach ($rows as $row) {
           $bhvr = Behavior::getBehavior('id', $row['behavior_id']);
-          if($bhvr) {
+          if ($bhvr) {
             $this->update('{{%user_behavior_link}}', ['category_id' => $bhvr['category_id']], ['id' => $row['id']]);
           }
         }
       }
 
       $query = (new Query())->from('question');
-      foreach($query->batch() as $rows) {
-        foreach($rows as $row) {
+      foreach ($query->batch() as $rows) {
+        foreach ($rows as $row) {
           $bhvr = Behavior::getBehavior('id', $row['behavior_id']);
-          if($bhvr) {
+          if ($bhvr) {
             $this->update('{{%question}}', ['category_id' => $bhvr['category_id']], ['id' => $row['id']]);
           }
         }