CorWatts / fasterscale

common/components/Time.php

Spacing +12 added lines, -12 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,15 +151,15 @@ 
     $start = new DateTime("now", new DateTimeZone($this->timezone));
     $end   = new DateTime("now", new DateTimeZone($this->timezone));
     $oneday = new \DateInterval('P1D');
-    $end->add($oneday);      // add a day, so the end date gets included in the intervals
+    $end->add($oneday); // add a day, so the end date gets included in the intervals
  
     $start->add(new \DateInterval('PT2M'))  // add two minutes, in case they just did a check-in
           ->sub(new \DateInterval("P${period}D")); // subtract `$period` number of days
-    $end->add(new \DateInterval('PT2M'));   // add two minutes, in case they just did a check-in
+    $end->add(new \DateInterval('PT2M')); // add two minutes, in case they just did a check-in
 
     $periods = new \DatePeriod($start, $oneday, $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/models/User.php

Spacing +29 added lines, -29 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);
       }
     }
@@ -481,7 +481,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();
   }
 
@@ -489,20 +489,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);
       }
     }
@@ -511,13 +511,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 = \common\models\UserBehavior::decorateWithCategory($behaviors);
@@ -525,10 +525,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'] = [
@@ -546,10 +546,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'];
@@ -642,7 +642,7 @@ 
     return rtrim(
       strtr(
         base64_encode(
-          hash('sha256', $this->id."::".$this->created_at, true)
+          hash('sha256', $this->id . "::" . $this->created_at, true)
         ),
       '+/', '-_'),
     '=');

