CorWatts / fasterscale

site/models/CheckinForm.php

Indentation +7 added lines, -7 removed lines

@@ -66,7 +66,7 @@ 
   public function setBehaviors($behaviors) {
     foreach($behaviors as $category_id => $category_data) {
       $attribute = "behaviors$category_id";
-			$this->$attribute = [];
+      $this->$attribute = [];
       foreach($category_data['behaviors'] as $behavior) {
         $this->{$attribute}[] = $behavior['id'];
       }
@@ -85,12 +85,12 @@ 
 
   public function compileBehaviors() {
     $behaviors = array_merge((array)$this->behaviors1,
-                           (array)$this->behaviors2,
-                           (array)$this->behaviors3,
-                           (array)$this->behaviors4,
-                           (array)$this->behaviors5,
-                           (array)$this->behaviors6,
-                           (array)$this->behaviors7);
+                            (array)$this->behaviors2,
+                            (array)$this->behaviors3,
+                            (array)$this->behaviors4,
+                            (array)$this->behaviors5,
+                            (array)$this->behaviors6,
+                            (array)$this->behaviors7);
 
     return array_filter($behaviors); // strip out false values
   }

Spacing +6 added lines, -6 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,12 +110,12 @@ 
   }
 
   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,

site/models/ContactForm.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
     return Yii::$app->mailer->compose()
       ->setTo($email)
       ->setFrom([$this->email => $this->name])
-      ->setSubject("[FSA Contact] ".$this->subject)
+      ->setSubject("[FSA Contact] " . $this->subject)
       ->setTextBody($this->body)
       ->send();
   }

site/models/QuestionForm.php

Indentation +5 added lines, -5 removed lines

@@ -157,11 +157,11 @@
       foreach($this->behaviorToAnswers($behavior_id) as $answer_letter => $answer) {
         $question_id = \common\models\Question::$TYPES[$answer_letter];
         array_push($answers, [
-                               'behavior_id'    => $user_bhvr->behavior_id,
-                               'user_bhvr_id' => $user_bhvr->id,
-                               'question_id'  => $question_id,
-                               'answer'       => $answer,
-                             ]);
+                                'behavior_id'    => $user_bhvr->behavior_id,
+                                'user_bhvr_id' => $user_bhvr->id,
+                                'question_id'  => $question_id,
+                                'answer'       => $answer,
+                              ]);
       }
     }
     return $answers;

Spacing +9 added lines, -9 removed lines

@@ -83,7 +83,7 @@ 
         'whenClient' => "function(attribute, value) { return false; }", // lame, but acceptable
         "message" => "You must select a behavior your responses apply to."],
 
-      [['answer_1a','answer_1b','answer_1c','answer_2a','answer_2b','answer_2c','answer_3a','answer_3b','answer_3c','answer_4a','answer_4b','answer_4c','answer_5a', 'answer_5b','answer_5c','answer_6a', 'answer_6b','answer_6c','answer_7a','answer_7b','answer_7c'], 'safe']
+      [['answer_1a', 'answer_1b', 'answer_1c', 'answer_2a', 'answer_2b', 'answer_2c', 'answer_3a', 'answer_3b', 'answer_3c', 'answer_4a', 'answer_4b', 'answer_4c', 'answer_5a', 'answer_5b', 'answer_5c', 'answer_6a', 'answer_6b', 'answer_6c', 'answer_7a', 'answer_7b', 'answer_7c'], 'safe']
     ];
   }
 
