CorWatts / fasterscale

console/migrations/m160403_060352_delete_incorrect_behaviors.php

Indentation +1 added lines, -1 removed lines

@@ -15,6 +15,6 @@
         $this->batchInsert("{{%option}}", ["name", "category_id"],[
             ["masturbation", 3]
             , ["pornography", 3]
-       ]);
+        ]);
     }
 }

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
     public function safeDown()
     {
-        $this->batchInsert("{{%option}}", ["name", "category_id"],[
+        $this->batchInsert("{{%option}}", ["name", "category_id"], [
             ["masturbation", 3]
             , ["pornography", 3]
        ]);

console/migrations/m150407_034100_fix_typo_in_option.php

Indentation +1 added lines, -1 removed lines

@@ -12,6 +12,6 @@
 
     public function down()
     {
-		echo "Why even revert this.";
+    echo "Why even revert this.";
     }
 }

console/migrations/m140609_010314_populate_category_and_options_table.php

Indentation +33 added lines, -33 removed lines

@@ -120,39 +120,39 @@
             ["sleeping too much or too little", 6],
             ["can't cope", 6],
             ["overwhelmed", 6],
-			['crying for "no reason"', 6],
-			["can't think", 6],
-			["forgetful", 6],
-			["pessimistic", 6],
-			["helpless", 6],
-			["tired", 6],
-			["numb", 6],
-			["wanting to run", 6],
-			["constant cravings for old coping behaviors", 6],
-			["thinking of using drugs and alcohol", 6],
-			["seeking out old unhealthy people and places", 6],
-			["really isolated", 6],
-			["people are angry with you", 6],
-			["self-abuse", 6],
-			["suicidal thoughts", 6],
-			["no goals", 6],
-			["survival mode", 6],
-			["not returning phone calls", 6],
-			["missing work", 6],
-			["irritability", 6],
-			["loss of appetite", 6],
-			["returning to the place you swore you would never go again", 7],
-			["giving up", 7],
-			["giving in", 7],
-			["out of control", 7],
-			["lost in your addiction", 7],
-			["lying to yourself and others", 7],
-			["feeling you just can't manage without your coping behavior, at least for now", 7],
-			["shame", 7],
-			["condemnation", 7],
-			["guilt", 7],
-			["aloneness", 7]
-       ]);
+      ['crying for "no reason"', 6],
+      ["can't think", 6],
+      ["forgetful", 6],
+      ["pessimistic", 6],
+      ["helpless", 6],
+      ["tired", 6],
+      ["numb", 6],
+      ["wanting to run", 6],
+      ["constant cravings for old coping behaviors", 6],
+      ["thinking of using drugs and alcohol", 6],
+      ["seeking out old unhealthy people and places", 6],
+      ["really isolated", 6],
+      ["people are angry with you", 6],
+      ["self-abuse", 6],
+      ["suicidal thoughts", 6],
+      ["no goals", 6],
+      ["survival mode", 6],
+      ["not returning phone calls", 6],
+      ["missing work", 6],
+      ["irritability", 6],
+      ["loss of appetite", 6],
+      ["returning to the place you swore you would never go again", 7],
+      ["giving up", 7],
+      ["giving in", 7],
+      ["out of control", 7],
+      ["lost in your addiction", 7],
+      ["lying to yourself and others", 7],
+      ["feeling you just can't manage without your coping behavior, at least for now", 7],
+      ["shame", 7],
+      ["condemnation", 7],
+      ["guilt", 7],
+      ["aloneness", 7]
+        ]);
     }
 
     public function safeDown()

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
          */
 
 
