[2.6] Apply fixes from StyleCI (#424)

Author: GrahamCampbell

src/Loader.php

@@ -52,6 +52,7 @@ public function __construct($filePath, $immutable = false)
      * Set immutable value.
      *
      * @param bool $immutable
+     *
      * @return $this
      */
     public function setImmutable($immutable = false)
@@ -297,6 +298,7 @@ public function getEnvironmentVariable($name)
                 return $_SERVER[$name];
             default:
                 $value = getenv($name);
+
                 return $value === false ? null : $value; // switch getenv default to null
         }
     }

src/Parser.php

@@ -38,9 +38,9 @@ public static function parseValue($value)
         if ($value === '') {
             return '';
         } elseif ($value[0] === '"' || $value[0] === '\'') {
-            return Parser::parseQuotedValue($value);
+            return self::parseQuotedValue($value);
         } else {
-            return Parser::parseUnquotedValue($value);
+            return self::parseUnquotedValue($value);
         }
     }
 
@@ -57,42 +57,42 @@ public static function parseQuotedValue($value)
     {
         $data = array_reduce(str_split($value), function ($data, $char) use ($value) {
             switch ($data[1]) {
-                case Parser::INITIAL_STATE:
+                case self::INITIAL_STATE:
                     if ($char === '"' || $char === '\'') {
-                        return array($data[0], Parser::QUOTED_STATE);
+                        return array($data[0], self::QUOTED_STATE);
                     } else {
                         throw new InvalidFileException(
                             'Expected the value to start with a quote.'
                         );
                     }
-                case Parser::QUOTED_STATE:
+                case self::QUOTED_STATE:
                     if ($char === $value[0]) {
-                        return array($data[0], Parser::WHITESPACE_STATE);
+                        return array($data[0], self::WHITESPACE_STATE);
                     } elseif ($char === '\\') {
-                        return array($data[0], Parser::ESCAPE_STATE);
+                        return array($data[0], self::ESCAPE_STATE);
                     } else {
-                        return array($data[0].$char, Parser::QUOTED_STATE);
+                        return array($data[0].$char, self::QUOTED_STATE);
                     }
-                case Parser::ESCAPE_STATE:
+                case self::ESCAPE_STATE:
                     if ($char === $value[0] || $char === '\\') {
-                        return array($data[0].$char, Parser::QUOTED_STATE);
+                        return array($data[0].$char, self::QUOTED_STATE);
                     } else {
-                        return array($data[0].'\\'.$char, Parser::QUOTED_STATE);
+                        return array($data[0].'\\'.$char, self::QUOTED_STATE);
                     }
-                case Parser::WHITESPACE_STATE:
+                case self::WHITESPACE_STATE:
                     if ($char === '#') {
-                        return array($data[0], Parser::COMMENT_STATE);
+                        return array($data[0], self::COMMENT_STATE);
                     } elseif (!ctype_space($char)) {
                         throw new InvalidFileException(
                             'Dotenv values containing spaces must be surrounded by quotes.'
                         );
                     } else {
-                        return array($data[0], Parser::WHITESPACE_STATE);
+                        return array($data[0], self::WHITESPACE_STATE);
                     }
-                case Parser::COMMENT_STATE:
-                    return array($data[0], Parser::COMMENT_STATE);
+                case self::COMMENT_STATE:
+                    return array($data[0], self::COMMENT_STATE);
             }
-        }, array('', Parser::INITIAL_STATE));
+        }, array('', self::INITIAL_STATE));
 
         return trim($data[0]);
     }

src/Validator.php

@@ -90,7 +90,7 @@ function ($value) {
                     return false;
                 }
 
-                return (filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) !== NULL);
+                return filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) !== null;
             },
             'is not a boolean'
         );

tests/Dotenv/LoaderTest.php

@@ -17,7 +17,7 @@ class LoaderTest extends TestCase
 
     public function setUp()
     {
-        $folder = dirname(__DIR__) . '/fixtures/env';
+        $folder = dirname(__DIR__).'/fixtures/env';
 
         // Generate a new, random keyVal.
         $this->keyVal(true);
@@ -37,8 +37,6 @@ public function setUp()
      * key/value pairs.
      *
      * @param bool $reset
-     *   If true, a new pair will be generated. If false, the last returned pair
-     *   will be returned.
      *
      * @return array
      */
@@ -99,7 +97,6 @@ public function testMutableLoaderClearsEnvironmentVars()
         $this->assertSame(false, isset($_SERVER[$this->key()]));
         $this->assertTrue(is_array($this->mutableLoader->variableNames));
         $this->assertFalse(empty($this->mutableLoader->variableNames));
-
     }
 
     public function testImmutableLoaderSetUnsetImmutable()

tests/Dotenv/ValidatorBooleanTest.php

@@ -15,7 +15,7 @@ public function setUp()
     }
 
     /**
-     * List of valid boolean values in fixtures/env/booleans.env
+     * List of valid boolean values in fixtures/env/booleans.env.
      *
      * @return array
      */
@@ -62,7 +62,7 @@ public function testCanValidateBooleans($boolean)
     }
 
     /**
-     * List of non-boolean values in fixtures/env/booleans.env
+     * List of non-boolean values in fixtures/env/booleans.env.
      *
      * @return array
      */