@@ -101,10 +101,10 @@ 
 
   public function getBhvrValidator() {
     return function($model, $attr) {
-      $attrNum = $attr[strlen($attr)-1];
-      foreach(['a', 'b', 'c'] as $l) {
+      $attrNum = $attr[strlen($attr) - 1];
+      foreach (['a', 'b', 'c'] as $l) {
         $attr = "answer_{$attrNum}{$l}";
-        if($model->$attr) return true;
+        if ($model->$attr) return true;
       }
       return false;
     };
@@ -134,7 +134,7 @@ 
 
   public function getPrefixProps($prefix) {
     return array_filter(get_object_vars($this), function($v, $k) use($prefix) {
-      if(strpos($k, $prefix) === 0 && strlen($v)) {
+      if (strpos($k, $prefix) === 0 && strlen($v)) {
         return true;
       }
     }, ARRAY_FILTER_USE_BOTH);
@@ -152,9 +152,9 @@ 
   public function getAnswers($bhvrs) {
     $answers = [];
     $user_bhvrs = array_combine($this->getUserBehaviorProps(), $bhvrs);
-    foreach($user_bhvrs as $property => $user_bhvr) {
+    foreach ($user_bhvrs as $property => $user_bhvr) {
       $behavior_id = intval(substr($property, -1, 1));
-      foreach($this->behaviorToAnswers($behavior_id) as $answer_letter => $answer) {
+      foreach ($this->behaviorToAnswers($behavior_id) as $answer_letter => $answer) {
         $question_id = \common\models\Question::$TYPES[$answer_letter];
         array_push($answers, [
                                'behavior_id'    => $user_bhvr->behavior_id,
@@ -169,7 +169,7 @@ 
 
   public function saveAnswers($bhvrs) {
     $result = true;
-    foreach($this->getAnswers($bhvrs) as $answer) {
+    foreach ($this->getAnswers($bhvrs) as $answer) {
       $model = new \common\models\Question;
       $model->user_id = Yii::$app->user->id;
       $model->behavior_id = $answer['behavior_id'];
@@ -177,7 +177,7 @@ 
       $model->date = new Expression("now()::timestamp");
       $model->question = $answer['question_id'];
       $model->answer = $answer['answer'];
-      if(!$model->save()) {
+      if (!$model->save()) {
         $result = false;
       }
     }

Braces +3 added lines, -1 removed lines

@@ -104,7 +104,9 @@
       $attrNum = $attr[strlen($attr)-1];
       foreach(['a', 'b', 'c'] as $l) {
         $attr = "answer_{$attrNum}{$l}";
-        if($model->$attr) return true;
+        if($model->$attr) {
+          return true;
+        }
       }
       return false;
     };

site/web/router.php

Indentation +7 added lines, -7 removed lines

@@ -7,12 +7,12 @@
 set_include_path(get_include_path().':'.__DIR__);
 if(file_exists($root.$path))
 {
-	if(is_dir($root.$path) && substr($path,strlen($path) - 1, 1) !== '/')
-		$path = rtrim($path,'/').'/index.php';
-	if(strpos($path,'.php') === false) return false;
-	else {
-		chdir(dirname($root.$path));
-		require_once $root.$path;
-	}
+  if(is_dir($root.$path) && substr($path,strlen($path) - 1, 1) !== '/')
+    $path = rtrim($path,'/').'/index.php';
+  if(strpos($path,'.php') === false) return false;
+  else {
+    chdir(dirname($root.$path));
+    require_once $root.$path;
+  }
 }else include_once 'index.php';
 ?>

Spacing +9 added lines, -9 removed lines

@@ -3,16 +3,16 @@
 header("Access-Control-Allow-Origin: *");
 $root = $_SERVER['DOCUMENT_ROOT'];
 chdir($root);
-$path = '/'.ltrim(parse_url($_SERVER['REQUEST_URI'])['path'],'/');
-set_include_path(get_include_path().':'.__DIR__);
-if(file_exists($root.$path))
+$path = '/' . ltrim(parse_url($_SERVER['REQUEST_URI'])['path'], '/');
+set_include_path(get_include_path() . ':' . __DIR__);
+if (file_exists($root . $path))
 {
-	if(is_dir($root.$path) && substr($path,strlen($path) - 1, 1) !== '/')
-		$path = rtrim($path,'/').'/index.php';
-	if(strpos($path,'.php') === false) return false;
+	if (is_dir($root . $path) && substr($path, strlen($path) - 1, 1) !== '/')
+		$path = rtrim($path, '/') . '/index.php';
+	if (strpos($path, '.php') === false) return false;
 	else {
-		chdir(dirname($root.$path));
-		require_once $root.$path;
+		chdir(dirname($root . $path));
+		require_once $root . $path;
 	}
-}else include_once 'index.php';
+} else include_once 'index.php';
 ?>

Braces +9 added lines, -5 removed lines

@@ -7,12 +7,16 @@
 set_include_path(get_include_path().':'.__DIR__);
 if(file_exists($root.$path))
 {
-	if(is_dir($root.$path) && substr($path,strlen($path) - 1, 1) !== '/')
-		$path = rtrim($path,'/').'/index.php';
-	if(strpos($path,'.php') === false) return false;
-	else {
+	if(is_dir($root.$path) && substr($path,strlen($path) - 1, 1) !== '/') {
+			$path = rtrim($path,'/').'/index.php';
+	}
+	if(strpos($path,'.php') === false) {
+	  return false;
+	} else {
 		chdir(dirname($root.$path));
 		require_once $root.$path;
 	}
-}else include_once 'index.php';
+} else {
+  include_once 'index.php';
+}
 ?>

site/tests/_support/UnitTester.php

Indentation +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@
 {
     use _generated\UnitTesterActions;
 
-   /**
-    * Define custom actions here
-    */
+    /**
+     * Define custom actions here
+     */
 }

site/views/checkin/report.php

Spacing +5 added lines, -5 removed lines

@@ -35,12 +35,12 @@
                 <th>Behavior</th>
                 <th>Category</th>
             </tr>
-<?php foreach($top_behaviors as $key => $row) {
+<?php foreach ($top_behaviors as $key => $row) {
 $num = $key + 1;
-print "<tr>".
-  "<td>{$row['count']}</td>".
-  "<td>{$row['behavior']['name']}</td>".
-  "<td>{$row['behavior']['category']['name']}</td>".
+print "<tr>" .
+  "<td>{$row['count']}</td>" .
+  "<td>{$row['behavior']['name']}</td>" .
+  "<td>{$row['behavior']['category']['name']}</td>" .
   "</tr>";
 }
 ?>

common/tests/unit/components/TimeTest.php

Spacing +8 added lines, -8 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');
       });
 
@@ -40,7 +40,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")));
       });
@@ -48,13 +48,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');
@@ -67,14 +67,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');
@@ -87,7 +87,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")));
       });
@@ -109,7 +109,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');

common/config/main.php

Spacing +2 added lines, -2 removed lines

@@ -10,8 +10,8 @@
       'common\interfaces\QuestionInterface' => \common\models\Question::class,
       'common\interfaces\BehaviorInterface' => \common\models\Behavior::class,
       'common\interfaces\CategoryInterface' => \common\models\Category::class,
-      'common\interfaces\TimeInterface' => function () {
-        if(Yii::$app->user->getIsGuest()) {
+      'common\interfaces\TimeInterface' => function() {
+        if (Yii::$app->user->getIsGuest()) {
           return new \common\components\Time('UTC');
         } else {
           return new \common\components\Time(Yii::$app->user->identity->timezone);

site/views/checkin/old_view.php

Indentation +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
     print $form
             ->field($model, "behaviors{$category['id']}")
             ->checkboxList($behaviors,
-                           ['item' => "checkboxItemTemplate"]);
+                            ['item' => "checkboxItemTemplate"]);
   }
   ActiveForm::end();
 

Switch Indentation +4 added lines, -4 removed lines

@@ -41,10 +41,10 @@
 
   <?php
               switch(true) {
-                case ($score < 30):
-                  $alert_level = "success";
-                  $alert_msg = "You're doing well! Keep on doing whatever it is you're doing!";
-                  break;
+              case ($score < 30):
+                $alert_level = "success";
+                $alert_msg = "You're doing well! Keep on doing whatever it is you're doing!";
+                break;
 
               case ($score < 40):
                 $alert_level = "info";

Spacing +9 added lines, -9 removed lines

@@ -15,7 +15,7 @@ 
 $this->title = "The Faster Scale App | Previous Check-ins";
 $time = Yii::$container->get('common\interfaces\TimeInterface');
 $this->registerJsFile('/js/checkin/view.js', ['depends' => [\site\assets\AppAsset::class]]);
-if($answer_pie) {
+if ($answer_pie) {
   $this->registerJsFile('/js/checkin/charts/pie.js', ['depends' => [\site\assets\AppAsset::class]]);
 }
 
@@ -25,7 +25,7 @@ 
 }
 
 $pie_data = [];
-if($answer_pie) {
+if ($answer_pie) {
   $values     = array_map('intval', array_column($answer_pie, "count"));
   $labels     = array_column($answer_pie, "name");
   $colors     = array_column($answer_pie, "color");
@@ -51,7 +51,7 @@ 
   <h1>View Previous Check-ins</h1>
 
   <?php
-              switch(true) {
+              switch (true) {
                 case ($score < 30):
                   $alert_level = "success";
                   $alert_msg = "You're doing well! Keep on doing whatever it is you're doing!";
@@ -112,16 +112,16 @@ 
 </div>
 
 
-  <?php if($questions) {
+  <?php if ($questions) {
   print "<h3>Processing Questions:</h3>";
-  foreach($questions as $behavior_id => $behavior_questions) {
+  foreach ($questions as $behavior_id => $behavior_questions) {
     print "<div class='well well-sm'>";
     print "<button type='button' class='btn btn-primary' disabled='disabled'>{$behavior_questions['question']['title']}</button>";
     print "<div class='row'>";
-    foreach($behavior_questions['answers'] as $question) { 
+    foreach ($behavior_questions['answers'] as $question) { 
       print "<div class='col-md-4'>";
       print "<p><strong>{$question['title']}</strong></p>";
-      print "<p>".Html::encode($question['answer'])."</p>";
+      print "<p>" . Html::encode($question['answer']) . "</p>";
       print "</div>";
     }
     print "</div></div>";
@@ -136,7 +136,7 @@ 
     'options' => ['class' => 'form-horizontal'],
   ]);
 
-  foreach($categories as $category) {
+  foreach ($categories as $category) {
     $behaviors = AH::map($behaviorsList[$category['id']], 'id', 'name');
     print $form
             ->field($model, "behaviors{$category['id']}")
@@ -146,7 +146,7 @@ 
   ActiveForm::end();
 
 $this->registerJson($past_checkin_dates, "past-checkin-dates");
-if($answer_pie) {
+if ($answer_pie) {
   $this->registerJson($pie_data, "pie_data");
 }
 ?>

Braces +5 added lines, -2 removed lines

@@ -102,9 +102,12 @@
         <div class='card-text'>
           <?php if ($pie_data): ?>
           <canvas id='category-pie-chart'></canvas>
-          <?php else: ?>
+          <?php else {
+  : ?>
           <p>no data</p>
-          <?php endif; ?>
+          <?php endif;
+}
+?>
         </div>
       </div>
     </div>