Improved tests

Author: code-distortion

src/DotEnvAdapters/DotEnvAdapterPicker.php

@@ -51,7 +51,7 @@ public static function pickAdapter(array $order = ['vlucas', 'symfony']): DotEnv
     }
 
     /**
-     * Detect the version of vlucas/phpdotenv installed.
+     * Detect the version of vlucas/phpdotenv installed and return the appropriate adapter.
      *
      * @return DotEnvAdapterInterface|null
      */
@@ -72,7 +72,7 @@ public static function detectVLucasPhpDotEnv()
     }
 
     /**
-     * Detect the version of symfony/dotenv installed.
+     * Detect the version of symfony/dotenv installed and return the appropriate adapter.
      *
      * @return DotEnvAdapterInterface|null
      */

src/DotEnvAdapters/DotEnvAdapterTrait.php

@@ -15,7 +15,7 @@ trait DotEnvAdapterTrait
      * @param string $path The path to the .env file.
      * @return string
      */
-    protected function getDir(string $path): string
+    private function getDir(string $path): string
     {
         $temp = explode('/', $path);
         array_pop($temp); // remove the filename
@@ -28,7 +28,7 @@ protected function getDir(string $path): string
      * @param string $path The path to the .env file.
      * @return string
      */
-    protected function getFilename(string $path): string
+    private function getFilename(string $path): string
     {
         $temp = explode('/', $path);
         return array_pop($temp);

src/DotEnvAdapters/VLucas/VLucasAdapterV1.php

@@ -65,9 +65,9 @@ protected function importWillUpdateGetenvValues(): bool
     {
         // custom class VLucasV1Dotenv overrides Dotenv's setEnvironmentVariable() method
         // to remove the putenv() and $_ENV lines. HOWEVER:
-        // version <= 1.0.6 don't have the setEnvironmentVariable() method
-        // version <= 1.0.9 some issues in overriding setEnvironmentVariable()
-        // version ^1.1.0 is required in composer.json to avoid problems with these old versions
+        // - version <= 1.0.6 doesn't use the setEnvironmentVariable() method in the first place
+        // - version <= 1.0.9 has some issues in overriding setEnvironmentVariable()
+        // - version ^1.1.0 is required in composer.json to avoid problems with these old versions
 
         // otherwise…
         // not needed because vlucas/phpdotenv v1 is being used in a way where

src/Misc/GetenvSupport.php

@@ -21,19 +21,11 @@ public static function getAllGetenvVariables(): array
         }
 
         // getenv() requires a $key to be passed to it before PHP 7.1
-        try {
-
-            return @(array) getenv();
-
-        } catch (Throwable $e) {
-
-            // if needed, get the getenv() values individually
-            $values = [];
-            foreach (array_keys($_ENV) as $key) {
-                $values[$key] = getenv($key);
-            }
-            return $values;
+        if (version_compare(PHP_VERSION, '7.1.0', '<')) {
+            return self::getParticularGetenvVariables(array_keys($_ENV));
         }
+
+        return @(array) getenv();
     }
 
     /**