Completed
Pull Request — master (#163)
by Corey
04:29 queued 02:02
created
site/tests/_support/FunctionalTester.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 {
21 21
     use _generated\FunctionalTesterActions;
22 22
 
23
-   /**
24
-    * Define custom actions here
25
-    */
23
+    /**
24
+     * Define custom actions here
25
+     */
26 26
 }
Please login to merge, or discard this patch.
site/tests/_support/MockUserBehavior.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
   public static function isPrimaryKey($keys) {}
15 15
   public static function find() {}
16 16
   public static function findOne($condition) {}
17
-  public static function findAll($condition) {return [];}
17
+  public static function findAll($condition) {return []; }
18 18
   public static function updateAll($attributes, $condition = null) {}
19 19
   public static function deleteAll($condition = null) {}
20 20
   public function save($runValidation = true, $attributeNames = null) {}
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,4 +42,4 @@
 block discarded – undo
42 42
   public static function decorate(array $uo, $with_category) {}
43 43
   public static function decorateWithCategory(array $uo) {}
44 44
   public function getBehaviorsWithCounts($limit) {}
45
- }
46 45
\ No newline at end of file
46
+  }
47 47
\ No newline at end of file
Please login to merge, or discard this patch.
site/views/partials/posts.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 use \yii\helpers\Html;
3 3
 
4
-foreach($posts as $file) {
4
+foreach ($posts as $file) {
5 5
   $yaml       = $file['yaml'];
6 6
   $content    = $file['content'];
7 7
   $short_name = Html::encode($file['date']['name']);
Please login to merge, or discard this patch.
site/views/layouts/main.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,8 +13,8 @@
 block discarded – undo
13 13
  */
14 14
 site\assets\AppAsset::register($this);
15 15
 
16
-if($hash = Utility::getRevHash()) {
17
-  $rev_link = '<a href="'.Utility::getGithubRevUrl().'">'.Utility::getRevHash().'</a>';
16
+if ($hash = Utility::getRevHash()) {
17
+  $rev_link = '<a href="' . Utility::getGithubRevUrl() . '">' . Utility::getRevHash() . '</a>';
18 18
 } else $rev_link = 'DEVELOPMENT';
19 19
 
20 20
 ?>
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,9 @@
 block discarded – undo
15 15
 
16 16
 if($hash = Utility::getRevHash()) {
17 17
   $rev_link = '<a href="'.Utility::getGithubRevUrl().'">'.Utility::getRevHash().'</a>';
18
-} else $rev_link = 'DEVELOPMENT';
18
+} else {
19
+  $rev_link = 'DEVELOPMENT';
20
+}
19 21
 
20 22
 ?>
21 23
 <?php $this->beginPage() ?>
Please login to merge, or discard this patch.
site/views/checkin/index.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
   print $form
41 41
           ->field($model, "behaviors{$category['id']}")
42 42
           ->checkboxList($behaviors,
43
-                         ['data-toggle' => 'buttons', 'item' => "checkboxItemTemplate"]);
43
+                          ['data-toggle' => 'buttons', 'item' => "checkboxItemTemplate"]);
44 44
 }
45 45
 print Html::submitButton('Submit', ['class' => 'btn btn-success']); 
46 46
 ActiveForm::end();
Please login to merge, or discard this patch.
Spacing   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -10,8 +10,7 @@  discard block
 block discarded – undo
10 10
 $this->title = "The Faster Scale App | Check-in";
11 11
 