Braces +33 added lines, -10 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)
@@ -511,13 +526,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 = \common\models\UserBehavior::decorateWithCategory($behaviors);
@@ -525,7 +544,9 @@ 
   }
 
   public function parseQuestionData($questions) {
-    if(!$questions) return [];
+    if(!$questions) {
+      return [];
+    }
 
     $question_answers = [];
     foreach($questions as $question) {
@@ -546,7 +567,9 @@ 
   }
  
   public function parseBehaviorData($behaviors) {
-    if(!$behaviors) return [];
+    if(!$behaviors) {
+      return [];
+    }
 
     $opts_by_cat = [];
     foreach($behaviors as $behavior) {

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 = "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::decorateWithCategory($this->getBehaviorsWithCounts($datetime));
         $checkins[$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']);
         }
       }
@@ -204,11 +204,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/tests/unit/components/TimeTest.php

Spacing +10 added lines, -10 removed lines

@@ -24,7 +24,7 @@ 
       $this->container->set('common\interfaces\UserBehaviorInterface', '\site\tests\_support\MockUserBehavior');
       $this->container->set('common\interfaces\QuestionInterface', '\site\tests\_support\MockQuestion');
 
-      $this->container->set('common\interfaces\TimeInterface', function () {
+      $this->container->set('common\interfaces\TimeInterface', function() {
         return new \common\components\Time('America/Los_Angeles');
       });
 
@@ -47,7 +47,7 @@ 
 
     public function testGetLocalTime()
     {
-      $this->specify('getLocalTime should function correctly', function () {
+      $this->specify('getLocalTime should function correctly', function() {
         expect("getLocalTime should work with user's set time", $this->assertEquals($this->time->getLocalTime(), (new DateTime("now", new DateTimeZone("America/Los_Angeles")))->format("Y-m-d H:i:s")));
         expect('getLocalTime should work with a custom timezone', $this->assertEquals($this->time->getLocalTime("UTC"), (new DateTime("now"))->format("Y-m-d H:i:s")));
       });
@@ -55,13 +55,13 @@ 
 
     public function testConvertLocalToUTC()
     {
-      $this->specify('convertLocalToUTC should function correctly', function () {
+      $this->specify('convertLocalToUTC should function correctly', function() {
         $la_tz = (new DateTime("now", new DateTimeZone("America/Los_Angeles")))->format("Y-m-d H:i:s");
 
         expect('convertLocalToUTC should convert a Los Angeles tz to UTC with the included time', $this->assertEquals($this->time->convertLocalToUTC($la_tz), (new DateTime("now"))->format("Y-m-d H:i:s")));
         expect('convertLocalToUTC should convert a Los Angeles tz to UTC without the included time', $this->assertEquals($this->time->convertLocalToUTC($la_tz, false), (new DateTime("now"))->format("Y-m-d")));
         // with UTC
-        $this->container->set('common\interfaces\TimeInterface', function () {
+        $this->container->set('common\interfaces\TimeInterface', function() {
           return new \common\components\Time('UTC');
         });
         $time = $this->container->get('common\interfaces\TimeInterface');
@@ -74,14 +74,14 @@ 
 
     public function testConvertUTCToLocal()
     {
-      $this->specify('convertUTCToLocal should function correctly', function () {
+      $this->specify('convertUTCToLocal should function correctly', function() {
         $utc_tz = (new DateTime("now"))->format("Y-m-d H:i:s");
 
         expect('convertUTCToLocal should convert a UTC tz to Los Angeles with the included timezone', $this->assertEquals((new DateTime("now", new DateTimeZone("America/Los_Angeles")))->format(DateTime::ATOM), $this->time->convertUTCToLocal($utc_tz)));
         expect('convertUTCToLocal should convert a UTC tz to Los Angeles without the included timezone', $this->assertEquals($this->time->convertUTCToLocal($utc_tz, false), (new DateTime("now", new DateTimeZone("America/Los_Angeles")))->format("Y-m-d H:i:s")));
 
         // with UTC
-        $this->container->set('common\interfaces\TimeInterface', function () {
+        $this->container->set('common\interfaces\TimeInterface', function() {
           return new \common\components\Time('UTC');
         });
         $time = $this->container->get('common\interfaces\TimeInterface');
@@ -94,7 +94,7 @@ 
 
     public function testGetLocalDate()
     {
-      $this->specify('getLocalDate should function correctly', function () {
+      $this->specify('getLocalDate should function correctly', function() {
         expect("getLocalDate should correctly get the user's local date", $this->assertEquals($this->time->getLocalDate(), (new DateTime("now", new DateTimeZone("America/Los_Angeles")))->format("Y-m-d")));
         expect("getLocalDate should correctly get the local date of a specified timezone", $this->assertEquals($this->time->getLocalDate("UTC"), (new DateTime("now", new DateTimeZone("UTC")))->format("Y-m-d")));
       });
@@ -116,7 +116,7 @@ 
         expect('getUTCBookends should return false if there is a space at the end of the time string', $this->assertFalse($this->time->getUTCBookends('2016-05-30 00:00:00 ')));
         expect('getUTCBookends should return UTC bookend times from the Los_Angeles tz', $this->assertEquals($this->time->getUTCBookends('2016-05-30'), ['2016-05-30 07:00:00', '2016-05-31 06:59:59']));
         // with UTC
-        $this->container->set('common\interfaces\TimeInterface', function () {
+        $this->container->set('common\interfaces\TimeInterface', function() {
           return new \common\components\Time('UTC');
         });
         $time = $this->container->get('common\interfaces\TimeInterface');
@@ -203,11 +203,11 @@ 
       $tz = 'America/Los_Angeles';
       $this->time->timezone = 'America/Los_Angeles';
 
-      $today =  new \DateTime("now + 1 day", new \DateTimeZone($tz)); // we do an extra day to include today as the last day
+      $today = new \DateTime("now + 1 day", new \DateTimeZone($tz)); // we do an extra day to include today as the last day
       $should_be_today = $this->time->getDateTimesInPeriod()->getEndDate();
       expect('getDateTimesInPeriod should return a list of \DatePeriods, the last being for today', $this->assertEquals($today->format('Y-m-d H'), $should_be_today->format('Y-m-d H')));
 
-      $start =  new \DateTime("30 days ago", new \DateTimeZone($tz));
+      $start = new \DateTime("30 days ago", new \DateTimeZone($tz));
       $should_be_start = $this->time->getDateTimesInPeriod()->getStartDate();
       expect('getDateTimesInPeriod should return a list of \DatePeriods, the first being for 30 days ago (by default)', $this->assertEquals($start->format('Y-m-d H'), $should_be_start->format('Y-m-d H')));
     }

common/tests/unit/models/UserTest.php

Indentation +624 added lines, -624 removed lines

@@ -19,640 +19,640 @@
   private $time;
   private $question;
 
-	public $questionData = [
-	[
-		'id' => 641,
-		'user_id' => 2,
-		'behavior_id' => 13,
-		'user_behavior_id' => 821,
-		'question' => 1,
-		'answer' => 'alsgn',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 13,
-			'name' => 'less time/energy for God, meetings, and church',
-			'category_id' => 2,
-		],
-	],
-	[
-		'id' => 642,
-		'user_id' => 2,
-		'behavior_id' => 13,
-		'user_behavior_id' => 821,
-		'question' => 2,
-		'answer' => 'loiun',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 13,
-			'name' => 'less time/energy for God, meetings, and church',
-			'category_id' => 2,
-		],
-	],
-	[
-		'id' => 643,
-		'user_id' => 2,
-		'behavior_id' => 13,
-		'user_behavior_id' => 821,
-		'question' => 3,
-		'answer' => 'liun',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 13,
-			'name' => 'less time/energy for God, meetings, and church',
-			'category_id' => 2,
-		],
-	],
-	[
-		'id' => 644,
-		'user_id' => 2,
-		'behavior_id' => 29,
-		'user_behavior_id' => 823,
-		'question' => 1,
-		'answer' => 'ljnb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 29,
-			'name' => 'using profanity',
-			'category_id' => 3,
-		],
-	],
-	[
-		'id' => 645,
-		'user_id' => 2,
-		'behavior_id' => 29,
-		'user_behavior_id' => 823,
-		'question' => 2,
-		'answer' => 'liunb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 29,
-			'name' => 'using profanity',
-			'category_id' => 3,
-		],
-	],
-	[
-		'id' => 646,
-		'user_id' => 2,
-		'behavior_id' => 29,
-		'user_behavior_id' => 823,
-		'question' => 3,
-		'answer' => 'ilub ',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 29,
-			'name' => 'using profanity',
-			'category_id' => 3,
-		],
-	],
-	[
-		'id' => 647,
-		'user_id' => 2,
-		'behavior_id' => 48,
-		'user_behavior_id' => 825,
-		'question' => 1,
-		'answer' => 'liub',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 48,
-			'name' => 'workaholic',
-			'category_id' => 4,
-		],
-	],
-	[
-		'id' => 648,
-		'user_id' => 2,
-		'behavior_id' => 48,
-		'user_behavior_id' => 825,
-		'question' => 2,
-		'answer' => 'liub',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 48,
-			'name' => 'workaholic',
-			'category_id' => 4,
-		],
-	],
-	[
-		'id' => 649,
-		'user_id' => 2,
-		'behavior_id' => 48,
-		'user_behavior_id' => 825,
-		'question' => 3,
-		'answer' => 'liub ',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 48,
-			'name' => 'workaholic',
-			'category_id' => 4,
-		],
-	],
-	[
-		'id' => 650,
-		'user_id' => 2,
-		'behavior_id' => 89,
-		'user_behavior_id' => 828,
-		'question' => 1,
-		'answer' => 'liub',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 89,
-			'name' => 'obsessive (stuck) thoughts',
-			'category_id' => 5,
-		],
-	],
-	[
-		'id' => 651,
-		'user_id' => 2,
-		'behavior_id' => 89,
-		'user_behavior_id' => 828,
-		'question' => 2,
-		'answer' => 'liuby',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 89,
-			'name' => 'obsessive (stuck) thoughts',
-			'category_id' => 5,
-		],
-	],
-	[
-		'id' => 652,
-		'user_id' => 2,
-		'behavior_id' => 89,
-		'user_behavior_id' => 828,
-		'question' => 3,
-		'answer' => 'uiylb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 89,
-			'name' => 'obsessive (stuck) thoughts',
-			'category_id' => 5,
-		],
-	],
-	[
-		'id' => 653,
-		'user_id' => 2,
-		'behavior_id' => 111,
-		'user_behavior_id' => 829,
-		'question' => 1,
-		'answer' => 'liub',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 111,
-			'name' => 'seeking out old unhealthy people and places',
-			'category_id' => 6,
-		],
-	],
-	[
-		'id' => 654,
-		'user_id' => 2,
-		'behavior_id' => 111,
-		'user_behavior_id' => 829,
-		'question' => 2,
-		'answer' => 'liuyb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 111,
-			'name' => 'seeking out old unhealthy people and places',
-			'category_id' => 6,
-		],
-	],
-	[
-		'id' => 655,
-		'user_id' => 2,
-		'behavior_id' => 111,
-		'user_behavior_id' => 829,
-		'question' => 3,
-		'answer' => 'iuyb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 111,
-			'name' => 'seeking out old unhealthy people and places',
-			'category_id' => 6,
-		],
-	],
-	[
-		'id' => 656,
-		'user_id' => 2,
-		'behavior_id' => 122,
-		'user_behavior_id' => 831,
-		'question' => 1,
-		'answer' => 'iuyb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 122,
-			'name' => 'returning to the place you swore you would never go again',
-			'category_id' => 7,
-		],
-	],
-	[
-		'id' => 657,
-		'user_id' => 2,
-		'behavior_id' => 122,
-		'user_behavior_id' => 831,
-		'question' => 2,
-		'answer' => 'iuyb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 122,
-			'name' => 'returning to the place you swore you would never go again',
-			'category_id' => 7,
-		],
-	],
-	[
-		'id' => 658,
-		'user_id' => 2,
-		'behavior_id' => 122,
-		'user_behavior_id' => 831,
-		'question' => 3,
-		'answer' => 'liuyb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 122,
-			'name' => 'returning to the place you swore you would never go again',
-			'category_id' => 7,
-		],
-	],
+  public $questionData = [
+  [
+    'id' => 641,
+    'user_id' => 2,
+    'behavior_id' => 13,
+    'user_behavior_id' => 821,
+    'question' => 1,
+    'answer' => 'alsgn',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 13,
+      'name' => 'less time/energy for God, meetings, and church',
+      'category_id' => 2,
+    ],
+  ],
+  [
+    'id' => 642,
+    'user_id' => 2,
+    'behavior_id' => 13,
+    'user_behavior_id' => 821,
+    'question' => 2,
+    'answer' => 'loiun',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 13,
+      'name' => 'less time/energy for God, meetings, and church',
+      'category_id' => 2,
+    ],
+  ],
+  [
+    'id' => 643,
+    'user_id' => 2,
+    'behavior_id' => 13,
+    'user_behavior_id' => 821,
+    'question' => 3,
+    'answer' => 'liun',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 13,
+      'name' => 'less time/energy for God, meetings, and church',
+      'category_id' => 2,
+    ],
+  ],
+  [
+    'id' => 644,
+    'user_id' => 2,
+    'behavior_id' => 29,
+    'user_behavior_id' => 823,
+    'question' => 1,
+    'answer' => 'ljnb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 29,
+      'name' => 'using profanity',
+      'category_id' => 3,
+    ],
+  ],
+  [
+    'id' => 645,
+    'user_id' => 2,
+    'behavior_id' => 29,
+    'user_behavior_id' => 823,
+    'question' => 2,
+    'answer' => 'liunb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 29,
+      'name' => 'using profanity',
+      'category_id' => 3,
+    ],
+  ],
+  [
+    'id' => 646,
+    'user_id' => 2,
+    'behavior_id' => 29,
+    'user_behavior_id' => 823,
+    'question' => 3,
+    'answer' => 'ilub ',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 29,
+      'name' => 'using profanity',
+      'category_id' => 3,
+    ],
+  ],
+  [
+    'id' => 647,
+    'user_id' => 2,
+    'behavior_id' => 48,
+    'user_behavior_id' => 825,
+    'question' => 1,
+    'answer' => 'liub',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 48,
+      'name' => 'workaholic',
+      'category_id' => 4,
+    ],
+  ],
+  [
+    'id' => 648,
+    'user_id' => 2,
+    'behavior_id' => 48,
+    'user_behavior_id' => 825,
+    'question' => 2,
+    'answer' => 'liub',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 48,
+      'name' => 'workaholic',
+      'category_id' => 4,
+    ],
+  ],
+  [
+    'id' => 649,
+    'user_id' => 2,
+    'behavior_id' => 48,
+    'user_behavior_id' => 825,
+    'question' => 3,
+    'answer' => 'liub ',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 48,
+      'name' => 'workaholic',
+      'category_id' => 4,
+    ],
+  ],
+  [
+    'id' => 650,
+    'user_id' => 2,
+    'behavior_id' => 89,
+    'user_behavior_id' => 828,
+    'question' => 1,
+    'answer' => 'liub',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 89,
+      'name' => 'obsessive (stuck) thoughts',
+      'category_id' => 5,
+    ],
+  ],
+  [
+    'id' => 651,
+    'user_id' => 2,
+    'behavior_id' => 89,
+    'user_behavior_id' => 828,
+    'question' => 2,
+    'answer' => 'liuby',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 89,
+      'name' => 'obsessive (stuck) thoughts',
+      'category_id' => 5,
+    ],
+  ],
+  [
+    'id' => 652,
+    'user_id' => 2,
+    'behavior_id' => 89,
+    'user_behavior_id' => 828,
+    'question' => 3,
+    'answer' => 'uiylb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 89,
+      'name' => 'obsessive (stuck) thoughts',
+      'category_id' => 5,
+    ],
+  ],
+  [
+    'id' => 653,
+    'user_id' => 2,
+    'behavior_id' => 111,
+    'user_behavior_id' => 829,
+    'question' => 1,
+    'answer' => 'liub',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 111,
+      'name' => 'seeking out old unhealthy people and places',
+      'category_id' => 6,
+    ],
+  ],
+  [
+    'id' => 654,
+    'user_id' => 2,
+    'behavior_id' => 111,
+    'user_behavior_id' => 829,
+    'question' => 2,
+    'answer' => 'liuyb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 111,
+      'name' => 'seeking out old unhealthy people and places',
+      'category_id' => 6,
+    ],
+  ],
+  [
+    'id' => 655,
+    'user_id' => 2,
+    'behavior_id' => 111,
+    'user_behavior_id' => 829,
+    'question' => 3,
+    'answer' => 'iuyb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 111,
+      'name' => 'seeking out old unhealthy people and places',
+      'category_id' => 6,
+    ],
+  ],
+  [
+    'id' => 656,
+    'user_id' => 2,
+    'behavior_id' => 122,
+    'user_behavior_id' => 831,
+    'question' => 1,
+    'answer' => 'iuyb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 122,
+      'name' => 'returning to the place you swore you would never go again',
+      'category_id' => 7,
+    ],
+  ],
+  [
+    'id' => 657,
+    'user_id' => 2,
+    'behavior_id' => 122,
+    'user_behavior_id' => 831,
+    'question' => 2,
+    'answer' => 'iuyb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 122,
+      'name' => 'returning to the place you swore you would never go again',
+      'category_id' => 7,
+    ],
+  ],
+  [
+    'id' => 658,
+    'user_id' => 2,
+    'behavior_id' => 122,
+    'user_behavior_id' => 831,
+    'question' => 3,
+    'answer' => 'liuyb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 122,
+      'name' => 'returning to the place you swore you would never go again',
+      'category_id' => 7,
+    ],
+  ],
 ];
 public $userQuestions = [
-	13 => [
-		'question' => [
-			'id' => 13,
-			'title' => 'less time/energy for God, meetings, and church',
-		],
-		'answers' => [
-			[
-				'title' => 'How does it affect me? How do I act and feel?',
-				'answer' => 'alsgn',
-			], [
-				'title' => 'How does it affect the important people in my life?',
-				'answer' => 'loiun',
-			], [
-				'title' => 'Why do I do this? What is the benefit for me?',
-				'answer' => 'liun',
-			],
-		],
-	],
-	29 => [
-		'question' => [
-			'id' => 29,
-			'title' => 'using profanity',
-		],
-		'answers' => [
-			[
-				'title' => 'How does it affect me? How do I act and feel?',
-				'answer' => 'ljnb',
-			], [
-				'title' => 'How does it affect the important people in my life?',
-				'answer' => 'liunb',
-			], [
-				'title' => 'Why do I do this? What is the benefit for me?',
-				'answer' => 'ilub ',
-			],
-		],
-	],
-	48 => [
-		'question' => [
-			'id' => 48,
-			'title' => 'workaholic',
-		],
-		'answers' => [
-			[
-				'title' => 'How does it affect me? How do I act and feel?',
-				'answer' => 'liub',
-			], [
-				'title' => 'How does it affect the important people in my life?',
-				'answer' => 'liub',
-			], [
-				'title' => 'Why do I do this? What is the benefit for me?',
-				'answer' => 'liub ',
-			],
-		],
-	],
-	89 => [
-		'question' => [
-			'id' => 89,
-			'title' => 'obsessive (stuck) thoughts',
-		],
-		'answers' => [
-			[
-				'title' => 'How does it affect me? How do I act and feel?',
-				'answer' => 'liub',
-			], [
-				'title' => 'How does it affect the important people in my life?',
-				'answer' => 'liuby',
-			], [
-				'title' => 'Why do I do this? What is the benefit for me?',
-				'answer' => 'uiylb',
-			],
-		],
-	],
-	111 => [
-		'question' => [
-			'id' => 111,
-			'title' => 'seeking out old unhealthy people and places',
-		],
-		'answers' => [
-			[
-				'title' => 'How does it affect me? How do I act and feel?',
-				'answer' => 'liub',
-			], [
-				'title' => 'How does it affect the important people in my life?',
-				'answer' => 'liuyb',
-			], [
-				'title' => 'Why do I do this? What is the benefit for me?',
-				'answer' => 'iuyb',
-			],
-		],
-	],
-	122 => [
-		'question' => [
-			'id' => 122,
-			'title' => 'returning to the place you swore you would never go again',
-		],
-		'answers' => [
-			[
-				'title' => 'How does it affect me? How do I act and feel?',
-				'answer' => 'iuyb',
-			], [
-				'title' => 'How does it affect the important people in my life?',
-				'answer' => 'iuyb',
-			], [
-				'title' => 'Why do I do this? What is the benefit for me?',
-				'answer' => 'liuyb',
-			],
-		],
-	],
+  13 => [
+    'question' => [
+      'id' => 13,
+      'title' => 'less time/energy for God, meetings, and church',
+    ],
+    'answers' => [
+      [
+        'title' => 'How does it affect me? How do I act and feel?',
+        'answer' => 'alsgn',
+      ], [
+        'title' => 'How does it affect the important people in my life?',
+        'answer' => 'loiun',
+      ], [
+        'title' => 'Why do I do this? What is the benefit for me?',
+        'answer' => 'liun',
+      ],
+    ],
+  ],
+  29 => [
+    'question' => [
+      'id' => 29,
+      'title' => 'using profanity',
+    ],
+    'answers' => [
+      [
+        'title' => 'How does it affect me? How do I act and feel?',
+        'answer' => 'ljnb',
+      ], [
+        'title' => 'How does it affect the important people in my life?',
+        'answer' => 'liunb',
+      ], [
+        'title' => 'Why do I do this? What is the benefit for me?',
+        'answer' => 'ilub ',
+      ],
+    ],
+  ],
+  48 => [
+    'question' => [
+      'id' => 48,
+      'title' => 'workaholic',
+    ],
+    'answers' => [
+      [
+        'title' => 'How does it affect me? How do I act and feel?',
+        'answer' => 'liub',
+      ], [
+        'title' => 'How does it affect the important people in my life?',
+        'answer' => 'liub',
+      ], [
+        'title' => 'Why do I do this? What is the benefit for me?',
+        'answer' => 'liub ',
+      ],
+    ],
+  ],
+  89 => [
+    'question' => [
+      'id' => 89,
+      'title' => 'obsessive (stuck) thoughts',
+    ],
+    'answers' => [
+      [
+        'title' => 'How does it affect me? How do I act and feel?',
+        'answer' => 'liub',
+      ], [
+        'title' => 'How does it affect the important people in my life?',
+        'answer' => 'liuby',
+      ], [
+        'title' => 'Why do I do this? What is the benefit for me?',
+        'answer' => 'uiylb',
+      ],
+    ],
+  ],
+  111 => [
+    'question' => [
+      'id' => 111,
+      'title' => 'seeking out old unhealthy people and places',
+    ],
+    'answers' => [
+      [
+        'title' => 'How does it affect me? How do I act and feel?',
+        'answer' => 'liub',
+      ], [
+        'title' => 'How does it affect the important people in my life?',
+        'answer' => 'liuyb',
+      ], [
+        'title' => 'Why do I do this? What is the benefit for me?',
+        'answer' => 'iuyb',
+      ],
+    ],
+  ],
+  122 => [
+    'question' => [
+      'id' => 122,
+      'title' => 'returning to the place you swore you would never go again',
+    ],
+    'answers' => [
+      [
+        'title' => 'How does it affect me? How do I act and feel?',
+        'answer' => 'iuyb',
+      ], [
+        'title' => 'How does it affect the important people in my life?',
+        'answer' => 'iuyb',
+      ], [
+        'title' => 'Why do I do this? What is the benefit for me?',
+        'answer' => 'liuyb',
+      ],
+    ],
+  ],
 ];
 
 public $behaviorData = [
-	[
-		'id' => 820,
-		'user_id' => 2,
-		'behavior_id' => 7,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 7,
-			'name' => 'making eye contact',
-			'category_id' => 1,
-			'category' => [
-				'id' => 1,
-				'name' => 'Restoration',
-			],
-		],
-	], [
-		'id' => 821,
-		'user_id' => 2,
-		'behavior_id' => 13,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 13,
-			'name' => 'less time/energy for God, meetings, and church',
-			'category_id' => 2,
-			'category' => [
-				'id' => 2,
-				'name' => 'Forgetting Priorities',
-			],
-		],
-	], [
-		'id' => 822,
-		'user_id' => 2,
-		'behavior_id' => 18,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 18,
-			'name' => 'changes in goals',
-			'category_id' => 2,
-			'category' => [
-				'id' => 2,
-				'name' => 'Forgetting Priorities',
-			],
-		],
-	], [
-		'id' => 823,
-		'user_id' => 2,
-		'behavior_id' => 29,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 29,
-			'name' => 'using profanity',
-			'category_id' => 3,
-			'category' => [
-				'id' => 3,
-				'name' => 'Anxiety',
-			],
-		],
-	], [
-		'id' => 824,
-		'user_id' => 2,
-		'behavior_id' => 41,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 41,
-			'name' => 'co-dependent rescuing',
-			'category_id' => 3,
-			'category' => [
-				'id' => 3,
-				'name' => 'Anxiety',
-			],
-		],
-	], [
-		'id' => 825,
-		'user_id' => 2,
-		'behavior_id' => 48,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 48,
-			'name' => 'workaholic',
-			'category_id' => 4,
-			'category' => [
-				'id' => 4,
-				'name' => 'Speeding Up',
-			],
-		],
-	], [
-		'id' => 826,
-		'user_id' => 2,
-		'behavior_id' => 72,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 72,
-			'name' => 'black and white, all or nothing thinking',
-			'category_id' => 5,
-			'category' => [
-				'id' => 5,
-				'name' => 'Ticked Off',
-			],
-		],
-	], [
-		'id' => 827,
-		'user_id' => 2,
-		'behavior_id' => 79,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 79,
-			'name' => 'blaming',
-			'category_id' => 5,
-			'category' => [
-				'id' => 5,
-				'name' => 'Ticked Off',
-			],
-		],
-	], [
-		'id' => 828,
-		'user_id' => 2,
-		'behavior_id' => 89,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 89,
-			'name' => 'obsessive (stuck) thoughts',
-			'category_id' => 5,
-			'category' => [
-				'id' => 5,
-				'name' => 'Ticked Off',
-			],
-		],
-	], [
-		'id' => 829,
-		'user_id' => 2,
-		'behavior_id' => 111,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 111,
-			'name' => 'seeking out old unhealthy people and places',
-			'category_id' => 6,
-			'category' => [
-				'id' => 6,
-				'name' => 'Exhausted',
-			],
-		],
-	], [
-		'id' => 830,
-		'user_id' => 2,
-		'behavior_id' => 118,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 118,
-			'name' => 'not returning phone calls',
-			'category_id' => 6,
-			'category' => [
-				'id' => 6,
-				'name' => 'Exhausted',
-			],
-		],
-	], [
-		'id' => 831,
-		'user_id' => 2,
-		'behavior_id' => 122,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 122,
-			'name' => 'returning to the place you swore you would never go again',
-			'category_id' => 7,
-			'category' => [
-				'id' => 7,
-				'name' => 'Relapse/Moral Failure',
-			],
-		],
-	],
+  [
+    'id' => 820,
+    'user_id' => 2,
+    'behavior_id' => 7,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 7,
+      'name' => 'making eye contact',
+      'category_id' => 1,
+      'category' => [
+        'id' => 1,
+        'name' => 'Restoration',
+      ],
+    ],
+  ], [
+    'id' => 821,
+    'user_id' => 2,
+    'behavior_id' => 13,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 13,
+      'name' => 'less time/energy for God, meetings, and church',
+      'category_id' => 2,
+      'category' => [
+        'id' => 2,
+        'name' => 'Forgetting Priorities',
+      ],
+    ],
+  ], [
+    'id' => 822,
+    'user_id' => 2,
+    'behavior_id' => 18,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 18,
+      'name' => 'changes in goals',
+      'category_id' => 2,
+      'category' => [
+        'id' => 2,
+        'name' => 'Forgetting Priorities',
+      ],
+    ],
+  ], [
+    'id' => 823,
+    'user_id' => 2,
+    'behavior_id' => 29,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 29,
+      'name' => 'using profanity',
+      'category_id' => 3,
+      'category' => [
+        'id' => 3,
+        'name' => 'Anxiety',
+      ],
+    ],
+  ], [
+    'id' => 824,
+    'user_id' => 2,
+    'behavior_id' => 41,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 41,
+      'name' => 'co-dependent rescuing',
+      'category_id' => 3,
+      'category' => [
+        'id' => 3,
+        'name' => 'Anxiety',
+      ],
+    ],
+  ], [
+    'id' => 825,
+    'user_id' => 2,
+    'behavior_id' => 48,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 48,
+      'name' => 'workaholic',
+      'category_id' => 4,
+      'category' => [
+        'id' => 4,
+        'name' => 'Speeding Up',
+      ],
+    ],
+  ], [
+    'id' => 826,
+    'user_id' => 2,
+    'behavior_id' => 72,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 72,
+      'name' => 'black and white, all or nothing thinking',
+      'category_id' => 5,
+      'category' => [
+        'id' => 5,
+        'name' => 'Ticked Off',
+      ],
+    ],
+  ], [
+    'id' => 827,
+    'user_id' => 2,
+    'behavior_id' => 79,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 79,
+      'name' => 'blaming',
+      'category_id' => 5,
+      'category' => [
+        'id' => 5,
+        'name' => 'Ticked Off',
+      ],
+    ],
+  ], [
+    'id' => 828,
+    'user_id' => 2,
+    'behavior_id' => 89,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 89,
+      'name' => 'obsessive (stuck) thoughts',
+      'category_id' => 5,
+      'category' => [
+        'id' => 5,
+        'name' => 'Ticked Off',
+      ],
+    ],
+  ], [
+    'id' => 829,
+    'user_id' => 2,
+    'behavior_id' => 111,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 111,
+      'name' => 'seeking out old unhealthy people and places',
+      'category_id' => 6,
+      'category' => [
+        'id' => 6,
+        'name' => 'Exhausted',
+      ],
+    ],
+  ], [
+    'id' => 830,
+    'user_id' => 2,
+    'behavior_id' => 118,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 118,
+      'name' => 'not returning phone calls',
+      'category_id' => 6,
+      'category' => [
+        'id' => 6,
+        'name' => 'Exhausted',
+      ],
+    ],
+  ], [
+    'id' => 831,
+    'user_id' => 2,
+    'behavior_id' => 122,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 122,
+      'name' => 'returning to the place you swore you would never go again',
+      'category_id' => 7,
+      'category' => [
+        'id' => 7,
+        'name' => 'Relapse/Moral Failure',
+      ],
+    ],
+  ],
 ];
 
 public $userBehaviors = [
-	1 => [
-		'category_name' => 'Restoration',
-		'behaviors' => [
-			[
-				'id' => 7,
-				'name' => 'making eye contact',
-			],
-		],
-	],
-	2 => [
-		'category_name' => 'Forgetting Priorities',
-		'behaviors' => [
-			[
-				'id' => 13,
-				'name' => 'less time/energy for God, meetings, and church',
-			], [
-				'id' => 18,
-				'name' => 'changes in goals',
-			],
-		],
+  1 => [
+    'category_name' => 'Restoration',
+    'behaviors' => [
+      [
+        'id' => 7,
+        'name' => 'making eye contact',
+      ],
+    ],
+  ],
+  2 => [
+    'category_name' => 'Forgetting Priorities',
+    'behaviors' => [
+      [
+        'id' => 13,
+        'name' => 'less time/energy for God, meetings, and church',
+      ], [
+        'id' => 18,
+        'name' => 'changes in goals',
+      ],
+    ],
   ],
   3 => [
-		'category_name' => 'Anxiety',
-		'behaviors' => [
-			[
-				'id' => 29,
-				'name' => 'using profanity',
-			], [
-				'id' => 41,
-				'name' => 'co-dependent rescuing',
-			],
-		],
-	],
-	4 => [
-		'category_name' => 'Speeding Up',
-		'behaviors' => [
-			[
-				'id' => 48,
-				'name' => 'workaholic',
-			],
-		],
-	],
-	5 => [
-		'category_name' => 'Ticked Off',
-		'behaviors' => [
-			[
-				'id' => 72,
-				'name' => 'black and white, all or nothing thinking',
-			], [
-				'id' => 79,
-				'name' => 'blaming',
-			], [
-				'id' => 89,
-				'name' => 'obsessive (stuck) thoughts',
-			],
-		],
-	],
-	6 => [
-		'category_name' => 'Exhausted',
-		'behaviors' => [
-			[
-				'id' => 111,
-				'name' => 'seeking out old unhealthy people and places',
-			], [
-				'id' => 118,
-				'name' => 'not returning phone calls',
-			],
-		],
-	],
-	7 => [
-		'category_name' => 'Relapse/Moral Failure',
-		'behaviors' => [
-			[
-				'id' => 122,
-				'name' => 'returning to the place you swore you would never go again',
-			],
-		],
-	],
+    'category_name' => 'Anxiety',
+    'behaviors' => [
+      [
+        'id' => 29,
+        'name' => 'using profanity',
+      ], [
+        'id' => 41,
+        'name' => 'co-dependent rescuing',
+      ],
+    ],
+  ],
+  4 => [
+    'category_name' => 'Speeding Up',
+    'behaviors' => [
+      [
+        'id' => 48,
+        'name' => 'workaholic',
+      ],
+    ],
+  ],
+  5 => [
+    'category_name' => 'Ticked Off',
+    'behaviors' => [
+      [
+        'id' => 72,
+        'name' => 'black and white, all or nothing thinking',
+      ], [
+        'id' => 79,
+        'name' => 'blaming',
+      ], [
+        'id' => 89,
+        'name' => 'obsessive (stuck) thoughts',
+      ],
+    ],
+  ],
+  6 => [
+    'category_name' => 'Exhausted',
+    'behaviors' => [
+      [
+        'id' => 111,
+        'name' => 'seeking out old unhealthy people and places',
+      ], [
+        'id' => 118,
+        'name' => 'not returning phone calls',
+      ],
+    ],
+  ],
+  7 => [
+    'category_name' => 'Relapse/Moral Failure',
+    'behaviors' => [
+      [
+        'id' => 122,
+        'name' => 'returning to the place you swore you would never go again',
+      ],
+    ],
+  ],
 ];
 
 public $exportData = [

Spacing +6 added lines, -6 removed lines

@@ -727,7 +727,7 @@ 
     $this->container = new \yii\di\Container;
     $this->container->set('common\interfaces\UserInterface', '\site\tests\_support\MockUser');
     $this->container->set('common\interfaces\UserBehaviorInterface', '\site\tests\_support\MockUserBehavior');
-    $this->container->set('common\interfaces\TimeInterface', function () {
+    $this->container->set('common\interfaces\TimeInterface', function() {
       return new \common\components\Time('America/Los_Angeles');
     });
 
@@ -773,21 +773,21 @@ 
   }
 
   public function testParseQuestionData() {
-    $this->specify('parseQuestionData should function correctly', function () {
+    $this->specify('parseQuestionData should function correctly', function() {
       expect('parseQuestionData should return the correct structure with expected data', $this->assertEquals($this->user->parseQuestionData($this->questionData), $this->userQuestions));
       expect('parseQuestionData should return empty with the empty set', $this->assertEmpty($this->user->parseQuestionData([])));
     });
   }
 
   public function testParseBehaviorData() {
-    $this->specify('parseBehaviorData should function correctly', function () {
+    $this->specify('parseBehaviorData should function correctly', function() {
       expect('parseBehaviorData should return the correct structure with expected data', $this->assertEquals($this->user->parseBehaviorData($this->behaviorData), $this->userBehaviors));
       expect('parseBehaviorData should return empty with the empty set', $this->assertEmpty($this->user->parseBehaviorData([])));
     });
   }
 
   public function testIsTokenCurrent() {
-    $this->specify('isTokenCurrent should function correctly', function () {
+    $this->specify('isTokenCurrent should function correctly', function() {
       $good_token = \Yii::$app
                       ->getSecurity()
                       ->generateRandomString() . '_' . time();
@@ -821,7 +821,7 @@ 
   public function testConfirmVerifyEmailToken() {
     $this->user->verify_email_token = 'hello_world';
     $this->user->confirmVerifyEmailToken();
-    expect('confirmVerifyEmailToken should append User::CONFIRMED_STRING to the end of the verify_email_token property', $this->assertEquals($this->user->verify_email_token, 'hello_world'.$this->user::CONFIRMED_STRING));
+    expect('confirmVerifyEmailToken should append User::CONFIRMED_STRING to the end of the verify_email_token property', $this->assertEquals($this->user->verify_email_token, 'hello_world' . $this->user::CONFIRMED_STRING));
   }
 
   public function testIsVerified() {
@@ -915,7 +915,7 @@ 
       ->disableOriginalConstructor()
       ->setMethods(['save', 'attributes', 'getCheckinBreakdown'])
       ->getMock();
-    $expected = require(__DIR__.'/../data/expected_getCheckinBreakdown.php');
+    $expected = require(__DIR__ . '/../data/expected_getCheckinBreakdown.php');
     $user_behavior->method('getCheckinBreakdown')->willReturn($expected);
 
     $user = $this->getMockBuilder('\common\models\User')

site/views/site/signup.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
 				'id' => 'form-signup',
 				'enableClientValidation' => true,
         'enableAjaxValidation' => false,
-        'options' => [ 'validateOnSubmit' => true ]
+        'options' => ['validateOnSubmit' => true]
 			]); ?>
         <?= $form->field($model, 'email', ['inputTemplate' => '<div class="input-group"><span class="input-group-addon">@</span>{input}</div>'])->input('email') ?>
         <?= $form->field($model, 'password', ['inputTemplate' => '<div class="input-group">{input}<span class="input-group-btn"><button id="password-toggle" class="btn btn-default" type="button">Show</button></span></div>'])->passwordInput() ?>
@@ -35,7 +35,7 @@ 
           'template' => '<div class="row"><div class="col-md-5">{image}</div><div class="col-md-6 col-md-offset-1">{input}</div></div>',
         ]) ?>
         <?= $form->field($model, 'send_email')->checkbox(['disabled'=>true]) ?>
-        <div id='send_email_fields' <?php if(!$model->send_email) { ?>style="display: none;"<?php } ?>>
+        <div id='send_email_fields' <?php if (!$model->send_email) { ?>style="display: none;"<?php } ?>>
           <?= $form->field($model, 'email_category')->dropdownList(Category::getCategories(), ['data-toggle' => 'tooltip', 'data-placement' => 'left', 'data-trigger' => 'hover', 'data-delay' => '{"show": 500, "hide": 100}', 'title' => 'Want to send an email with every check-in? Try setting this to "Restoration"']) ?>
           <?= $form->field($model, 'partner_email1')->input('email') ?>
           <?= $form->field($model, 'partner_email2')->input('email') ?>

site/views/profile/index.php

Spacing +2 added lines, -2 removed lines

@@ -71,11 +71,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 behaviors-graph-info'>Your behaviors graph can be found at:<br /> <a id="behaviors-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, 'email_category')->dropdownList(Category::getCategories(), ['data-toggle' => 'tooltip', 'data-placement' => 'left', 'data-trigger' => 'hover', 'data-delay' => '{"show": 500, "hide": 100}', 'title' => 'Want to send an email with every check-in? Try setting this to "Restoration"']) ?>
               <?= $form->field($profile, 'partner_email1')->input('email'); ?>
               <?= $form->field($profile, 'partner_email2')->input('email'); ?>

site/models/EditProfileForm.php

Indentation +3 added lines, -3 removed lines

@@ -60,8 +60,8 @@ 
   }
 
   /**
-     * @codeCoverageIgnore
-     */
+   * @codeCoverageIgnore
+   */
   public function attributeLabels() {
     return [
       'partner_email1' => "Partner Email #1",
@@ -93,7 +93,7 @@ 
 
         // generate behaviors 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 $checkins_last_month is an empty array

Spacing +4 added lines, -4 removed lines

@@ -85,10 +85,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 behaviors graph image
@@ -97,7 +97,7 @@ 
 
         // if they haven't done a check-in in the last month this will explode
         // because $checkins_last_month is an empty array
-        if($checkins_last_month) {
+        if ($checkins_last_month) {
           $graph->create($checkins_last_month, true);
         }
       } else {
@@ -106,7 +106,7 @@ 
         $graph->destroy();
       }
 
-      if($this->send_email) {
+      if ($this->send_email) {
         $user->send_email = true;
         $user->email_category = $this->email_category;
         $user->partner_email1 = $this->partner_email1;

site/models/CheckinForm.php

Spacing +9 added lines, -9 removed lines

@@ -53,10 +53,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'];
       }
     }   
@@ -64,8 +64,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!');
         }
       }
@@ -103,20 +103,20 @@ 
 
     // delete cached behaviors
     array_map(function($period) use ($time) {
-      $key = "checkins_".Yii::$app->user->id."_{$period}_".$time->getLocalDate();
+      $key = "checkins_" . Yii::$app->user->id . "_{$period}_" . $time->getLocalDate();
       Yii::$app->cache->delete($key);
     }, [30, 90, 180]);
   }
 
   public function save() {
-    if(empty($this->compiled_behaviors)) {
+    if (empty($this->compiled_behaviors)) {
       $this->commpiled_behaviors = $this->compileBehaviors();
     }
 
     $user_behavior = Yii::$container->get(\common\interfaces\UserBehaviorInterface::class);
 
     $rows = [];
-    foreach($this->compiled_behaviors as $behavior_id) {
+    foreach ($this->compiled_behaviors as $behavior_id) {
       $temp = [
         Yii::$app->user->id,
         (int)$behavior_id,
@@ -135,10 +135,10 @@ 
       )->execute();
 
     // if the user has publicised their check-in graph, create the image
-    if(Yii::$app->user->identity->expose_graph) {
+    if (Yii::$app->user->identity->expose_graph) {
       $checkins_last_month = $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);