CorWatts / fasterscale

common/models/Category.php

Spacing +7 added lines, -7 removed lines

@@ -12,13 +12,13 @@
 class Category extends \yii\base\BaseObject implements \common\interfaces\CategoryInterface {
 
   public static $categories = [
-    [ "id" => 1, "name" => "Restoration"],
-    [ "id" => 2, "name" => "Forgetting Priorities"],
-    [ "id" => 3, "name" => "Anxiety"],
-    [ "id" => 4, "name" => "Speeding Up"],
-    [ "id" => 5, "name" => "Ticked Off"],
-    [ "id" => 6, "name" => "Exhausted"],
-    [ "id" => 7, "name" => "Relapse/Moral Failure"],
+    ["id" => 1, "name" => "Restoration"],
+    ["id" => 2, "name" => "Forgetting Priorities"],
+    ["id" => 3, "name" => "Anxiety"],
+    ["id" => 4, "name" => "Speeding Up"],
+    ["id" => 5, "name" => "Ticked Off"],
+    ["id" => 6, "name" => "Exhausted"],
+    ["id" => 7, "name" => "Relapse/Moral Failure"],
   ];
 
   public static $colors = [

common/config/main.php

Spacing +3 added lines, -3 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);
@@ -28,7 +28,7 @@ 
   ],
   'components' => [
     // by default, sessions are stored in a local file
-    'cache' => [ // DummyCache never actually caches anything
+    'cache' => [// DummyCache never actually caches anything
       'class'=> yii\caching\DummyCache::class,
     ],
     'mailer' => [

common/tests/unit/components/GraphTest.php

Spacing +7 added lines, -7 removed lines

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

site/tests/unit/models/EditProfileFormTest.php

Spacing +3 added lines, -3 removed lines

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

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/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
     }

common/components/Graph.php

Spacing +10 added lines, -10 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();
     }
@@ -81,11 +81,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);
@@ -93,8 +93,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;
       }
     }
@@ -102,7 +102,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'];
 
@@ -117,7 +117,7 @@ 
     $graph->Add($gbbplot);
 
     $graph->legend->SetColumns(3);
-    $graph->legend->SetPos(0.5,0.98,'center','bottom'); // position it at the center, just above the bottom edge
+    $graph->legend->SetPos(0.5, 0.98, 'center', 'bottom'); // position it at the center, just above the bottom edge
 
     $img = $graph->Stroke(_IMG_HANDLER);
 
@@ -125,9 +125,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/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);
     }