CorWatts / fasterscale

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/tests/unit/data/behaviorsWithCounts.php

Spacing +1 added lines, -1 removed lines

@@ -337,7 +337,7 @@
   ], [
   ], [
   ], [
-  ], [ [
+  ], [[
       'user_id' => 1,
       'behavior_id' => 117,
       'count' => 1,

common/tests/unit/models/UserBehaviorTest.php

Indentation +14 added lines, -14 removed lines

@@ -105,19 +105,19 @@ 
     expect('decorate should add Behavior data and Category data to an array of UserBehaviors',
       $this->assertEquals(
         $this->user_behavior->decorateWithCategory($this->singleSimpleBehaviorNoBehavior),
-         [['id' => 396,
-           'user_id' => 2,
-           'behavior_id' => 107,
-           'date' => '2016-06-17 04:12:43',
-           'behavior' => [
-             'id' => 107,
-             'name' => 'numb',
-             'category_id' => 6,
-             'category' => [
-               'id' => 6,
-               'name' => 'Exhausted',
-             ]
-           ]]]));
+          [['id' => 396,
+            'user_id' => 2,
+            'behavior_id' => 107,
+            'date' => '2016-06-17 04:12:43',
+            'behavior' => [
+              'id' => 107,
+              'name' => 'numb',
+              'category_id' => 6,
+              'category' => [
+                'id' => 6,
+                'name' => 'Exhausted',
+              ]
+            ]]]));
   }
 
   public function testGetBehaviorsByCategory() {
@@ -198,6 +198,6 @@ 
     $bhvrs = require(__DIR__.'/../data/behaviorsWithCounts.php');
     $expected = require(__DIR__.'/../data/expected_getCheckinBreakdown.php');
     $this->user_behavior->method('getBehaviorsWithCounts')->willReturn(...$bhvrs);
-		expect('asdf', $this->assertEquals($expected, $this->user_behavior->getCheckinBreakdown()));
+    expect('asdf', $this->assertEquals($expected, $this->user_behavior->getCheckinBreakdown()));
   }
 }

Spacing +4 added lines, -4 removed lines