-        $this->batchInsert("{{%option}}", ["name", "category_id"],[
+        $this->batchInsert("{{%option}}", ["name", "category_id"], [
             ["no current secrets", 1],
             ["resolving problems", 1],
             ["identifying fears and feelings", 1],

common/components/Time.php

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
   }
 
   public function getLocalTime($timezone = null) {
-    if($timezone === null)
+    if ($timezone === null)
       $timezone = $this->timezone;
 
     $timestamp = new DateTime("now", new DateTimeZone($timezone));
@@ -39,7 +39,7 @@ 
   }
 
   public function getLocalDate($timezone = null) {
-    if($timezone === null)
+    if ($timezone === null)
       $timezone = $this->timezone;
 
     return (new DateTime("now", new DateTimeZone($timezone)))
@@ -53,7 +53,7 @@ 
 
   public function getUTCBookends($local) {
     $local = trim($local);
-    if(strpos($local, " ")) {
+    if (strpos($local, " ")) {
       return false;
     }
 

Braces +6 added lines, -4 removed lines

@@ -31,16 +31,18 @@
   }
 
   public function getLocalTime($timezone = null) {
-    if($timezone === null)
-      $timezone = $this->timezone;
+    if($timezone === null) {
+          $timezone = $this->timezone;
+    }
 
     $timestamp = new DateTime("now", new DateTimeZone($timezone));
     return $timestamp->format("Y-m-d H:i:s");
   }
 
   public function getLocalDate($timezone = null) {
-    if($timezone === null)
-      $timezone = $this->timezone;
+    if($timezone === null) {
+          $timezone = $this->timezone;
+    }
 
     return (new DateTime("now", new DateTimeZone($timezone)))
       ->format("Y-m-d");

common/components/Graph.php

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
   public function getFilepath() {
     $path = Yii::getAlias('@graphImgPath');
     $filename = $this->user->getIdHash() . ".png";
-    return $path. '/' . $filename;
+    return $path . '/' . $filename;
   }
 
   /**
@@ -58,7 +58,7 @@ 
    * @return string the encoded image
    */
   public function create(array $values, bool $save = false) {
-    if($save) {
+    if ($save) {
       // wipe out the current image, if it exists
       $this->destroy();
     }
@@ -95,9 +95,9 @@ 
     imagepng($img);
     $img_data = ob_get_clean();
 
-    if($save) {
+    if ($save) {
       $filepath = $this->getFilepath(); 
-      if(!is_dir(dirname($filepath))) {
+      if (!is_dir(dirname($filepath))) {
         mkdir(dirname($filepath), 0766, true);
       }
 

common/components/Utility.php

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
   public static $REVISION_FILE = "./REVISION";
 
   public static function getGithubRevUrl($file = false) {
-    if($hash = self::getRevHash($file)) {
+    if ($hash = self::getRevHash($file)) {
       return "https://github.com/CorWatts/fasterscale/commit/$hash";
     }
     return false;
@@ -15,7 +15,7 @@ 
 
   public static function getRevHash($file = false) {
     $file = $file ?: self::$REVISION_FILE;
-    if(is_file($file) && is_readable($file)) {
+    if (is_file($file) && is_readable($file)) {
       return substr(file_get_contents($file), 0, 7);
     }
     return false;

common/tests/unit/components/TimeTest.php

Spacing +8 added lines, -8 removed lines

@@ -33,7 +33,7 @@ 
       $this->container->set('common\interfaces\UserBehaviorInterface', '\site\tests\_support\MockUserBehavior');
       $this->container->set('common\interfaces\QuestionInterface', '\site\tests\_support\MockQuestion');
 
-      $this->container->set('common\interfaces\TimeInterface', function () {
+      $this->container->set('common\interfaces\TimeInterface', function() {
         return new \common\components\Time('America/Los_Angeles');
       });
       //$this->container->set('common\interfaces\TimeInterface', '\common\components\Time');
@@ -50,7 +50,7 @@ 
 
     public function testGetLocalTime()
     {
-      $this->specify('getLocalTime should function correctly', function () {
+      $this->specify('getLocalTime should function correctly', function() {
         expect("getLocalTime should work with user's set time", $this->assertEquals($this->time->getLocalTime(), (new DateTime("now", new DateTimeZone("America/Los_Angeles")))->format("Y-m-d H:i:s")));
         expect('getLocalTime should work with a custom timezone', $this->assertEquals($this->time->getLocalTime("UTC"), (new DateTime("now"))->format("Y-m-d H:i:s")));
       });
@@ -58,13 +58,13 @@ 
 
     public function testConvertLocalToUTC()
     {
-      $this->specify('convertLocalToUTC should function correctly', function () {
+      $this->specify('convertLocalToUTC should function correctly', function() {
         $la_tz = (new DateTime("now", new DateTimeZone("America/Los_Angeles")))->format("Y-m-d H:i:s");
 
         expect('convertLocalToUTC should convert a Los Angeles tz to UTC with the included time', $this->assertEquals($this->time->convertLocalToUTC($la_tz), (new DateTime("now"))->format("Y-m-d H:i:s")));
         expect('convertLocalToUTC should convert a Los Angeles tz to UTC without the included time', $this->assertEquals($this->time->convertLocalToUTC($la_tz, false), (new DateTime("now"))->format("Y-m-d")));
         // with UTC
-        $this->container->set('common\interfaces\TimeInterface', function () {
+        $this->container->set('common\interfaces\TimeInterface', function() {
           return new \common\components\Time('UTC');
         });
         $time = $this->container->get('common\interfaces\TimeInterface');
@@ -77,14 +77,14 @@ 
 
     public function testConvertUTCToLocal()
     {
-      $this->specify('convertUTCToLocal should function correctly', function () {
+      $this->specify('convertUTCToLocal should function correctly', function() {
         $utc_tz = (new DateTime("now"))->format("Y-m-d H:i:s");
 
         expect('convertUTCToLocal should convert a UTC tz to Los Angeles with the included timezone', $this->assertEquals((new DateTime("now", new DateTimeZone("America/Los_Angeles")))->format(DateTime::ATOM), $this->time->convertUTCToLocal($utc_tz)));
         expect('convertUTCToLocal should convert a UTC tz to Los Angeles without the included timezone', $this->assertEquals($this->time->convertUTCToLocal($utc_tz, false), (new DateTime("now", new DateTimeZone("America/Los_Angeles")))->format("Y-m-d H:i:s")));
 
         // with UTC
-        $this->container->set('common\interfaces\TimeInterface', function () {
+        $this->container->set('common\interfaces\TimeInterface', function() {
           return new \common\components\Time('UTC');
         });
         $time = $this->container->get('common\interfaces\TimeInterface');
@@ -97,7 +97,7 @@ 
 
     public function testGetLocalDate()
     {
-      $this->specify('getLocalDate should function correctly', function () {
+      $this->specify('getLocalDate should function correctly', function() {
         expect("getLocalDate should correctly get the user's local date", $this->assertEquals($this->time->getLocalDate(), (new DateTime("now", new DateTimeZone("America/Los_Angeles")))->format("Y-m-d")));
         expect("getLocalDate should correctly get the local date of a specified timezone", $this->assertEquals($this->time->getLocalDate("UTC"), (new DateTime("now", new DateTimeZone("UTC")))->format("Y-m-d")));
       });
@@ -119,7 +119,7 @@ 
         expect('getUTCBookends should return false if there is a space at the end of the time string', $this->assertFalse($this->time->getUTCBookends('2016-05-30 00:00:00 ')));
         expect('getUTCBookends should return UTC bookend times from the Los_Angeles tz', $this->assertEquals($this->time->getUTCBookends('2016-05-30'), ['2016-05-30 07:00:00', '2016-05-31 06:59:59']));
         // with UTC
-        $this->container->set('common\interfaces\TimeInterface', function () {
+        $this->container->set('common\interfaces\TimeInterface', function() {
           return new \common\components\Time('UTC');
         });
         $time = $this->container->get('common\interfaces\TimeInterface');

common/tests/unit/components/UtilityTest.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
   protected function tearDown()
   {
     // just in case we're forgetful :)
-    if(file_exists(Utility::$REVISION_FILE)) $this->_deleteRevFile();
+    if (file_exists(Utility::$REVISION_FILE)) $this->_deleteRevFile();
     parent::tearDown();
   }
 
@@ -37,7 +37,7 @@ 
 
   public function testGetRevHash()
   {
-    $this->specify('getRevHash should function correctly', function () {
+    $this->specify('getRevHash should function correctly', function() {
       expect('getRevHash should return false when the file does not exist', $this->assertFalse(Utility::getRevHash()));
 
       $this->_createRevFile();

Braces +3 added lines, -1 removed lines

@@ -22,7 +22,9 @@
   protected function tearDown()
   {
     // just in case we're forgetful :)
-    if(file_exists(Utility::$REVISION_FILE)) $this->_deleteRevFile();
+    if(file_exists(Utility::$REVISION_FILE)) {
+      $this->_deleteRevFile();
+    }
     parent::tearDown();
   }
 

common/tests/unit/components/GraphTest.php

Spacing +5 added lines, -5 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() {
@@ -64,7 +64,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));
@@ -103,7 +103,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));