12 12
 function checkboxItemTemplate($index, $label, $name, $checked, $value) {
13
-  return Html::checkbox
14
-    (
13
+  return Html::checkbox(
15 14
       $name,
16 15
       $checked,
17 16
       [
@@ -35,7 +34,7 @@  discard block
 block discarded – undo
35 34
   'options' => ['class' => 'form-horizontal'],
36 35
 ]);
37 36
 
38
-foreach($categories as $category) {
37
+foreach ($categories as $category) {
39 38
   $behaviors = AH::map($behaviorsList[$category['id']], 'id', 'name');
40 39
   print $form
41 40
           ->field($model, "behaviors{$category['id']}")
Please login to merge, or discard this patch.
site/views/checkin/view.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@
 block discarded – undo
92 92
     print $form
93 93
             ->field($model, "behaviors{$category['id']}")
94 94
             ->checkboxList($behaviors,
95
-                           ['item' => "checkboxItemTemplate"]);
95
+                            ['item' => "checkboxItemTemplate"]);
96 96
   }
97 97
   ActiveForm::end();
98 98
 
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 $plus_week  = $time->alterLocalDate($actual_date, "+1 week");
28 28
 
29 29
 $pie_data = [];
30
-if($answer_pie) {
30
+if ($answer_pie) {
31 31
   $values     = array_map('intval', array_column($answer_pie, "count"));
32 32
   $labels     = array_column($answer_pie, "name");
33 33
   $colors     = array_column($answer_pie, "color");
@@ -68,15 +68,15 @@  discard block
 block discarded – undo
68 68
     </div>
69 69
   </div>
70 70
 
71
-  <?php if($questions) {
72
-  foreach($questions as $behavior_id => $behavior_questions) {
71
+  <?php if ($questions) {
72
+  foreach ($questions as $behavior_id => $behavior_questions) {
73 73
     print "<div class='well well-sm'>";
74 74
     print "<button type='button' class='btn btn-primary' disabled='disabled'>{$behavior_questions['question']['title']}</button>";
75 75
     print "<div class='row'>";
76
-    foreach($behavior_questions['answers'] as $question) { 
76
+    foreach ($behavior_questions['answers'] as $question) { 
77 77
       print "<div class='col-md-4'>";
78 78
       print "<p><strong>{$question['title']}</strong></p>";
79
-      print "<p>".Html::encode($question['answer'])."</p>";
79
+      print "<p>" . Html::encode($question['answer']) . "</p>";
80 80
       print "</div>";
81 81
     }
82 82
     print "</div></div>";
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
     'options' => ['class' => 'form-horizontal'],
89 89
   ]);
90 90
 
91
-  foreach($categories as $category) {
91
+  foreach ($categories as $category) {
92 92
     $behaviors = AH::map($behaviorsList[$category['id']], 'id', 'name');
93 93
     print $form
94 94
             ->field($model, "behaviors{$category['id']}")
Please login to merge, or discard this patch.
site/views/checkin/questions.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -12,9 +12,9 @@
 block discarded – undo
12 12
     $name,
13 13
     $checked,
14 14
     ['value' => $value,
15
-     'label' => $label,
16
-     'container' => false,
17
-     'labelOptions' => [ 'class' => $checked
15
+      'label' => $label,
16
+      'container' => false,
17
+      'labelOptions' => [ 'class' => $checked
18 18
                                      ? 'btn btn-info active'
19 19
                                      : 'btn btn-info'],
20 20
     ]);
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
     ['value' => $value,
15 15
      'label' => $label,
16 16
      'container' => false,
17
-     'labelOptions' => [ 'class' => $checked
17
+     'labelOptions' => ['class' => $checked
18 18
                                      ? 'btn btn-info active'
19 19
                                      : 'btn btn-info'],
20 20
     ]);
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
   'id' => 'checkin-form',
33 33
 ]);
34 34
 
35
-foreach($categories as $category_id => $category_name) {
35
+foreach ($categories as $category_id => $category_name) {
36 36
   print $form->field($model, "user_behavior_id{$category_id}")->radioList($behaviors[$category_id], ['class' => "btn-group", 'data-toggle' => 'buttons', 'item'=>"radioItemTemplate"]);
37 37
   print $form->field($model, "answer_{$category_id}a")->textarea()->label("How does it affect me? How do I act and feel?");
38 38
   print $form->field($model, "answer_{$category_id}b")->textarea()->label("How does it affect the important people in my life?");
Please login to merge, or discard this patch.
site/models/CheckinForm.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
   public function setBehaviors($behaviors) {
67 67
     foreach($behaviors as $category_id => $category_data) {
68 68
       $attribute = "behaviors$category_id";
69
-			$this->$attribute = [];
69
+      $this->$attribute = [];
70 70
       foreach($category_data['behaviors'] as $behavior) {
71 71
         $this->{$attribute}[] = $behavior['id'];
72 72
       }
@@ -85,12 +85,12 @@  discard block
 block discarded – undo
85 85
 
86 86
   public function compileBehaviors() {
87 87
     $behaviors = array_merge((array)$this->behaviors1,
88
-                           (array)$this->behaviors2,
89
-                           (array)$this->behaviors3,
90
-                           (array)$this->behaviors4,
91
-                           (array)$this->behaviors5,
92
-                           (array)$this->behaviors6,
93
-                           (array)$this->behaviors7);
88
+                            (array)$this->behaviors2,
89
+                            (array)$this->behaviors3,
90
+                            (array)$this->behaviors4,
91
+                            (array)$this->behaviors5,
92
+                            (array)$this->behaviors6,
93
+                            (array)$this->behaviors7);
94 94
 
95 95
     return array_filter($behaviors); // strip out false values
96 96
   }
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -64,10 +64,10 @@  discard block
 block discarded – undo
64 64
   }
65 65
 
66 66
   public function setBehaviors($behaviors) {
67
-    foreach($behaviors as $category_id => $category_data) {
67
+    foreach ($behaviors as $category_id => $category_data) {
68 68
       $attribute = "behaviors$category_id";
69 69
 			$this->$attribute = [];
70
-      foreach($category_data['behaviors'] as $behavior) {
70
+      foreach ($category_data['behaviors'] as $behavior) {
71 71
         $this->{$attribute}[] = $behavior['id'];
72 72
       }
73 73
     }   
@@ -75,8 +75,8 @@  discard block
 block discarded – undo
75 75
 
76 76
   public function validateBehaviors($attribute, $params) {
77 77
     if (!$this->hasErrors()) {
78
-      foreach($this->$attribute as $behavior) {
79
-        if(!is_numeric($behavior)) {
78
+      foreach ($this->$attribute as $behavior) {
79
+        if (!is_numeric($behavior)) {
80 80
           $this->addError($attribute, 'One of your behaviors is not an integer!');
81 81
         }
82 82
       }
@@ -110,17 +110,17 @@  discard block
 block discarded – undo
110 110
 
111 111
     // delete cached scores
112 112
     $time = Yii::$container->get(\common\interfaces\TimeInterface::class);
113
-    $key = "scores_of_last_month_".Yii::$app->user->id."_".$time->getLocalDate();
113
+    $key = "scores_of_last_month_" . Yii::$app->user->id . "_" . $time->getLocalDate();
114 114
     Yii::$app->cache->delete($key);
115 115
   }
116 116
 
117 117
   public function save() {
118
-    if(empty($this->compiled_behaviors)) {
118
+    if (empty($this->compiled_behaviors)) {
119 119
       $this->commpiled_behaviors = $this->compileBehaviors();
120 120
     }
121 121
 
122 122
     $rows = [];
123
-    foreach($this->compiled_behaviors as $behavior_id) {
123
+    foreach ($this->compiled_behaviors as $behavior_id) {
124 124
       $temp = [
125 125
         Yii::$app->user->id,
126 126
         (int)$behavior_id,
Please login to merge, or discard this patch.
site/models/ContactForm.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
     return Yii::$app->mailer->compose()
57 57
       ->setTo($email)
58 58
       ->setFrom([$this->email => $this->name])
59
-      ->setSubject("[FSA Contact] ".$this->subject)
59
+      ->setSubject("[FSA Contact] " . $this->subject)
60 60
       ->setTextBody($this->body)
61 61
       ->send();
62 62
   }
Please login to merge, or discard this patch.