Minor Tweaks (#304)

See commit messages for detail.

Author: GrahamCampbell

src/Dotenv.php

@@ -50,7 +50,7 @@ public static function create($path, $file = null, FactoryInterface $envFactory
             true
         );
 
-        return new Dotenv($loader);
+        return new self($loader);
     }
 
 
@@ -68,9 +68,7 @@ private static function getFilePath($path, $file)
             $file = '.env';
         }
 
-        $filePath = rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.$file;
-
-        return $filePath;
+        return rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.$file;
     }
 
     /**

src/Environment/AbstractVariables.php

@@ -2,8 +2,6 @@
 
 namespace Dotenv\Environment;
 
-use ArrayAccess;
-
 /**
  * This is the abstract variables implementation.
  *

src/Loader.php

@@ -305,7 +305,7 @@ protected function sanitiseVariableValue($name, $value)
                 %1$s           # match a quote at the start of the value
                 (              # capturing sub-pattern used
                  (?:           # we do not need to capture this
-                  [^%1$s\\\\]* # any character other than a quote or backslash
+                  [^%1$s\\\\]+ # any character other than a quote or backslash
                   |\\\\\\\\    # or two backslashes together
                   |\\\\%1$s    # or an escaped quote e.g \"
                  )*            # as many characters that match the previous rules