CorWatts / fasterscale

common/components/Time.php

Spacing +11 added lines, -11 removed lines

@@ -36,13 +36,13 @@ 
    * @return \DateTime the parsed time or the default value
    */
   public function parse($time, $default = false, string $format = 'Y-m-d') {
-    if(is_string($time)) {
+    if (is_string($time)) {
       $dt = DateTime::createFromFormat($format, $time, new DateTimeZone($this->timezone));
-      if($dt) {
+      if ($dt) {
         // for some reason, using createFromFromat adds in the time. The regular DateTime constructor _does not_ do this. We manually zero out the time here to make the DateTime objects match.
         $dt->setTime(0, 0, 0);
         $formatted = $dt->format($format);
-        if($formatted === $time && $this->inBounds($dt)) {
+        if ($formatted === $time && $this->inBounds($dt)) {
           return $dt;
         }
       }
@@ -62,7 +62,7 @@ 
     $test  = strtotime($dt->format('Y-m-d'));
     $now   = strtotime($this->getLocalDate());
 
-    if($first <= $test && $test <= $now) {
+    if ($first <= $test && $test <= $now) {
       return true;
     } else {
       return false;
@@ -86,7 +86,7 @@ 
   }
 
   public function getLocalTime($timezone = null) {
-    if($timezone === null)
+    if ($timezone === null)
       $timezone = $this->timezone;
 
     $timestamp = new DateTime("now", new DateTimeZone($timezone));
@@ -94,7 +94,7 @@ 
   }
 
   public function getLocalDate($timezone = null) {
-    if($timezone === null)
+    if ($timezone === null)
       $timezone = $this->timezone;
 
     return (new DateTime("now", new DateTimeZone($timezone)))
@@ -108,7 +108,7 @@ 
 
   public function getUTCBookends($local) {
     $local = trim($local);
-    if(strpos($local, " ")) {
+    if (strpos($local, " ")) {
       return false;
     }
 
@@ -130,9 +130,9 @@ 
    * @return string a date string
    */
   public function validate($date = null) {
-    if(is_null($date)) {
+    if (is_null($date)) {
       return $this->getLocalDate();
-    } else if($dt = $this->parse($date)) {
+    } else if ($dt = $this->parse($date)) {
       return $dt->format('Y-m-d');
     } else {
       return $this->getLocalDate();
@@ -151,12 +151,12 @@ 
     $dt = new DateTime("now", new DateTimeZone($this->timezone));
     $dt2 = new DateTime("now", new DateTimeZone($this->timezone));
     $end = $dt->add(new \DateInterval('P1D'))      // add a day, so the end date gets included in the intervals
-              ->add(new \DateInterval('PT2M'));    // to be sure we have everything
+              ->add(new \DateInterval('PT2M')); // to be sure we have everything
     $start = $dt2->add(new \DateInterval('PT2M')); // to be sure we have everything
     $start = $start->sub(new \DateInterval("P${period}D"));
     $periods = new \DatePeriod($start, new \DateInterval('P1D'), $end, \DatePeriod::EXCLUDE_START_DATE);
     $local_tz = new \DateTimeZone($this->timezone);
-    foreach($periods as $period) {
+    foreach ($periods as $period) {
       $period->setTimezone($local_tz);
     }
     return $periods;

common/tests/unit/components/GraphTest.php

Spacing +7 added lines, -7 removed lines

@@ -14,8 +14,8 @@ 
   use \Codeception\Specify;
 
   private $user;
-  private $filepath = __DIR__.'/../../_output/test_graph.png';
-  private $filepath_extra = __DIR__.'/../../_output/charts/test_graph.png';
+  private $filepath = __DIR__ . '/../../_output/test_graph.png';
+  private $filepath_extra = __DIR__ . '/../../_output/charts/test_graph.png';
 
   public function setUp() {
     $this->user = $this->getMockBuilder('\site\tests\_support\MockUser')
@@ -36,7 +36,7 @@ 
       ->willReturn('random1DH4sh');
     $graph = new Graph($this->user);
 
-    expect('the expected graph image filepath will be returned', $this->assertEquals(dirname(dirname(dirname(dirname(__DIR__)))).'/site/web/charts/random1DH4sh.png', $graph->getFilepath()));
+    expect('the expected graph image filepath will be returned', $this->assertEquals(dirname(dirname(dirname(dirname(__DIR__)))) . '/site/web/charts/random1DH4sh.png', $graph->getFilepath()));
   }
 
   public function testGetUrl() {
@@ -57,7 +57,7 @@ 
       ->method('getFilepath')
       ->willReturn($this->filepath);
 
-    if(!file_exists($this->filepath) && preg_match('%/_output/test_graph.png$%', $this->filepath)) {
+    if (!file_exists($this->filepath) && preg_match('%/_output/test_graph.png$%', $this->filepath)) {
       touch($this->filepath);
       expect('just a check to be sure $filepath is sane', $this->assertStringEndsWith('/_output/test_graph.png', $this->filepath));
       expect('the generated file should exist', $this->assertFileExists($this->filepath));
@@ -89,7 +89,7 @@ 
     expect('the generated file should be readable', $this->assertFileExists($this->filepath_extra));
 
     // cleanup
-    if(file_exists($this->filepath_extra) && preg_match('%/_output/charts/test_graph.png%', $this->filepath_extra)) {
+    if (file_exists($this->filepath_extra) && preg_match('%/_output/charts/test_graph.png%', $this->filepath_extra)) {
       // just in case something is weird, we don't want to straight rm this file
       unlink($this->filepath_extra);
       rmdir(dirname($this->filepath_extra));
@@ -97,7 +97,7 @@ 
   }
 }
 
-function checkinBreakdown () {
+function checkinBreakdown() {
   return [
       '2019-01-31' => [],
       '2019-02-01' => [],
@@ -230,7 +230,7 @@ 
       '2019-02-27' => [],
       '2019-02-28' => [],
       '2019-03-01' => [
-        2 => [ 'name' => 'Forgetting Priorities',
+        2 => ['name' => 'Forgetting Priorities',
         'count' => 6,
         'color' => '#4CA100',
         'highlight' => '#61B219',

site/models/EditProfileForm.php

Spacing +5 added lines, -5 removed lines

@@ -77,10 +77,10 @@ 
       $graph = Yii::$container
         ->get(\common\components\Graph::class, [$this->user]);
 
-      if($this->timezone) {
+      if ($this->timezone) {
         $user->timezone = $this->timezone;
       }
-      if($this->expose_graph) {
+      if ($this->expose_graph) {
         $user->expose_graph = true;
 
         // generate scores graph image
@@ -91,7 +91,7 @@ 
         // if they haven't done a check-in in the last month this
         // will explode because $checkinss_last_month is an empty
         // array
-        if($checkins_last_month) {
+        if ($checkins_last_month) {
           $graph->create($checkins_last_month, true);
         }
       } else {
@@ -99,12 +99,12 @@ 
         // remove scores graph image
         $graph->destroy();
       }
-      if($this->send_email) {
+      if ($this->send_email) {
         $user->send_email = true;
       } else {
         $user->send_email = false;
       }
-      if($this->send_email) {
+      if ($this->send_email) {
         $user->partner_email1  = $this->partner_email1;
         $user->partner_email2  = $this->partner_email2;
         $user->partner_email3  = $this->partner_email3;

Indentation +3 added lines, -3 removed lines

@@ -53,8 +53,8 @@ 
   }
 
   /**
-     * @codeCoverageIgnore
-     */
+   * @codeCoverageIgnore
+   */
   public function attributeLabels() {
     return [
       'partner_email1' => "Partner Email #1",
@@ -85,7 +85,7 @@ 
 
         // generate scores graph image
         $checkins_last_month = (Yii::$container->get(\common\interfaces\UserBehaviorInterface::class))
-                                               ->getCheckInBreakdown();
+                                                ->getCheckInBreakdown();
 
         // if they haven't done a check-in in the last month this
         // will explode because $checkinss_last_month is an empty

site/tests/unit/models/EditProfileFormTest.php

Indentation +22 added lines, -22 removed lines

@@ -6,22 +6,22 @@ 
 use \site\models\EditProfileForm;
 
 class EditProfileFormTest extends \Codeception\Test\Unit {
-	public $graph;
-	public $values = [
-			'timezone' => 'America/Los_Angeles',
+  public $graph;
+  public $values = [
+      'timezone' => 'America/Los_Angeles',
       'send_email' => true,
-			'partner_email1' => 'partner1@example.com',
-			'partner_email2' => 'partner2@example.com',
-			'partner_email3' => 'partner3@example.com',
-			'expose_graph' => true,
-		];
+      'partner_email1' => 'partner1@example.com',
+      'partner_email2' => 'partner2@example.com',
+      'partner_email3' => 'partner3@example.com',
+      'expose_graph' => true,
+    ];
 
-	public function setUp() {
-		$this->graph = $this->getMockBuilder(common\components\Graph::class)
-			->setMethods(['create', 'destroy'])
-			->getMock();
-		parent::setUp();
-	}
+  public function setUp() {
+    $this->graph = $this->getMockBuilder(common\components\Graph::class)
+      ->setMethods(['create', 'destroy'])
+      ->getMock();
+    parent::setUp();
+  }
 
   public function testLoadUser() {
     $user = $this->getUser();
@@ -51,20 +51,20 @@ 
     $form->attributes = $this->values;
     expect('saveProfile should return the user', $this->assertEquals($user, $form->saveProfile()));
     return true;
-		expect('saveProfile should set the user\'s attributes to be the form values', $this->assertEquals($this->values, $user->attributes));
+    expect('saveProfile should set the user\'s attributes to be the form values', $this->assertEquals($this->values, $user->attributes));
 
     $form->send_email = 'not_a_boolean';
     expect('saveProfile should return the user with the partner-related settings equal to null', $this->assertNull($form->saveProfile()));
 
-		$null_vals = [
-			'partner_email1'  => null,
-			'partner_email2'  => null,
-			'partner_email3'  => null,
+    $null_vals = [
+      'partner_email1'  => null,
+      'partner_email2'  => null,
+      'partner_email3'  => null,
       'send_email'      => null,
-			'timezone'        => 'America/Los_Angeles',
-		];
+      'timezone'        => 'America/Los_Angeles',
+    ];
     $form->send_email = false;
-		$ret = $form->saveProfile();
+    $ret = $form->saveProfile();
     expect('saveProfile should return the user with the partner-related settings equal to null', $this->assertEquals($null_vals, $user->attributes));
 
     $form->send_email = 'not_a_boolean';

Spacing +3 added lines, -3 removed lines

@@ -41,11 +41,11 @@
 
     // Set up dependency injections
     Yii::$container
-      ->set(\common\interfaces\TimeInterface::class, function () { return new \common\components\Time('UTC'); });
+      ->set(\common\interfaces\TimeInterface::class, function() { return new \common\components\Time('UTC'); });
     Yii::$container
-      ->set(\common\components\Graph::class, function () { return $this->graph; });
+      ->set(\common\components\Graph::class, function() { return $this->graph; });
     Yii::$container
-      ->set(\common\interfaces\UserBehaviorInterface::class, function () { return new FakeUserBehavior(); });
+      ->set(\common\interfaces\UserBehaviorInterface::class, function() { return new FakeUserBehavior(); });
 
     // Actually begin testing
     $form->attributes = $this->values;

site/views/profile/index.php

Spacing +2 added lines, -2 removed lines

@@ -70,11 +70,11 @@
 ]); ?>
             <?= $form->field($profile, 'timezone')->dropDownList(array_combine($timezones, $timezones)); ?>
             <?= $form->field($profile, 'expose_graph')->checkbox() ?>
-            <?php if($profile->expose_graph): ?>
+            <?php if ($profile->expose_graph): ?>
             <div class='alert alert-success score-graph-info'>Your score graph can be found at:<br /> <a id="score-graph-link" target="_blank" href="<?=$graph_url?>"><?=$graph_url?></a></div>
             <?php endif; ?>
             <?= $form->field($profile, 'send_email')->checkbox() ?>
-            <div id='send_email_fields' <?php if(!$profile->send_email) { ?>style="display: none;"<?php } ?>>
+            <div id='send_email_fields' <?php if (!$profile->send_email) { ?>style="display: none;"<?php } ?>>
               <?= $form->field($profile, 'partner_email1')->input('email'); ?>
               <?= $form->field($profile, 'partner_email2')->input('email'); ?>
               <?= $form->field($profile, 'partner_email3')->input('email'); ?>

site/models/CheckinForm.php

Spacing +9 added lines, -9 removed lines

@@ -64,10 +64,10 @@ 
   }
 
   public function setBehaviors($behaviors) {
-    foreach($behaviors as $category_id => $category_data) {
+    foreach ($behaviors as $category_id => $category_data) {
       $attribute = "behaviors$category_id";
 			$this->$attribute = [];
-      foreach($category_data['behaviors'] as $behavior) {
+      foreach ($category_data['behaviors'] as $behavior) {
         $this->{$attribute}[] = $behavior['id'];
       }
     }   
@@ -75,8 +75,8 @@ 
 
   public function validateBehaviors($attribute, $params) {
     if (!$this->hasErrors()) {
-      foreach($this->$attribute as $behavior) {
-        if(!is_numeric($behavior)) {
+      foreach ($this->$attribute as $behavior) {
+        if (!is_numeric($behavior)) {
           $this->addError($attribute, 'One of your behaviors is not an integer!');
         }
       }
@@ -110,17 +110,17 @@ 
 
     // delete cached scores
     $time = Yii::$container->get(\common\interfaces\TimeInterface::class);
-    $key = "scores_of_last_month_".Yii::$app->user->id."_".$time->getLocalDate();
+    $key = "scores_of_last_month_" . Yii::$app->user->id . "_" . $time->getLocalDate();
     Yii::$app->cache->delete($key);
   }
 
   public function save() {
-    if(empty($this->compiled_behaviors)) {
+    if (empty($this->compiled_behaviors)) {
       $this->commpiled_behaviors = $this->compileBehaviors();
     }
 
     $rows = [];
-    foreach($this->compiled_behaviors as $behavior_id) {
+    foreach ($this->compiled_behaviors as $behavior_id) {
       $temp = [
         Yii::$app->user->id,
         (int)$behavior_id,
@@ -139,10 +139,10 @@ 
       )->execute();
 
     // if the user has publicised their score graph, create the image
-    if(Yii::$app->user->identity->expose_graph) {
+    if (Yii::$app->user->identity->expose_graph) {
       $checkins_last_month = $this->user_behavior->getCheckInBreakdown();
 
-      if($checkins_last_month) {
+      if ($checkins_last_month) {
         Yii::$container
           ->get(\common\components\Graph::class, [Yii::$app->user->identity])
           ->create($checkins_last_month, true);

site/controllers/CheckinController.php

Spacing +9 added lines, -9 removed lines

@@ -39,7 +39,7 @@ 
     if ($form->load(Yii::$app->request->post()) && $form->validate()) {
       $form->compiled_behaviors = $form->compileBehaviors();
 
-      if(sizeof($form->compiled_behaviors) === 0) {
+      if (sizeof($form->compiled_behaviors) === 0) {
         return $this->redirect(['view']);
       }
 
@@ -49,7 +49,7 @@ 
 
       return $this->redirect(['questions']);
     } else {
-      $behaviors  = Yii::$container->get(BehaviorInterface::class)::$behaviors;
+      $behaviors = Yii::$container->get(BehaviorInterface::class)::$behaviors;
       return $this->render('index', [
         'categories'    => Yii::$container->get(CategoryInterface::class)::$categories,
         'model'         => $form,
@@ -64,7 +64,7 @@ 
     $date = Yii::$container->get(TimeInterface::class)->getLocalDate();
 
     $user_behaviors = $user_behavior->getUserBehaviorsWithCategory($date);
-    if(count($user_behaviors) === 0) {
+    if (count($user_behaviors) === 0) {
       return $this->redirect(['view']);
     }
 
@@ -74,9 +74,9 @@ 
       $form->deleteToday();
 
       $behaviors = $user_behavior->findAll($form->getUserBehaviorIds());
-      if($result = $form->saveAnswers($behaviors)) {
+      if ($result = $form->saveAnswers($behaviors)) {
 
-        if(Yii::$app->user->identity->send_email) {
+        if (Yii::$app->user->identity->send_email) {
           Yii::$app->user->identity->sendEmailReport($date);
           Yii::$app->session->setFlash('success', 'Your check-in is complete. A notification has been sent to your report partners.');
         } else {
@@ -130,7 +130,7 @@ 
     $raw_pie_data  = $user_behavior::decorateWithCategory($user_behavior->getBehaviorsWithCounts());
     $answer_pie    = $user_behavior->getBehaviorsByCategory($raw_pie_data);
 
-    $pie_data   = [
+    $pie_data = [
       "labels"   => array_column($answer_pie, "name"),
       "datasets" => [[
           "data"                 => array_map('intval', array_column($answer_pie, "count")),
@@ -165,14 +165,14 @@ 
     $checkins = $user_behavior->getCheckInBreakdown($period);
 
     $accum = [];
-    foreach($checkins as $date => $cats) {
-      for($i = 1; $i <= 7; $i ++) {
+    foreach ($checkins as $date => $cats) {
+      for ($i = 1; $i <= 7; $i++) {
         $accum[$i][] = array_key_exists($i, $cats) ? $cats[$i]['count'] : [];
       }
     }
 
     $bar_datasets = [];
-    foreach($accum as $idx => $data) {
+    foreach ($accum as $idx => $data) {
       $bar_datasets[] = [
         'label' => ($category::getCategories())[$idx],
         'backgroundColor' => $category::$colors[$idx]['color'],

common/models/UserBehavior.php

Spacing +10 added lines, -10 removed lines

@@ -84,7 +84,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']);
     }
 
@@ -127,12 +127,12 @@ 
 
   public function getCheckinBreakdown(int $period = 30) {
     $datetimes = $this->time->getDateTimesInPeriod($period);
-    $key = "scores_of_last_month_".Yii::$app->user->id."_".$this->time->getLocalDate();
+    $key = "scores_of_last_month_" . Yii::$app->user->id . "_" . $this->time->getLocalDate();
     $scores = Yii::$app->cache->get($key);
 
-    if($scores === false) {
+    if ($scores === false) {
       $scores = [];
-      foreach($datetimes as $datetime) {
+      foreach ($datetimes as $datetime) {
         $behaviors = self::decorateWithCategory($this->getBehaviorsWithCounts($datetime));
         $scores[$datetime->format('Y-m-d')] = $this->getBehaviorsByCategory($behaviors);
       }
@@ -158,7 +158,7 @@ 
   public function getBehaviorsByCategory(array $decorated_behaviors) {
     $arr = array_reduce($decorated_behaviors, function($acc, $row) {
       $cat_id = $row['behavior']['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] = [
@@ -175,10 +175,10 @@ 
   }
 
   public static function decorate(array $uo, $with_category = false) {
-    foreach($uo as &$o) {
-      if($behavior = \common\models\Behavior::getBehavior('id', $o['behavior_id'])) {
+    foreach ($uo as &$o) {
+      if ($behavior = \common\models\Behavior::getBehavior('id', $o['behavior_id'])) {
         $o['behavior'] = $behavior;
-        if($with_category) {
+        if ($with_category) {
           $o['behavior']['category'] = \common\models\Category::getCategory('id', $o['behavior']['category_id']);
         }
       }
@@ -199,11 +199,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);
     }
 

common/models/User.php

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;
@@ -358,7 +358,7 @@ 
   }
 
   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);
 
     $checkins_last_month = $this->user_behavior->getCheckInBreakdown();
@@ -366,12 +366,12 @@ 
       ->get(\common\components\Graph::class)
       ->create($checkins_last_month);
 
-    $user_behaviors   = $this->getUserBehaviors($date);
+    $user_behaviors = $this->getUserBehaviors($date);
     $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,
@@ -383,7 +383,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);
       }
     }
@@ -456,7 +456,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();
   }
 
@@ -464,20 +464,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);
       }
     }
@@ -486,13 +486,13 @@ 
   }
 
   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 getUserBehaviors($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($local_date);
     $behaviors = $this->user_behavior::decorateWithCategory($behaviors);
@@ -500,10 +500,10 @@ 
   }
 
   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'] = [
@@ -521,10 +521,10 @@ 
   }
  
   public function parseBehaviorData($behaviors) {
-    if(!$behaviors) return [];
+    if (!$behaviors) return [];
 
     $opts_by_cat = [];
-    foreach($behaviors as $behavior) {
+    foreach ($behaviors as $behavior) {
       $indx = $behavior['behavior']['category_id'];
 
       $opts_by_cat[$indx]['category_name'] = $behavior['behavior']['category']['name'];
@@ -616,7 +616,7 @@ 
     return rtrim(
       strtr(
         base64_encode(
-          hash('sha256', $this->id."::".$this->created_at, true)
+          hash('sha256', $this->id . "::" . $this->created_at, true)
         ),
       '+/', '-_'),
     '=');

Braces +22 added lines, -7 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;
   }
 
@@ -358,7 +362,10 @@ 
   }
 
   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);
 
     $checkins_last_month = $this->user_behavior->getCheckInBreakdown();
@@ -486,13 +493,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 getUserBehaviors($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($local_date);
     $behaviors = $this->user_behavior::decorateWithCategory($behaviors);
@@ -500,7 +511,9 @@ 
   }
 
   public function parseQuestionData($questions) {
-    if(!$questions) return [];
+    if(!$questions) {
+      return [];
+    }
 
     $question_answers = [];
     foreach($questions as $question) {
@@ -521,7 +534,9 @@ 
   }
  
   public function parseBehaviorData($behaviors) {
-    if(!$behaviors) return [];
+    if(!$behaviors) {
+      return [];
+    }
 
     $opts_by_cat = [];
     foreach($behaviors as $behavior) {