@@ -33,7 +33,7 @@ 
   ]; 
   public function setUp() {
     // pull in test data
-    $data = require(__DIR__.'/../data/checkinData.php');
+    $data = require(__DIR__ . '/../data/checkinData.php');
     $this->singleBhvr = $data['singleBhvr'];
     $this->manyBhvrs = $data['manyBhvrs'];
     $this->allBhvrs = $data['allBhvrs'];
@@ -43,7 +43,7 @@ 
     $this->container->set('common\interfaces\UserInterface', '\site\tests\_support\MockUser');
     $this->container->set('common\interfaces\QuestionInterface', '\site\tests\_support\MockQuestion');
     $this->container->set('common\interfaces\BehaviorInterface', 'common\models\Behavior');
-    $this->container->set('common\interfaces\TimeInterface', function () {
+    $this->container->set('common\interfaces\TimeInterface', function() {
         return new \common\components\Time('America/Los_Angeles');
       });
 
@@ -195,8 +195,8 @@ 
                             ->setMethods(['getIsNewRecord', 'save', 'getBehaviorsByDate', 'getBehaviorsWithCounts'])
                             ->getMock();
 
-    $bhvrs = require(__DIR__.'/../data/behaviorsWithCounts.php');
-    $expected = require(__DIR__.'/../data/expected_getCheckinBreakdown.php');
+    $bhvrs = require(__DIR__ . '/../data/behaviorsWithCounts.php');
+    $expected = require(__DIR__ . '/../data/expected_getCheckinBreakdown.php');
     $this->user_behavior->method('getBehaviorsWithCounts')->willReturn(...$bhvrs);
 		expect('asdf', $this->assertEquals($expected, $this->user_behavior->getCheckinBreakdown()));
   }

common/components/Graph.php

Spacing +9 added lines, -9 removed lines

@@ -28,7 +28,7 @@ 
   public function getFilepath() {
     $path = Yii::getAlias('@graphImgPath');
     $filename = $this->user->getIdHash() . ".png";
-    return $path. '/' . $filename;
+    return $path . '/' . $filename;
   }
 
   /**
@@ -61,7 +61,7 @@ 
    * @return string the encoded image
    */
   public function create(array $checkins, bool $toDisk = false) {
-    if($toDisk) {
+    if ($toDisk) {
       // wipe out the current image, if it exists
       $this->destroy();
     }
@@ -79,11 +79,11 @@ 
 
     // Setup dates as labels on the X-axis
     $graph->xaxis->SetTickLabels(array_keys($checkins));
-    $graph->xaxis->HideTicks(false,false);
+    $graph->xaxis->HideTicks(false, false);
 
     $graph->yaxis->scale->SetAutoMin(0);
     $graph->yaxis->HideLine(false);
-    $graph->yaxis->HideTicks(false,false);
+    $graph->yaxis->HideTicks(false, false);
     $graph->xaxis->SetLabelAngle(45);
     $graph->xaxis->SetFont(FF_ARIAL, FS_NORMAL, 10);
     $graph->yaxis->SetFont(FF_ARIAL, FS_NORMAL, 15);
@@ -91,8 +91,8 @@ 
 
     // format the data into something nicer
     $accum = [];
-    foreach($checkins as $checkin_sum) {
-      for($i = 1; $i <= 7; $i ++) {
+    foreach ($checkins as $checkin_sum) {
+      for ($i = 1; $i <= 7; $i++) {
         $accum[$i][] = array_key_exists($i, $checkin_sum) ? $checkin_sum[$i]['count'] : 0;
       }
     }
@@ -100,7 +100,7 @@ 
     // Create the bar plots
     $plots = [];
     $category = Yii::$container->get(\common\interfaces\CategoryInterface::class);
-    foreach($accum as $category_key => $category_data) {
+    foreach ($accum as $category_key => $category_data) {
       $bplot = new BarPlot($category_data);
       $color = $category::$colors[$category_key]['color'];
 
@@ -122,9 +122,9 @@ 
     imagepng($img);
     $img_data = ob_get_clean();
 
-    if($toDisk) {
+    if ($toDisk) {
       $filepath = $this->getFilepath(); 
-      if(!is_dir(dirname($filepath))) {
+      if (!is_dir(dirname($filepath))) {
         mkdir(dirname($filepath), 0766, true);
       }
 

common/mail/checkinReport.php

Spacing +6 added lines, -6 removed lines

@@ -124,14 +124,14 @@ 
                                                 <th style="Margin:0;color:#0a0a0a;font-family:Arial,Verdana,Helvetica,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left">
 
 <?php
-if($questions) {
-  foreach($questions as $behavior_id => $behavior_questions) {
+if ($questions) {
+  foreach ($questions as $behavior_id => $behavior_questions) {
 ?>
 
                                                    <h4 style="Margin:0;Margin-bottom:10px;color:#37b98f;font-family:Arial,Verdana,Helvetica,sans-serif;font-size:24px;font-weight:400;line-height:1.3;margin:0;margin-bottom:5px;padding:0 8px;text-align:left;word-wrap:normal"> <?= $behavior_questions['question']['title'] ?> </h4>
 
 <?php
-    foreach($behavior_questions['answers'] as $key => $question) {  ?>
+    foreach ($behavior_questions['answers'] as $key => $question) {  ?>
       <p style="Margin:0;Margin-bottom:10px;color:#0a0a0a;font-family:Arial,Verdana,Helvetica,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0 8px 4px 8px;text-align:left"><strong><?=$question['title']?></strong> <?=$question['answer']?></p>
 <?php
     }
@@ -188,12 +188,12 @@ 
                                                 <th style="Margin:0;color:#0a0a0a;font-family:Arial,Verdana,Helvetica,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left">
 
 <?php
-if($user_behaviors) {
-  foreach($user_behaviors as $user_behavior) { ?>
+if ($user_behaviors) {
+  foreach ($user_behaviors as $user_behavior) { ?>
         <p style="Margin:0;Margin-bottom:10px;color:#0a0a0a;font-family:Arial,Verdana,Helvetica,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0 8px 4px 8px;text-align:left">
           <strong style="color:#37b98f"><?= $user_behavior['category_name'] ?></strong>
 <?php
-    foreach($user_behavior['behaviors'] as $behavior) { ?>
+    foreach ($user_behavior['behaviors'] as $behavior) { ?>
         <br><?= $behavior['name'] ?>
 <?php
     }