CorWatts / fasterscale

common/models/Behavior.php

Indentation +132 added lines, -132 removed lines

@@ -13,138 +13,138 @@
  */
 class Behavior extends \yii\base\BaseObject implements BehaviorInterface
 {
-	public static $behaviors = [
-		['id' => 1,   'name' => 'no current secrets', 'category_id' => 1],
-		['id' => 2,   'name' => 'resolving problems', 'category_id' => 1],
-		['id' => 3,   'name' => 'identifying fears and feelings', 'category_id' => 1],
-		['id' => 4,   'name' => 'keeping commitments to meetings, prayer, family, church, people, goals, and self', 'category_id' => 1],
-		['id' => 5,   'name' => 'being open', 'category_id' => 1],
-		['id' => 6,   'name' => 'being honest', 'category_id' => 1],
-		['id' => 7,   'name' => 'making eye contact', 'category_id' => 1],
-		['id' => 8,   'name' => 'reaching out to others', 'category_id' => 1],
-		['id' => 9,   'name' => 'increasing in relationships with God and others', 'category_id' => 1],
-		['id' => 10,  'name' => 'accountability', 'category_id' => 1],
-		['id' => 11,  'name' => 'secrets', 'category_id' => 2],
-		['id' => 12,  'name' => 'bored', 'category_id' => 2],
-		['id' => 13,  'name' => 'less time/energy for God, meetings, and church', 'category_id' => 2],
-		['id' => 14,  'name' => 'avoiding support and accountability towards people', 'category_id' => 2],
-		['id' => 15,  'name' => 'superficial conversations', 'category_id' => 2],
-		['id' => 16,  'name' => 'sarcasm', 'category_id' => 2],
-		['id' => 17,  'name' => 'isolating yourself', 'category_id' => 2],
-		['id' => 18,  'name' => 'changes in goals', 'category_id' => 2],
-		['id' => 19,  'name' => 'flirting', 'category_id' => 2],
-		['id' => 20,  'name' => 'obsessed with relationships', 'category_id' => 2],
-		['id' => 21,  'name' => 'breaking promises/commitments', 'category_id' => 2],
-		['id' => 22,  'name' => 'neglecting family', 'category_id' => 2],
-		['id' => 23,  'name' => 'preoccupation with material things, television, or entertainment', 'category_id' => 2],
-		['id' => 24,  'name' => 'procrastination', 'category_id' => 2],
-		['id' => 25,  'name' => 'lying', 'category_id' => 2],
-		['id' => 26,  'name' => 'over-confidence', 'category_id' => 2],
-		['id' => 27,  'name' => 'hiding money', 'category_id' => 2],
-		['id' => 28,  'name' => 'worry', 'category_id' => 3],
-		['id' => 29,  'name' => 'using profanity', 'category_id' => 3],
-		['id' => 30,  'name' => 'being fearful', 'category_id' => 3],
-		['id' => 31,  'name' => 'being resentful', 'category_id' => 3],
-		['id' => 32,  'name' => 'replaying old, negative thoughts', 'category_id' => 3],
-		['id' => 33,  'name' => 'perfectionism', 'category_id' => 3],
-		['id' => 34,  'name' => 'judging others\' motives', 'category_id' => 3],
-		['id' => 35,  'name' => 'making goals and lists you can\'t complete', 'category_id' => 3],
-		['id' => 36,  'name' => 'poor planning', 'category_id' => 3],
-		['id' => 37,  'name' => 'mind reading', 'category_id' => 3],
-		['id' => 38,  'name' => 'fantasy', 'category_id' => 3],
-		['id' => 41,  'name' => 'co-dependent rescuing', 'category_id' => 3],
-		['id' => 42,  'name' => 'sleep problems', 'category_id' => 3],
-		['id' => 43,  'name' => 'trouble concentrating', 'category_id' => 3],
-		['id' => 44,  'name' => 'seeking/creating drama', 'category_id' => 3],
-		['id' => 45,  'name' => 'gossip', 'category_id' => 3],
-		['id' => 46,  'name' => 'using over-the-counter medication for pain, sleep, and weight control', 'category_id' => 3],
-		['id' => 47,  'name' => 'super busy', 'category_id' => 4],
-		['id' => 48,  'name' => 'workaholic', 'category_id' => 4],
-		['id' => 49,  'name' => 'can\'t relax', 'category_id' => 4],
-		['id' => 50,  'name' => 'driving too fast', 'category_id' => 4],
-		['id' => 51,  'name' => 'avoiding slowing down', 'category_id' => 4],
-		['id' => 52,  'name' => 'feeling driven', 'category_id' => 4],
-		['id' => 53,  'name' => 'in a hurry', 'category_id' => 4],
-		['id' => 54,  'name' => 'can\'t turn off thoughts', 'category_id' => 4],
-		['id' => 55,  'name' => 'skipping meals', 'category_id' => 4],
-		['id' => 56,  'name' => 'binge eating (usually at night)', 'category_id' => 4],
-		['id' => 57,  'name' => 'overspending', 'category_id' => 4],
-		['id' => 58,  'name' => 'can\'t identify own feelings/needs', 'category_id' => 4],
-		['id' => 59,  'name' => 'repetitive, negative thoughts', 'category_id' => 4],
-		['id' => 60,  'name' => 'irritable', 'category_id' => 4],
-		['id' => 61,  'name' => 'making excuses for "having to do it all"', 'category_id' => 4],
-		['id' => 62,  'name' => 'dramatic mood swings', 'category_id' => 4],
-		['id' => 63,  'name' => 'lust', 'category_id' => 4],
-		['id' => 64,  'name' => 'too much caffeine', 'category_id' => 4],
-		['id' => 65,  'name' => 'over exercising', 'category_id' => 4],
-		['id' => 66,  'name' => 'nervousness', 'category_id' => 4],
-		['id' => 67,  'name' => 'difficulty being alone or with people', 'category_id' => 4],
-		['id' => 68,  'name' => 'difficulty listening to others', 'category_id' => 4],
-		['id' => 69,  'name' => 'avoiding support', 'category_id' => 4],
-		['id' => 70,  'name' => 'procrastination causing crises in money, work, or relationships', 'category_id' => 5],
-		['id' => 71,  'name' => 'sarcasm', 'category_id' => 5],
-		['id' => 72,  'name' => 'black and white, all or nothing thinking', 'category_id' => 5],
-		['id' => 73,  'name' => 'feeling that no one understands', 'category_id' => 5],
-		['id' => 74,  'name' => 'overreacting', 'category_id' => 5],
-		['id' => 75,  'name' => 'road rage', 'category_id' => 5],
-		['id' => 76,  'name' => 'constant resentments', 'category_id' => 5],
-		['id' => 77,  'name' => 'pushing others away', 'category_id' => 5],
-		['id' => 78,  'name' => 'increased isolation', 'category_id' => 5],
-		['id' => 79,  'name' => 'blaming', 'category_id' => 5],
-		['id' => 80,  'name' => 'self pity', 'category_id' => 5],
-		['id' => 81,  'name' => 'arguing', 'category_id' => 5],
-		['id' => 82,  'name' => 'irrationality', 'category_id' => 5],
-		['id' => 83,  'name' => 'can\'t handle criticism', 'category_id' => 5],
-		['id' => 84,  'name' => 'defensive', 'category_id' => 5],
-		['id' => 85,  'name' => 'people are avoiding you', 'category_id' => 5],
-		['id' => 86,  'name' => 'having to be right', 'category_id' => 5],
-		['id' => 87,  'name' => 'digestive problems', 'category_id' => 5],
-		['id' => 88,  'name' => 'headaches', 'category_id' => 5],
-		['id' => 89,  'name' => 'obsessive (stuck) thoughts', 'category_id' => 5],
-		['id' => 90,  'name' => 'can\'t forgive', 'category_id' => 5],
-		['id' => 91,  'name' => 'feeling grandiose (superior)', 'category_id' => 5],
-		['id' => 92,  'name' => 'intimidation', 'category_id' => 5],
-		['id' => 93,  'name' => 'feeling aggressive', 'category_id' => 5],
-		['id' => 94,  'name' => 'depressed', 'category_id' => 6],
-		['id' => 95,  'name' => 'panicked', 'category_id' => 6],
-		['id' => 96,  'name' => 'confused', 'category_id' => 6],
-		['id' => 97,  'name' => 'hopeless', 'category_id' => 6],
-		['id' => 98,  'name' => 'sleeping too much or too little', 'category_id' => 6],
-		['id' => 99,  'name' => 'can\'t cope', 'category_id' => 6],
-		['id' => 100, 'name' => 'overwhelmed', 'category_id' => 6],
-		['id' => 101, 'name' => 'crying for "no reason"', 'category_id' => 6],
-		['id' => 102, 'name' => 'can\'t think', 'category_id' => 6],
-		['id' => 103, 'name' => 'forgetful', 'category_id' => 6],
-		['id' => 104, 'name' => 'pessimistic', 'category_id' => 6],
-		['id' => 105, 'name' => 'helpless', 'category_id' => 6],
-		['id' => 106, 'name' => 'tired', 'category_id' => 6],
-		['id' => 107, 'name' => 'numb', 'category_id' => 6],
-		['id' => 108, 'name' => 'wanting to run', 'category_id' => 6],
-		['id' => 109, 'name' => 'constant cravings for old coping behaviors', 'category_id' => 6],
-		['id' => 110, 'name' => 'thinking of using drugs and alcohol', 'category_id' => 6],
-		['id' => 111, 'name' => 'seeking out old unhealthy people and places', 'category_id' => 6],
-		['id' => 112, 'name' => 'really isolated', 'category_id' => 6],
-		['id' => 113, 'name' => 'people are angry with you', 'category_id' => 6],
-		['id' => 114, 'name' => 'self-abuse', 'category_id' => 6],
-		['id' => 115, 'name' => 'suicidal thoughts', 'category_id' => 6],
-		['id' => 116, 'name' => 'no goals', 'category_id' => 6],
-		['id' => 117, 'name' => 'survival mode', 'category_id' => 6],
-		['id' => 118, 'name' => 'not returning phone calls', 'category_id' => 6],
-		['id' => 119, 'name' => 'missing work', 'category_id' => 6],
-		['id' => 120, 'name' => 'irritability', 'category_id' => 6],
-		['id' => 121, 'name' => 'loss of appetite', 'category_id' => 6],
-		['id' => 122, 'name' => 'returning to the place you swore you would never go again', 'category_id' => 7],
-		['id' => 123, 'name' => 'giving up', 'category_id' => 7],
-		['id' => 124, 'name' => 'giving in', 'category_id' => 7],
-		['id' => 125, 'name' => 'out of control', 'category_id' => 7],
-		['id' => 126, 'name' => 'lost in your addiction', 'category_id' => 7],
-		['id' => 127, 'name' => 'lying to yourself and others', 'category_id' => 7],
-		['id' => 128, 'name' => 'feeling you just can\'t manage without your coping behavior, at least for now', 'category_id' => 7],
-		['id' => 129, 'name' => 'shame', 'category_id' => 7],
-		['id' => 130, 'name' => 'condemnation', 'category_id' => 7],
-		['id' => 131, 'name' => 'guilt', 'category_id' => 7],
-		['id' => 132, 'name' => 'aloneness', 'category_id' => 7],
-	];
+  public static $behaviors = [
+    ['id' => 1,   'name' => 'no current secrets', 'category_id' => 1],
+    ['id' => 2,   'name' => 'resolving problems', 'category_id' => 1],
+    ['id' => 3,   'name' => 'identifying fears and feelings', 'category_id' => 1],
+    ['id' => 4,   'name' => 'keeping commitments to meetings, prayer, family, church, people, goals, and self', 'category_id' => 1],
+    ['id' => 5,   'name' => 'being open', 'category_id' => 1],
+    ['id' => 6,   'name' => 'being honest', 'category_id' => 1],
+    ['id' => 7,   'name' => 'making eye contact', 'category_id' => 1],
+    ['id' => 8,   'name' => 'reaching out to others', 'category_id' => 1],
+    ['id' => 9,   'name' => 'increasing in relationships with God and others', 'category_id' => 1],
+    ['id' => 10,  'name' => 'accountability', 'category_id' => 1],
+    ['id' => 11,  'name' => 'secrets', 'category_id' => 2],
+    ['id' => 12,  'name' => 'bored', 'category_id' => 2],
+    ['id' => 13,  'name' => 'less time/energy for God, meetings, and church', 'category_id' => 2],
+    ['id' => 14,  'name' => 'avoiding support and accountability towards people', 'category_id' => 2],
+    ['id' => 15,  'name' => 'superficial conversations', 'category_id' => 2],
+    ['id' => 16,  'name' => 'sarcasm', 'category_id' => 2],
+    ['id' => 17,  'name' => 'isolating yourself', 'category_id' => 2],
+    ['id' => 18,  'name' => 'changes in goals', 'category_id' => 2],
+    ['id' => 19,  'name' => 'flirting', 'category_id' => 2],
+    ['id' => 20,  'name' => 'obsessed with relationships', 'category_id' => 2],
+    ['id' => 21,  'name' => 'breaking promises/commitments', 'category_id' => 2],
+    ['id' => 22,  'name' => 'neglecting family', 'category_id' => 2],
+    ['id' => 23,  'name' => 'preoccupation with material things, television, or entertainment', 'category_id' => 2],
+    ['id' => 24,  'name' => 'procrastination', 'category_id' => 2],
+    ['id' => 25,  'name' => 'lying', 'category_id' => 2],
+    ['id' => 26,  'name' => 'over-confidence', 'category_id' => 2],
+    ['id' => 27,  'name' => 'hiding money', 'category_id' => 2],
+    ['id' => 28,  'name' => 'worry', 'category_id' => 3],
+    ['id' => 29,  'name' => 'using profanity', 'category_id' => 3],
+    ['id' => 30,  'name' => 'being fearful', 'category_id' => 3],
+    ['id' => 31,  'name' => 'being resentful', 'category_id' => 3],
+    ['id' => 32,  'name' => 'replaying old, negative thoughts', 'category_id' => 3],
+    ['id' => 33,  'name' => 'perfectionism', 'category_id' => 3],
+    ['id' => 34,  'name' => 'judging others\' motives', 'category_id' => 3],
+    ['id' => 35,  'name' => 'making goals and lists you can\'t complete', 'category_id' => 3],
+    ['id' => 36,  'name' => 'poor planning', 'category_id' => 3],
+    ['id' => 37,  'name' => 'mind reading', 'category_id' => 3],
+    ['id' => 38,  'name' => 'fantasy', 'category_id' => 3],
+    ['id' => 41,  'name' => 'co-dependent rescuing', 'category_id' => 3],
+    ['id' => 42,  'name' => 'sleep problems', 'category_id' => 3],
+    ['id' => 43,  'name' => 'trouble concentrating', 'category_id' => 3],
+    ['id' => 44,  'name' => 'seeking/creating drama', 'category_id' => 3],
+    ['id' => 45,  'name' => 'gossip', 'category_id' => 3],
+    ['id' => 46,  'name' => 'using over-the-counter medication for pain, sleep, and weight control', 'category_id' => 3],
+    ['id' => 47,  'name' => 'super busy', 'category_id' => 4],
+    ['id' => 48,  'name' => 'workaholic', 'category_id' => 4],
+    ['id' => 49,  'name' => 'can\'t relax', 'category_id' => 4],
+    ['id' => 50,  'name' => 'driving too fast', 'category_id' => 4],
+    ['id' => 51,  'name' => 'avoiding slowing down', 'category_id' => 4],
+    ['id' => 52,  'name' => 'feeling driven', 'category_id' => 4],
+    ['id' => 53,  'name' => 'in a hurry', 'category_id' => 4],
+    ['id' => 54,  'name' => 'can\'t turn off thoughts', 'category_id' => 4],
+    ['id' => 55,  'name' => 'skipping meals', 'category_id' => 4],
+    ['id' => 56,  'name' => 'binge eating (usually at night)', 'category_id' => 4],
+    ['id' => 57,  'name' => 'overspending', 'category_id' => 4],
+    ['id' => 58,  'name' => 'can\'t identify own feelings/needs', 'category_id' => 4],
+    ['id' => 59,  'name' => 'repetitive, negative thoughts', 'category_id' => 4],
+    ['id' => 60,  'name' => 'irritable', 'category_id' => 4],
+    ['id' => 61,  'name' => 'making excuses for "having to do it all"', 'category_id' => 4],
+    ['id' => 62,  'name' => 'dramatic mood swings', 'category_id' => 4],
+    ['id' => 63,  'name' => 'lust', 'category_id' => 4],
+    ['id' => 64,  'name' => 'too much caffeine', 'category_id' => 4],
+    ['id' => 65,  'name' => 'over exercising', 'category_id' => 4],
+    ['id' => 66,  'name' => 'nervousness', 'category_id' => 4],
+    ['id' => 67,  'name' => 'difficulty being alone or with people', 'category_id' => 4],
+    ['id' => 68,  'name' => 'difficulty listening to others', 'category_id' => 4],
+    ['id' => 69,  'name' => 'avoiding support', 'category_id' => 4],
+    ['id' => 70,  'name' => 'procrastination causing crises in money, work, or relationships', 'category_id' => 5],
+    ['id' => 71,  'name' => 'sarcasm', 'category_id' => 5],
+    ['id' => 72,  'name' => 'black and white, all or nothing thinking', 'category_id' => 5],
+    ['id' => 73,  'name' => 'feeling that no one understands', 'category_id' => 5],
+    ['id' => 74,  'name' => 'overreacting', 'category_id' => 5],
+    ['id' => 75,  'name' => 'road rage', 'category_id' => 5],
+    ['id' => 76,  'name' => 'constant resentments', 'category_id' => 5],
+    ['id' => 77,  'name' => 'pushing others away', 'category_id' => 5],
+    ['id' => 78,  'name' => 'increased isolation', 'category_id' => 5],
+    ['id' => 79,  'name' => 'blaming', 'category_id' => 5],
+    ['id' => 80,  'name' => 'self pity', 'category_id' => 5],
+    ['id' => 81,  'name' => 'arguing', 'category_id' => 5],
+    ['id' => 82,  'name' => 'irrationality', 'category_id' => 5],
+    ['id' => 83,  'name' => 'can\'t handle criticism', 'category_id' => 5],
+    ['id' => 84,  'name' => 'defensive', 'category_id' => 5],
+    ['id' => 85,  'name' => 'people are avoiding you', 'category_id' => 5],
+    ['id' => 86,  'name' => 'having to be right', 'category_id' => 5],
+    ['id' => 87,  'name' => 'digestive problems', 'category_id' => 5],
+    ['id' => 88,  'name' => 'headaches', 'category_id' => 5],
+    ['id' => 89,  'name' => 'obsessive (stuck) thoughts', 'category_id' => 5],
+    ['id' => 90,  'name' => 'can\'t forgive', 'category_id' => 5],
+    ['id' => 91,  'name' => 'feeling grandiose (superior)', 'category_id' => 5],
+    ['id' => 92,  'name' => 'intimidation', 'category_id' => 5],
+    ['id' => 93,  'name' => 'feeling aggressive', 'category_id' => 5],
+    ['id' => 94,  'name' => 'depressed', 'category_id' => 6],
+    ['id' => 95,  'name' => 'panicked', 'category_id' => 6],
+    ['id' => 96,  'name' => 'confused', 'category_id' => 6],
+    ['id' => 97,  'name' => 'hopeless', 'category_id' => 6],
+    ['id' => 98,  'name' => 'sleeping too much or too little', 'category_id' => 6],
+    ['id' => 99,  'name' => 'can\'t cope', 'category_id' => 6],
+    ['id' => 100, 'name' => 'overwhelmed', 'category_id' => 6],
+    ['id' => 101, 'name' => 'crying for "no reason"', 'category_id' => 6],
+    ['id' => 102, 'name' => 'can\'t think', 'category_id' => 6],
+    ['id' => 103, 'name' => 'forgetful', 'category_id' => 6],
+    ['id' => 104, 'name' => 'pessimistic', 'category_id' => 6],
+    ['id' => 105, 'name' => 'helpless', 'category_id' => 6],
+    ['id' => 106, 'name' => 'tired', 'category_id' => 6],
+    ['id' => 107, 'name' => 'numb', 'category_id' => 6],
+    ['id' => 108, 'name' => 'wanting to run', 'category_id' => 6],
+    ['id' => 109, 'name' => 'constant cravings for old coping behaviors', 'category_id' => 6],
+    ['id' => 110, 'name' => 'thinking of using drugs and alcohol', 'category_id' => 6],
+    ['id' => 111, 'name' => 'seeking out old unhealthy people and places', 'category_id' => 6],
+    ['id' => 112, 'name' => 'really isolated', 'category_id' => 6],
+    ['id' => 113, 'name' => 'people are angry with you', 'category_id' => 6],
+    ['id' => 114, 'name' => 'self-abuse', 'category_id' => 6],
+    ['id' => 115, 'name' => 'suicidal thoughts', 'category_id' => 6],
+    ['id' => 116, 'name' => 'no goals', 'category_id' => 6],
+    ['id' => 117, 'name' => 'survival mode', 'category_id' => 6],
+    ['id' => 118, 'name' => 'not returning phone calls', 'category_id' => 6],
+    ['id' => 119, 'name' => 'missing work', 'category_id' => 6],
+    ['id' => 120, 'name' => 'irritability', 'category_id' => 6],
+    ['id' => 121, 'name' => 'loss of appetite', 'category_id' => 6],
+    ['id' => 122, 'name' => 'returning to the place you swore you would never go again', 'category_id' => 7],
+    ['id' => 123, 'name' => 'giving up', 'category_id' => 7],
+    ['id' => 124, 'name' => 'giving in', 'category_id' => 7],
+    ['id' => 125, 'name' => 'out of control', 'category_id' => 7],
+    ['id' => 126, 'name' => 'lost in your addiction', 'category_id' => 7],
+    ['id' => 127, 'name' => 'lying to yourself and others', 'category_id' => 7],
+    ['id' => 128, 'name' => 'feeling you just can\'t manage without your coping behavior, at least for now', 'category_id' => 7],
+    ['id' => 129, 'name' => 'shame', 'category_id' => 7],
+    ['id' => 130, 'name' => 'condemnation', 'category_id' => 7],
+    ['id' => 131, 'name' => 'guilt', 'category_id' => 7],
+    ['id' => 132, 'name' => 'aloneness', 'category_id' => 7],
+  ];
 
   /**
    * @inheritdoc

Spacing +99 added lines, -99 removed lines

@@ -14,103 +14,103 @@ 
 class Behavior extends \yii\base\BaseObject implements BehaviorInterface
 {
 	public static $behaviors = [
-		['id' => 1,   'name' => 'no current secrets', 'category_id' => 1],
-		['id' => 2,   'name' => 'resolving problems', 'category_id' => 1],
-		['id' => 3,   'name' => 'identifying fears and feelings', 'category_id' => 1],
-		['id' => 4,   'name' => 'keeping commitments to meetings, prayer, family, church, people, goals, and self', 'category_id' => 1],
-		['id' => 5,   'name' => 'being open', 'category_id' => 1],
-		['id' => 6,   'name' => 'being honest', 'category_id' => 1],
-		['id' => 7,   'name' => 'making eye contact', 'category_id' => 1],
-		['id' => 8,   'name' => 'reaching out to others', 'category_id' => 1],
-		['id' => 9,   'name' => 'increasing in relationships with God and others', 'category_id' => 1],
-		['id' => 10,  'name' => 'accountability', 'category_id' => 1],
-		['id' => 11,  'name' => 'secrets', 'category_id' => 2],
-		['id' => 12,  'name' => 'bored', 'category_id' => 2],
-		['id' => 13,  'name' => 'less time/energy for God, meetings, and church', 'category_id' => 2],
-		['id' => 14,  'name' => 'avoiding support and accountability towards people', 'category_id' => 2],
-		['id' => 15,  'name' => 'superficial conversations', 'category_id' => 2],
-		['id' => 16,  'name' => 'sarcasm', 'category_id' => 2],
-		['id' => 17,  'name' => 'isolating yourself', 'category_id' => 2],
-		['id' => 18,  'name' => 'changes in goals', 'category_id' => 2],
-		['id' => 19,  'name' => 'flirting', 'category_id' => 2],
-		['id' => 20,  'name' => 'obsessed with relationships', 'category_id' => 2],
-		['id' => 21,  'name' => 'breaking promises/commitments', 'category_id' => 2],
-		['id' => 22,  'name' => 'neglecting family', 'category_id' => 2],
-		['id' => 23,  'name' => 'preoccupation with material things, television, or entertainment', 'category_id' => 2],
-		['id' => 24,  'name' => 'procrastination', 'category_id' => 2],
-		['id' => 25,  'name' => 'lying', 'category_id' => 2],
-		['id' => 26,  'name' => 'over-confidence', 'category_id' => 2],
-		['id' => 27,  'name' => 'hiding money', 'category_id' => 2],
-		['id' => 28,  'name' => 'worry', 'category_id' => 3],
-		['id' => 29,  'name' => 'using profanity', 'category_id' => 3],
-		['id' => 30,  'name' => 'being fearful', 'category_id' => 3],
-		['id' => 31,  'name' => 'being resentful', 'category_id' => 3],
-		['id' => 32,  'name' => 'replaying old, negative thoughts', 'category_id' => 3],
-		['id' => 33,  'name' => 'perfectionism', 'category_id' => 3],
-		['id' => 34,  'name' => 'judging others\' motives', 'category_id' => 3],
-		['id' => 35,  'name' => 'making goals and lists you can\'t complete', 'category_id' => 3],
-		['id' => 36,  'name' => 'poor planning', 'category_id' => 3],
-		['id' => 37,  'name' => 'mind reading', 'category_id' => 3],
-		['id' => 38,  'name' => 'fantasy', 'category_id' => 3],
-		['id' => 41,  'name' => 'co-dependent rescuing', 'category_id' => 3],
-		['id' => 42,  'name' => 'sleep problems', 'category_id' => 3],
-		['id' => 43,  'name' => 'trouble concentrating', 'category_id' => 3],
-		['id' => 44,  'name' => 'seeking/creating drama', 'category_id' => 3],
-		['id' => 45,  'name' => 'gossip', 'category_id' => 3],
-		['id' => 46,  'name' => 'using over-the-counter medication for pain, sleep, and weight control', 'category_id' => 3],
-		['id' => 47,  'name' => 'super busy', 'category_id' => 4],
-		['id' => 48,  'name' => 'workaholic', 'category_id' => 4],
-		['id' => 49,  'name' => 'can\'t relax', 'category_id' => 4],
-		['id' => 50,  'name' => 'driving too fast', 'category_id' => 4],
-		['id' => 51,  'name' => 'avoiding slowing down', 'category_id' => 4],
-		['id' => 52,  'name' => 'feeling driven', 'category_id' => 4],
-		['id' => 53,  'name' => 'in a hurry', 'category_id' => 4],
-		['id' => 54,  'name' => 'can\'t turn off thoughts', 'category_id' => 4],
-		['id' => 55,  'name' => 'skipping meals', 'category_id' => 4],
-		['id' => 56,  'name' => 'binge eating (usually at night)', 'category_id' => 4],
-		['id' => 57,  'name' => 'overspending', 'category_id' => 4],
-		['id' => 58,  'name' => 'can\'t identify own feelings/needs', 'category_id' => 4],
-		['id' => 59,  'name' => 'repetitive, negative thoughts', 'category_id' => 4],
-		['id' => 60,  'name' => 'irritable', 'category_id' => 4],
-		['id' => 61,  'name' => 'making excuses for "having to do it all"', 'category_id' => 4],
-		['id' => 62,  'name' => 'dramatic mood swings', 'category_id' => 4],
-		['id' => 63,  'name' => 'lust', 'category_id' => 4],
-		['id' => 64,  'name' => 'too much caffeine', 'category_id' => 4],
-		['id' => 65,  'name' => 'over exercising', 'category_id' => 4],
-		['id' => 66,  'name' => 'nervousness', 'category_id' => 4],
-		['id' => 67,  'name' => 'difficulty being alone or with people', 'category_id' => 4],
-		['id' => 68,  'name' => 'difficulty listening to others', 'category_id' => 4],
-		['id' => 69,  'name' => 'avoiding support', 'category_id' => 4],
-		['id' => 70,  'name' => 'procrastination causing crises in money, work, or relationships', 'category_id' => 5],
-		['id' => 71,  'name' => 'sarcasm', 'category_id' => 5],
-		['id' => 72,  'name' => 'black and white, all or nothing thinking', 'category_id' => 5],
-		['id' => 73,  'name' => 'feeling that no one understands', 'category_id' => 5],
-		['id' => 74,  'name' => 'overreacting', 'category_id' => 5],
-		['id' => 75,  'name' => 'road rage', 'category_id' => 5],
-		['id' => 76,  'name' => 'constant resentments', 'category_id' => 5],
-		['id' => 77,  'name' => 'pushing others away', 'category_id' => 5],
-		['id' => 78,  'name' => 'increased isolation', 'category_id' => 5],
-		['id' => 79,  'name' => 'blaming', 'category_id' => 5],
-		['id' => 80,  'name' => 'self pity', 'category_id' => 5],
-		['id' => 81,  'name' => 'arguing', 'category_id' => 5],
-		['id' => 82,  'name' => 'irrationality', 'category_id' => 5],
-		['id' => 83,  'name' => 'can\'t handle criticism', 'category_id' => 5],
-		['id' => 84,  'name' => 'defensive', 'category_id' => 5],
-		['id' => 85,  'name' => 'people are avoiding you', 'category_id' => 5],
-		['id' => 86,  'name' => 'having to be right', 'category_id' => 5],
-		['id' => 87,  'name' => 'digestive problems', 'category_id' => 5],
-		['id' => 88,  'name' => 'headaches', 'category_id' => 5],
-		['id' => 89,  'name' => 'obsessive (stuck) thoughts', 'category_id' => 5],
-		['id' => 90,  'name' => 'can\'t forgive', 'category_id' => 5],
-		['id' => 91,  'name' => 'feeling grandiose (superior)', 'category_id' => 5],
-		['id' => 92,  'name' => 'intimidation', 'category_id' => 5],
-		['id' => 93,  'name' => 'feeling aggressive', 'category_id' => 5],
-		['id' => 94,  'name' => 'depressed', 'category_id' => 6],
-		['id' => 95,  'name' => 'panicked', 'category_id' => 6],
-		['id' => 96,  'name' => 'confused', 'category_id' => 6],
-		['id' => 97,  'name' => 'hopeless', 'category_id' => 6],
-		['id' => 98,  'name' => 'sleeping too much or too little', 'category_id' => 6],
-		['id' => 99,  'name' => 'can\'t cope', 'category_id' => 6],
+		['id' => 1, 'name' => 'no current secrets', 'category_id' => 1],
+		['id' => 2, 'name' => 'resolving problems', 'category_id' => 1],
+		['id' => 3, 'name' => 'identifying fears and feelings', 'category_id' => 1],
+		['id' => 4, 'name' => 'keeping commitments to meetings, prayer, family, church, people, goals, and self', 'category_id' => 1],
+		['id' => 5, 'name' => 'being open', 'category_id' => 1],
+		['id' => 6, 'name' => 'being honest', 'category_id' => 1],
+		['id' => 7, 'name' => 'making eye contact', 'category_id' => 1],
+		['id' => 8, 'name' => 'reaching out to others', 'category_id' => 1],
+		['id' => 9, 'name' => 'increasing in relationships with God and others', 'category_id' => 1],
+		['id' => 10, 'name' => 'accountability', 'category_id' => 1],
+		['id' => 11, 'name' => 'secrets', 'category_id' => 2],
+		['id' => 12, 'name' => 'bored', 'category_id' => 2],
+		['id' => 13, 'name' => 'less time/energy for God, meetings, and church', 'category_id' => 2],
+		['id' => 14, 'name' => 'avoiding support and accountability towards people', 'category_id' => 2],
+		['id' => 15, 'name' => 'superficial conversations', 'category_id' => 2],
+		['id' => 16, 'name' => 'sarcasm', 'category_id' => 2],
+		['id' => 17, 'name' => 'isolating yourself', 'category_id' => 2],
+		['id' => 18, 'name' => 'changes in goals', 'category_id' => 2],
+		['id' => 19, 'name' => 'flirting', 'category_id' => 2],
+		['id' => 20, 'name' => 'obsessed with relationships', 'category_id' => 2],
+		['id' => 21, 'name' => 'breaking promises/commitments', 'category_id' => 2],
+		['id' => 22, 'name' => 'neglecting family', 'category_id' => 2],
+		['id' => 23, 'name' => 'preoccupation with material things, television, or entertainment', 'category_id' => 2],
+		['id' => 24, 'name' => 'procrastination', 'category_id' => 2],
+		['id' => 25, 'name' => 'lying', 'category_id' => 2],
+		['id' => 26, 'name' => 'over-confidence', 'category_id' => 2],
+		['id' => 27, 'name' => 'hiding money', 'category_id' => 2],
+		['id' => 28, 'name' => 'worry', 'category_id' => 3],
+		['id' => 29, 'name' => 'using profanity', 'category_id' => 3],
+		['id' => 30, 'name' => 'being fearful', 'category_id' => 3],
+		['id' => 31, 'name' => 'being resentful', 'category_id' => 3],
+		['id' => 32, 'name' => 'replaying old, negative thoughts', 'category_id' => 3],
+		['id' => 33, 'name' => 'perfectionism', 'category_id' => 3],
+		['id' => 34, 'name' => 'judging others\' motives', 'category_id' => 3],
+		['id' => 35, 'name' => 'making goals and lists you can\'t complete', 'category_id' => 3],
+		['id' => 36, 'name' => 'poor planning', 'category_id' => 3],
+		['id' => 37, 'name' => 'mind reading', 'category_id' => 3],
+		['id' => 38, 'name' => 'fantasy', 'category_id' => 3],
+		['id' => 41, 'name' => 'co-dependent rescuing', 'category_id' => 3],
+		['id' => 42, 'name' => 'sleep problems', 'category_id' => 3],
+		['id' => 43, 'name' => 'trouble concentrating', 'category_id' => 3],
+		['id' => 44, 'name' => 'seeking/creating drama', 'category_id' => 3],
+		['id' => 45, 'name' => 'gossip', 'category_id' => 3],
+		['id' => 46, 'name' => 'using over-the-counter medication for pain, sleep, and weight control', 'category_id' => 3],
+		['id' => 47, 'name' => 'super busy', 'category_id' => 4],
+		['id' => 48, 'name' => 'workaholic', 'category_id' => 4],
+		['id' => 49, 'name' => 'can\'t relax', 'category_id' => 4],
+		['id' => 50, 'name' => 'driving too fast', 'category_id' => 4],
+		['id' => 51, 'name' => 'avoiding slowing down', 'category_id' => 4],
+		['id' => 52, 'name' => 'feeling driven', 'category_id' => 4],
+		['id' => 53, 'name' => 'in a hurry', 'category_id' => 4],
+		['id' => 54, 'name' => 'can\'t turn off thoughts', 'category_id' => 4],
+		['id' => 55, 'name' => 'skipping meals', 'category_id' => 4],
+		['id' => 56, 'name' => 'binge eating (usually at night)', 'category_id' => 4],
+		['id' => 57, 'name' => 'overspending', 'category_id' => 4],
+		['id' => 58, 'name' => 'can\'t identify own feelings/needs', 'category_id' => 4],
+		['id' => 59, 'name' => 'repetitive, negative thoughts', 'category_id' => 4],
+		['id' => 60, 'name' => 'irritable', 'category_id' => 4],
+		['id' => 61, 'name' => 'making excuses for "having to do it all"', 'category_id' => 4],
+		['id' => 62, 'name' => 'dramatic mood swings', 'category_id' => 4],
+		['id' => 63, 'name' => 'lust', 'category_id' => 4],
+		['id' => 64, 'name' => 'too much caffeine', 'category_id' => 4],
+		['id' => 65, 'name' => 'over exercising', 'category_id' => 4],
+		['id' => 66, 'name' => 'nervousness', 'category_id' => 4],
+		['id' => 67, 'name' => 'difficulty being alone or with people', 'category_id' => 4],
+		['id' => 68, 'name' => 'difficulty listening to others', 'category_id' => 4],
+		['id' => 69, 'name' => 'avoiding support', 'category_id' => 4],
+		['id' => 70, 'name' => 'procrastination causing crises in money, work, or relationships', 'category_id' => 5],
+		['id' => 71, 'name' => 'sarcasm', 'category_id' => 5],
+		['id' => 72, 'name' => 'black and white, all or nothing thinking', 'category_id' => 5],
+		['id' => 73, 'name' => 'feeling that no one understands', 'category_id' => 5],
+		['id' => 74, 'name' => 'overreacting', 'category_id' => 5],
+		['id' => 75, 'name' => 'road rage', 'category_id' => 5],
+		['id' => 76, 'name' => 'constant resentments', 'category_id' => 5],
+		['id' => 77, 'name' => 'pushing others away', 'category_id' => 5],
+		['id' => 78, 'name' => 'increased isolation', 'category_id' => 5],
+		['id' => 79, 'name' => 'blaming', 'category_id' => 5],
+		['id' => 80, 'name' => 'self pity', 'category_id' => 5],
+		['id' => 81, 'name' => 'arguing', 'category_id' => 5],
+		['id' => 82, 'name' => 'irrationality', 'category_id' => 5],
+		['id' => 83, 'name' => 'can\'t handle criticism', 'category_id' => 5],
+		['id' => 84, 'name' => 'defensive', 'category_id' => 5],
+		['id' => 85, 'name' => 'people are avoiding you', 'category_id' => 5],
+		['id' => 86, 'name' => 'having to be right', 'category_id' => 5],
+		['id' => 87, 'name' => 'digestive problems', 'category_id' => 5],
+		['id' => 88, 'name' => 'headaches', 'category_id' => 5],
+		['id' => 89, 'name' => 'obsessive (stuck) thoughts', 'category_id' => 5],
+		['id' => 90, 'name' => 'can\'t forgive', 'category_id' => 5],
+		['id' => 91, 'name' => 'feeling grandiose (superior)', 'category_id' => 5],
+		['id' => 92, 'name' => 'intimidation', 'category_id' => 5],
+		['id' => 93, 'name' => 'feeling aggressive', 'category_id' => 5],
+		['id' => 94, 'name' => 'depressed', 'category_id' => 6],
+		['id' => 95, 'name' => 'panicked', 'category_id' => 6],
+		['id' => 96, 'name' => 'confused', 'category_id' => 6],
+		['id' => 97, 'name' => 'hopeless', 'category_id' => 6],
+		['id' => 98, 'name' => 'sleeping too much or too little', 'category_id' => 6],
+		['id' => 99, 'name' => 'can\'t cope', 'category_id' => 6],
 		['id' => 100, 'name' => 'overwhelmed', 'category_id' => 6],
 		['id' => 101, 'name' => 'crying for "no reason"', 'category_id' => 6],
 		['id' => 102, 'name' => 'can\'t think', 'category_id' => 6],
@@ -181,10 +181,10 @@ 
     $bhvrs_by_cat = AH::index(self::$behaviors, null, 'category_id');
     $cats = AH::index(\common\models\Category::$categories, "id");
     $weights_sum = array_sum(array_column($cats, 'weight'));
-    foreach($cats as $id => &$cat) {
+    foreach ($cats as $id => &$cat) {
       $cat['behavior_count'] = count($bhvrs_by_cat[$id]); // add count of behaviors
       $cat['category_id'] = $cat['id']; // rename id to category_id 
-      $cat['weight'] = (100 * $cat['weight']) / $weights_sum; // normalize weight
+      $cat['weight'] = (100*$cat['weight'])/$weights_sum; // normalize weight
       unset($cat['id']);
     }
     return $cats;

common/models/UserBehavior.php

Spacing +15 added lines, -15 removed lines

@@ -85,7 +85,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']);
     }
 
@@ -114,7 +114,7 @@ 
 
   public function getDailyScore($date = null) {
     // default to today's score
-    if(is_null($date)) $date = $this->time->getLocalDate();
+    if (is_null($date)) $date = $this->time->getLocalDate();
 
     list($start, $end) = $this->time->getUTCBookends($date);
     $score = $this->calculateScoreByUTCRange($start, $end);
@@ -147,9 +147,9 @@ 
   }
 
   public function calculateScoresOfLastMonth() {
-    $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 = [];
 
       $dt = new DateTime("now", new DateTimeZone("UTC"));
@@ -166,8 +166,8 @@ 
   }
 
   public function calculateScore($usr_bhvrs, $all_cats = null) {
-    if(!!!$usr_bhvrs) return [];
-    if(!!!$all_cats)  $all_cats = $this->behavior->getCategories();
+    if (!!!$usr_bhvrs) return [];
+    if (!!!$all_cats)  $all_cats = $this->behavior->getCategories();
 
     $usr_bhvrs = array_reduce($usr_bhvrs, function($carry, $bhvr) {
       $date = $this->time->convertUTCToLocal($bhvr['date']);
@@ -176,7 +176,7 @@ 
     }, []);
 
     $scores = [];
-    foreach($usr_bhvrs as $date => $bhvrs) {
+    foreach ($usr_bhvrs as $date => $bhvrs) {
       $picked = array_reduce($bhvrs, function($carry, $bhvr) {
         $carry[$bhvr['category_id']][] = $bhvr['id'];
         return $carry;
@@ -190,14 +190,14 @@ 
   }
 
   private function _getCatGrades($picked, $all_cats = null) {
-    if(!!!$all_cats) $all_cats = $this->behavior->getCategories();
+    if (!!!$all_cats) $all_cats = $this->behavior->getCategories();
 
     return array_reduce($all_cats, function($carry, $cat) use($picked) {
-      if(array_key_exists($cat['category_id'], $picked)) {
+      if (array_key_exists($cat['category_id'], $picked)) {
         $count = count($picked[$cat['category_id']]);
-        $prcnt_2x = ($count / $cat['behavior_count']) * 2;
+        $prcnt_2x = ($count/$cat['behavior_count'])*2;
         // because we're doubling the % we want to ensure we don't take more than 100%
-        $carry[$cat['category_id']] = $cat['weight'] * min($prcnt_2x, 1);
+        $carry[$cat['category_id']] = $cat['weight']*min($prcnt_2x, 1);
       } else {
         $carry[$cat['category_id']] = 0;
       }
@@ -228,7 +228,7 @@ 
 
     return array_values(array_reduce(self::decorateWithCategory($query->all(), false), 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] = [
@@ -241,10 +241,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']);
         }
       }

Braces +12 added lines, -4 removed lines

@@ -114,7 +114,9 @@ 
 
   public function getDailyScore($date = null) {
     // default to today's score
-    if(is_null($date)) $date = $this->time->getLocalDate();
+    if(is_null($date)) {
+      $date = $this->time->getLocalDate();
+    }
 
     list($start, $end) = $this->time->getUTCBookends($date);
     $score = $this->calculateScoreByUTCRange($start, $end);
@@ -166,8 +168,12 @@ 
   }
 
   public function calculateScore($usr_bhvrs, $all_cats = null) {
-    if(!!!$usr_bhvrs) return [];
-    if(!!!$all_cats)  $all_cats = $this->behavior->getCategories();
+    if(!!!$usr_bhvrs) {
+      return [];
+    }
+    if(!!!$all_cats) {
+      $all_cats = $this->behavior->getCategories();
+    }
 
     $usr_bhvrs = array_reduce($usr_bhvrs, function($carry, $bhvr) {
       $date = $this->time->convertUTCToLocal($bhvr['date']);
@@ -190,7 +196,9 @@ 
   }
 
   private function _getCatGrades($picked, $all_cats = null) {
-    if(!!!$all_cats) $all_cats = $this->behavior->getCategories();
+    if(!!!$all_cats) {
+      $all_cats = $this->behavior->getCategories();
+    }
 
     return array_reduce($all_cats, function($carry, $cat) use($picked) {
       if(array_key_exists($cat['category_id'], $picked)) {

common/config/main.php

Spacing +2 added lines, -2 removed lines

@@ -10,8 +10,8 @@
       'common\interfaces\QuestionInterface' => '\common\models\Question',
       'common\interfaces\BehaviorInterface' => '\common\models\Behavior',
       'common\interfaces\CategoryInterface' => '\common\models\Category',
-      '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/assets/assets.php

Indentation +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
  */
 
 // In the console environment, some path aliases may not exist. Please define these:
- Yii::setAlias('@webroot', __DIR__ . '/../web');
- Yii::setAlias('@web', '/');
+  Yii::setAlias('@webroot', __DIR__ . '/../web');
+  Yii::setAlias('@web', '/');
 
 $mainConf = require(Yii::getAlias('@site/config/main.php'));
 $converter = $mainConf['components']['assetManager']['converter'];

site/tests/unit/models/QuestionFormTest.php

Indentation +49 added lines, -49 removed lines

@@ -85,10 +85,10 @@ 
       $model->answer_2c = 'answering question c';
 
       expect('behaviorToAnswers should return the answer properties related to the behavior number supplied', $this->assertEquals($model->behaviorToAnswers(1), [
-                                                               'a' => 'answering question a',
-                                                               'b' => 'answering question b',
-                                                               'c' => 'answering question c'
-                                                             ]));
+                                                                'a' => 'answering question a',
+                                                                'b' => 'answering question b',
+                                                                'c' => 'answering question c'
+                                                              ]));
 
       expect('behaviorToAnswers should return the the empty set when there are no answers associated with the supplied behavior number', $this->assertEmpty($model->behaviorToAnswers(7)));
     });
