CorWatts / fasterscale

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,14 +61,14 @@ 
    * @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();
     }
 
     $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;
       }
     }
@@ -87,10 +87,10 @@ 
 
     // 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);
@@ -99,7 +99,7 @@ 
 
     // Create the bar plots
     $plots = [];
-    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'];
 
@@ -115,7 +115,7 @@ 
 
     // $graph->legend->SetFrameWeight(1);
     $graph->legend->SetColumns(3);
-    $graph->legend->SetColor('#4E4E4E','#00A78A');
+    $graph->legend->SetColor('#4E4E4E', '#00A78A');
 
     $graph->title->SetFont(FF_ARIAL, FS_BOLD, 20);
     $graph->title->Set("Behaviors broken down by Category");
@@ -145,9 +145,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/tests/unit/components/GraphTest.php

Spacing +7 added lines, -7 removed lines

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

site/models/EditProfileForm.php

Indentation +3 added lines, -3 removed lines

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

Spacing +5 added lines, -5 removed lines

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

site/tests/unit/models/EditProfileFormTest.php

Indentation +22 added lines, -22 removed lines

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

Spacing +3 added lines, -3 removed lines

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

site/views/profile/index.php

Spacing +2 added lines, -2 removed lines

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