@@ -117,51 +117,51 @@ 
         $this->fakeModel(13, 281),
         $this->fakeModel(28, 284)
       ]), [ [
-										'behavior_id' => 280,
-										'user_bhvr_id' => 7,
-										'question_id' => 1,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 280,
-										'user_bhvr_id' => 7,
-										'question_id' => 2,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 280,
-										'user_bhvr_id' => 7,
-										'question_id' => 3,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 281,
-										'user_bhvr_id' => 13,
-										'question_id' => 1,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 281,
-										'user_bhvr_id' => 13,
-										'question_id' => 2,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 281,
-										'user_bhvr_id' => 13,
-										'question_id' => 3,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 284,
-										'user_bhvr_id' => 28,
-										'question_id' => 1,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 284,
-										'user_bhvr_id' => 28,
-										'question_id' => 2,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 284,
-										'user_bhvr_id' => 28,
-										'question_id' => 3,
-										'answer' => 'processing emotions',
-									]]));
+                    'behavior_id' => 280,
+                    'user_bhvr_id' => 7,
+                    'question_id' => 1,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 280,
+                    'user_bhvr_id' => 7,
+                    'question_id' => 2,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 280,
+                    'user_bhvr_id' => 7,
+                    'question_id' => 3,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 281,
+                    'user_bhvr_id' => 13,
+                    'question_id' => 1,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 281,
+                    'user_bhvr_id' => 13,
+                    'question_id' => 2,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 281,
+                    'user_bhvr_id' => 13,
+                    'question_id' => 3,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 284,
+                    'user_bhvr_id' => 28,
+                    'question_id' => 1,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 284,
+                    'user_bhvr_id' => 28,
+                    'question_id' => 2,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 284,
+                    'user_bhvr_id' => 28,
+                    'question_id' => 3,
+                    'answer' => 'processing emotions',
+                  ]]));
     });
   }
 

Spacing +4 added lines, -4 removed lines

@@ -17,14 +17,14 @@ 
     $this->container->set('common\interfaces\UserInterface', '\site\tests\_support\MockUser');
     $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');
     });
   }
 
   public function testAttributeLabels()
   {
-    $this->specify('setBehaviors should function properly', function () {
+    $this->specify('setBehaviors should function properly', function() {
       $model = $this->container->get('\site\models\QuestionForm');
       expect('attributeLabels should be correct', $this->assertEquals($model->attributeLabels(), [
         'user_behavior_id1' => 'Restoration',
@@ -43,7 +43,7 @@ 
     $model = $this->container->get('\site\models\QuestionForm');
     $validator = $model->getBhvrValidator();
 
-    $this->specify('getBhvrValidator should function properly', function () use($model, $validator) {
+    $this->specify('getBhvrValidator should function properly', function() use($model, $validator) {
       expect('getBhvrValidator should return false when nothing is set on the form', $this->assertFalse($validator($model, "user_behavior_id1")));
       expect('getBhvrValidator should return false when nothing is set on the form', $this->assertFalse($validator($model, "user_behavior_id7")));
 
@@ -116,7 +116,7 @@ 
         $this->fakeModel(7, 280),
         $this->fakeModel(13, 281),
         $this->fakeModel(28, 284)
-      ]), [ [
+      ]), [[
 										'behavior_id' => 280,
 										'user_bhvr_id' => 7,
 										'question_id' => 1,

site/tests/unit/models/SignupFormTest.php

Indentation +5 added lines, -5 removed lines

@@ -141,13 +141,13 @@ 
       expect('the form should validate correctly', $this->assertTrue($form->validate()));
       $user = $form->signup();
       expect('signup() should return a newly-saved user when the user does not already exist with the submitted values',
-             $this->assertEquals($user->getAttributes($this->whitelist), array_splice($this->vals, 2)));
+              $this->assertEquals($user->getAttributes($this->whitelist), array_splice($this->vals, 2)));
       expect('the "Remember Me" auth_key value should be set to a random string (defaults to a 32 char length)',
-             $this->assertEquals(32, strlen($user->auth_key)));
+              $this->assertEquals(32, strlen($user->auth_key)));
       expect('password_hash to be set to something like a hash',
-             $this->assertStringStartsWith('$2y$13$', $user->password_hash));
+              $this->assertStringStartsWith('$2y$13$', $user->password_hash));
       expect('when the user is created, signup() should call save()',
-             $this->assertTrue($saved));
+              $this->assertTrue($saved));
       expect('This user should be an isNewRecord -- they should NOT already exist', $this->assertTrue($user->getIsNewRecord()));
     });
   }
@@ -191,7 +191,7 @@ 
       $user = $form3->signup();
       expect('This user should not be an isNewRecord -- they should already exist', $this->assertFalse($user->getIsNewRecord()));
       expect('signup() should return a newly-saved user when the user does not already exist with the submitted values',
-             $this->assertEquals($user->getAttributes($this->whitelist), array_splice($this->vals, 2)));
+              $this->assertEquals($user->getAttributes($this->whitelist), array_splice($this->vals, 2)));
       expect('when the user exists and is NOT confirmed, signup() should call save() to UPDATE their info', $this->assertTrue($saved));
     });
   }

Spacing +8 added lines, -8 removed lines

@@ -33,13 +33,13 @@ 
     $this->container = new \yii\di\Container;
     $this->container->set('common\interfaces\UserInterface', '\site\tests\_support\MockUser');
     $this->container->set('common\interfaces\UserBehaviorInterface', '\site\tests\_support\MockUserBehavior');
-    $this->container->set('common\interfaces\TimeInterface', function () {
+    $this->container->set('common\interfaces\TimeInterface', function() {
       return new \common\components\Time('America/Los_Angeles');
     });
 
     // instantiate mock objects
     $user_behavior = $this->container->get('common\interfaces\UserBehaviorInterface');
-    $time        = $this->container->get('common\interfaces\TimeInterface');
+    $time = $this->container->get('common\interfaces\TimeInterface');
 
     $question = $this->getMockBuilder('\common\models\Question')
       ->setMethods(['save', 'attributes'])
@@ -128,7 +128,7 @@ 
 
     // set up a side effect to occur when the user's save() function is called
     $saved = false;
-    $this->user->method('save')->will($this->returnCallback(function($runValidation=true, $attributeNames=null) use(&$saved) {
+    $this->user->method('save')->will($this->returnCallback(function($runValidation = true, $attributeNames = null) use(&$saved) {
       $saved = true;
       return $this->user;
     }));
@@ -154,7 +154,7 @@ 
  
   public function testSignupExistingConfirmedUser() {
     $saved = false;
-    $this->existing_user->method('save')->will($this->returnCallback(function($runValidation=true, $attributeNames=null) use(&$saved) {
+    $this->existing_user->method('save')->will($this->returnCallback(function($runValidation = true, $attributeNames = null) use(&$saved) {
       $saved = true;
       return $this->existing_user;
     }));
@@ -173,7 +173,7 @@ 
 
   public function testSignupExistingUnconfirmedUser() {
     $saved = false;
-    $this->existing_user->method('save')->will($this->returnCallback(function($runValidation=true, $attributeNames=null) use(&$saved) {
+    $this->existing_user->method('save')->will($this->returnCallback(function($runValidation = true, $attributeNames = null) use(&$saved) {
       $saved = true;
       return $this->existing_user;
     }));
@@ -204,14 +204,14 @@ 
 
     $result = $form->setFields($this->user);
     $this->specify('populate should set the values of the user model from the form', function() use ($result) {
-      foreach($this->whitelist as $attr) {
+      foreach ($this->whitelist as $attr) {
         $this->assertEquals($this->vals[$attr], $result->$attr);
       }
     });
   }
 
   private function setAttrs($form, Array $vals) {
-    foreach($vals as $key => $val) {
+    foreach ($vals as $key => $val) {
       $form->$key = $val;
     }
     return $form;
@@ -232,7 +232,7 @@ 
   }
 
   private function getForm($user = null) {
-    if(is_null($user)) $user = $this->user;
+    if (is_null($user)) $user = $this->user;
     $form = $this->container->get('\site\models\SignupForm', [$user]);
     $form->attributes = $this->vals; // massive assignment
     return $form;

Braces +3 added lines, -1 removed lines

@@ -232,7 +232,9 @@
   }
 
   private function getForm($user = null) {
-    if(is_null($user)) $user = $this->user;
+    if(is_null($user)) {
+      $user = $this->user;
+    }
     $form = $this->container->get('\site\models\SignupForm', [$user]);
     $form->attributes = $this->vals; // massive assignment
     return $form;

site/tests/unit/models/CheckinFormTest.php

Indentation +140 added lines, -140 removed lines

@@ -8,103 +8,103 @@ 
 {
     use \Codeception\Specify;
 
-		public $behaviors = [
-			1 => [
-				'category_name' => 'Restoration',
-				'behaviors' => [
-					0 => [
-						'id' => 7,
-						'name' => 'making eye contact',
-					],
-				],
-			],
-			2 => [
-				'category_name' => 'Forgetting Priorities',
-				'behaviors' => [
-					0 => [
-						'id' => 12,
-						'name' => 'bored',
-					],
-					1 => [
-						'id' => 13,
-						'name' => 'less time/energy for God, meetings, and church',
-					],
-					2 => [
-						'id' => 17,
-						'name' => 'isolating yourself',
-					],
-					3 => [
-						'id' => 18,
-						'name' => 'changes in goals',
-					],
-				],
-			],
-			3 => [
-				'category_name' => 'Anxiety',
-				'behaviors' => [
-					0 => [
-						'id' => 28,
-						'name' => 'worry',
-					],
-					1 => [
-						'id' => 38,
-						'name' => 'fantasy',
-					],
-					2 => [
-						'id' => 46,
-						'name' => 'using over-the-counter medication for pain, sleep, and weight control',
-					],
-				],
-			],
-			4 => [
-				'category_name' => 'Speeding Up',
-				'behaviors' => [
-					0 => [
-						'id' => 47,
-						'name' => 'super busy',
-					],
-					1 => [
-						'id' => 56,
-						'name' => 'binge eating (usually at night]',
-					],
-					2 => [
-						'id' => 62,
-						'name' => 'dramatic mood swings',
-					],
-				],
-			],
-			5 => [
-				'category_name' => 'Ticked Off',
-				'behaviors' => [
-					0 => [
-						'id' => 78,
-						'name' => 'increased isolation',
-					],
-					1 => [
-						'id' => 79,
-						'name' => 'blaming',
-					],
-				],
-			],
-			6 => [
-				'category_name' => 'Exhausted',
-				'behaviors' => [
-					0 => [
-						'id' => 104,
-						'name' => 'pessimistic',
-					],
-				],
-			],
-			7 => [
-				'category_name' => 'Relapse/Moral Failure',
-				'behaviors' => [
-					0 => [
-						'id' => 128,
-						'name' => 'feeling you just can\'t manage without your coping behavior, at least for now',
-					],
-				],
-			],
-		];
+    public $behaviors = [
+      1 => [
+        'category_name' => 'Restoration',
+        'behaviors' => [
+          0 => [
+            'id' => 7,
+            'name' => 'making eye contact',
+          ],
+        ],
+      ],
+      2 => [
+        'category_name' => 'Forgetting Priorities',
+        'behaviors' => [
+          0 => [
+            'id' => 12,
+            'name' => 'bored',
+          ],
+          1 => [
+            'id' => 13,
+            'name' => 'less time/energy for God, meetings, and church',
+          ],
+          2 => [
+            'id' => 17,
+            'name' => 'isolating yourself',
+          ],
+          3 => [
+            'id' => 18,
+            'name' => 'changes in goals',
+          ],
+        ],
+      ],
+      3 => [
+        'category_name' => 'Anxiety',
+        'behaviors' => [
+          0 => [
+            'id' => 28,
+            'name' => 'worry',
+          ],
+          1 => [
+            'id' => 38,
+            'name' => 'fantasy',
+          ],
+          2 => [
+            'id' => 46,
+            'name' => 'using over-the-counter medication for pain, sleep, and weight control',
+          ],
+        ],
+      ],
+      4 => [
+        'category_name' => 'Speeding Up',
+        'behaviors' => [
+          0 => [
+            'id' => 47,
+            'name' => 'super busy',
+          ],
+          1 => [
+            'id' => 56,
+            'name' => 'binge eating (usually at night]',
+          ],
+          2 => [
+            'id' => 62,
+            'name' => 'dramatic mood swings',
+          ],
+        ],
+      ],
+      5 => [
+        'category_name' => 'Ticked Off',
+        'behaviors' => [
+          0 => [
+            'id' => 78,
+            'name' => 'increased isolation',
+          ],
+          1 => [
+            'id' => 79,
+            'name' => 'blaming',
+          ],
+        ],
+      ],
+      6 => [
+        'category_name' => 'Exhausted',
+        'behaviors' => [
+          0 => [
+            'id' => 104,
+            'name' => 'pessimistic',
+          ],
+        ],
+      ],
+      7 => [
+        'category_name' => 'Relapse/Moral Failure',
+        'behaviors' => [
+          0 => [
+            'id' => 128,
+            'name' => 'feeling you just can\'t manage without your coping behavior, at least for now',
+          ],
+        ],
+      ],
+    ];
 
     protected function setUp() {
       $this->container = new \yii\di\Container;
@@ -115,8 +115,8 @@ 
       parent::setUp();
     }
 
-		public function testAttributeLabels()
-		{
+    public function testAttributeLabels()
+    {
         $this->specify('setBehaviors should function properly', function () {
           $model = $this->container->get('\site\models\CheckinForm');
           expect('attributeLabels should be correct', $this->assertEquals($model->attributeLabels(), [
@@ -135,7 +135,7 @@ 
     {
         $this->specify('setBehaviors should function properly', function () {
           $model = $this->container->get('\site\models\CheckinForm');
-					$model->setBehaviors($this->behaviors);
+          $model->setBehaviors($this->behaviors);
 
           expect('behaviors1 should be correct', $this->assertEquals($model->behaviors1, [ 0 => 7 ]));
           expect('behaviors2 should be correct', $this->assertEquals($model->behaviors2, [ 0 => 12, 1 => 13, 2 => 17, 3 => 18 ]));
@@ -145,7 +145,7 @@ 
           expect('behaviors6 should be correct', $this->assertEquals($model->behaviors6, [ 0 => 104 ]));
           expect('behaviors7 should be correct', $this->assertEquals($model->behaviors7, [ 0 => 128 ]));
 
-					$model->setBehaviors($this->behaviors);
+          $model->setBehaviors($this->behaviors);
           expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors1, [ 0 => 7 ]));
           expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors2, [ 0 => 12, 1 => 13, 2 => 17, 3 => 18 ]));
           expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors3, [ 0 => 28, 1 => 38, 2 => 46 ]));
@@ -156,64 +156,64 @@ 
         });
     }
 
-		public function testValidateBehaviors()
-		{
+    public function testValidateBehaviors()
+    {
         $this->specify('validateBehaviors should function properly', function () {
           $model = $this->container->get('\site\models\CheckinForm');
-					$model->setBehaviors($this->behaviors);
+          $model->setBehaviors($this->behaviors);
           expect('validation should be good', $this->assertTrue($model->validate()));
 
           $model->behaviors1[0] = 'bad';
           expect('validation should be bad', $this->assertFalse($model->validate()));
         });
-		}
+    }
 
-		public function testCompileBehaviors()
-		{
+    public function testCompileBehaviors()
+    {
         $this->specify('compileBehaviors should function properly', function () {
           $model = $this->container->get('\site\models\CheckinForm');
-					$model->setBehaviors($this->behaviors);
+          $model->setBehaviors($this->behaviors);
           expect('compiling behaviors should be return a correct array', $this->assertEquals($model->compileBehaviors(), [
-											  	0 => 7,
-											  	1 => 12,
-											  	2 => 13,
-											  	3 => 17,
-											  	4 => 18,
-											  	5 => 28,
-											  	6 => 38,
-											  	7 => 46,
-											  	8 => 47,
-											  	9 => 56,
-											  	10 => 62,
-											  	11 => 78,
-											  	12 => 79,
-											  	13 => 104,
-											  	14 => 128,
-											  ]));
+                          0 => 7,
+                          1 => 12,
+                          2 => 13,
+                          3 => 17,
+                          4 => 18,
+                          5 => 28,
+                          6 => 38,
+                          7 => 46,
+                          8 => 47,
+                          9 => 56,
+                          10 => 62,
+                          11 => 78,
+                          12 => 79,
+                          13 => 104,
+                          14 => 128,
+                        ]));
 
           $model = $this->container->get('\site\models\CheckinForm');
-					$model->setBehaviors($this->behaviors);
+          $model->setBehaviors($this->behaviors);
           $model->behaviors1[0] = null;
           $model->behaviors2[0] = null;
           $model->behaviors3[0] = null;
           expect('compiling behaviors should strip out any falsy values', $this->assertEquals($model->compileBehaviors(), [
-											  	2 => 13,
-											  	3 => 17,
-											  	4 => 18,
-											  	6 => 38,
-											  	7 => 46,
-											  	8 => 47,
-											  	9 => 56,
-											  	10 => 62,
-											  	11 => 78,
-											  	12 => 79,
-											  	13 => 104,
-											  	14 => 128,
-											  ]));
+                          2 => 13,
+                          3 => 17,
+                          4 => 18,
+                          6 => 38,
+                          7 => 46,
+                          8 => 47,
+                          9 => 56,
+                          10 => 62,
+                          11 => 78,
+                          12 => 79,
+                          13 => 104,
+                          14 => 128,
+                        ]));
 
           $model = $this->container->get('\site\models\CheckinForm');
-					$model->setBehaviors([]);
+          $model->setBehaviors([]);
           expect('compiling behaviors should return an empty array when no behaviors are set', $this->assertEmpty($model->compileBehaviors()));
         });
-		}
+    }
 }

Spacing +19 added lines, -19 removed lines

@@ -109,7 +109,7 @@ 
     protected function setUp() {
       $this->container = new \yii\di\Container;
       $this->container->set('common\interfaces\UserBehaviorInterface', '\site\tests\_support\MockUserBehavior');
-    $this->container->set('common\interfaces\TimeInterface', function () {
+    $this->container->set('common\interfaces\TimeInterface', function() {
       return new \common\components\Time('America/Los_Angeles');
     });
       parent::setUp();
@@ -117,7 +117,7 @@ 
 
 		public function testAttributeLabels()
 		{
-        $this->specify('setBehaviors should function properly', function () {
+        $this->specify('setBehaviors should function properly', function() {
           $model = $this->container->get('\site\models\CheckinForm');
           expect('attributeLabels should be correct', $this->assertEquals($model->attributeLabels(), [
             'behaviors1' => 'Restoration',
@@ -133,32 +133,32 @@ 
 
     public function testSetBehaviors()
     {
-        $this->specify('setBehaviors should function properly', function () {
+        $this->specify('setBehaviors should function properly', function() {
           $model = $this->container->get('\site\models\CheckinForm');
 					$model->setBehaviors($this->behaviors);
 
-          expect('behaviors1 should be correct', $this->assertEquals($model->behaviors1, [ 0 => 7 ]));
-          expect('behaviors2 should be correct', $this->assertEquals($model->behaviors2, [ 0 => 12, 1 => 13, 2 => 17, 3 => 18 ]));
-          expect('behaviors3 should be correct', $this->assertEquals($model->behaviors3, [ 0 => 28, 1 => 38, 2 => 46 ]));
-          expect('behaviors4 should be correct', $this->assertEquals($model->behaviors4, [ 0 => 47, 1 => 56, 2 => 62 ]));
-          expect('behaviors5 should be correct', $this->assertEquals($model->behaviors5, [ 0 => 78, 1 => 79 ]));
-          expect('behaviors6 should be correct', $this->assertEquals($model->behaviors6, [ 0 => 104 ]));
-          expect('behaviors7 should be correct', $this->assertEquals($model->behaviors7, [ 0 => 128 ]));
+          expect('behaviors1 should be correct', $this->assertEquals($model->behaviors1, [0 => 7]));
+          expect('behaviors2 should be correct', $this->assertEquals($model->behaviors2, [0 => 12, 1 => 13, 2 => 17, 3 => 18]));
+          expect('behaviors3 should be correct', $this->assertEquals($model->behaviors3, [0 => 28, 1 => 38, 2 => 46]));
+          expect('behaviors4 should be correct', $this->assertEquals($model->behaviors4, [0 => 47, 1 => 56, 2 => 62]));
+          expect('behaviors5 should be correct', $this->assertEquals($model->behaviors5, [0 => 78, 1 => 79]));
+          expect('behaviors6 should be correct', $this->assertEquals($model->behaviors6, [0 => 104]));
+          expect('behaviors7 should be correct', $this->assertEquals($model->behaviors7, [0 => 128]));
 
 					$model->setBehaviors($this->behaviors);
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors1, [ 0 => 7 ]));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors2, [ 0 => 12, 1 => 13, 2 => 17, 3 => 18 ]));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors3, [ 0 => 28, 1 => 38, 2 => 46 ]));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors4, [ 0 => 47, 1 => 56, 2 => 62 ]));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors5, [ 0 => 78, 1 => 79 ]));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors6, [ 0 => 104 ]));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors7, [ 0 => 128 ]));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors1, [0 => 7]));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors2, [0 => 12, 1 => 13, 2 => 17, 3 => 18]));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors3, [0 => 28, 1 => 38, 2 => 46]));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors4, [0 => 47, 1 => 56, 2 => 62]));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors5, [0 => 78, 1 => 79]));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors6, [0 => 104]));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors7, [0 => 128]));
         });
     }
 
 		public function testValidateBehaviors()
 		{
-        $this->specify('validateBehaviors should function properly', function () {
+        $this->specify('validateBehaviors should function properly', function() {
           $model = $this->container->get('\site\models\CheckinForm');
 					$model->setBehaviors($this->behaviors);
           expect('validation should be good', $this->assertTrue($model->validate()));
@@ -170,7 +170,7 @@ 
 
 		public function testCompileBehaviors()
 		{
-        $this->specify('compileBehaviors should function properly', function () {
+        $this->specify('compileBehaviors should function properly', function() {
           $model = $this->container->get('\site\models\CheckinForm');
 					$model->setBehaviors($this->behaviors);
           expect('compiling behaviors should be return a correct array', $this->assertEquals($model->compileBehaviors(), [

site/tests/_support/AcceptanceTester.php

Indentation +3 added lines, -3 removed lines

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

site/tests/_support/MockUser.php

Indentation +7 added lines, -7 removed lines

@@ -7,13 +7,13 @@
   public $timezone = 'America/Los_Angeles';
   public $password;
 
- public static function findIdentity($id) {}
- public static function findIdentityByAccessToken($token, $type = null) {}
- public function getId() {}
- public function getAuthKey() {}
- public function validateAuthKey($authKey) {}
- public function validatePassword($password) {}
- public function setPassword($password) {}
+  public static function findIdentity($id) {}
+  public static function findIdentityByAccessToken($token, $type = null) {}
+  public function getId() {}
+  public function getAuthKey() {}
+  public function validateAuthKey($authKey) {}
+  public function validatePassword($password) {}
+  public function setPassword($password) {}
 
   public static function primaryKey() {}
   public function attributes() {}