[5.8] Reworked env to allow getenv/putenv to be disabled

src/Bootstrap/LoadEnvironmentVariables.php

@@ -3,11 +3,8 @@
 namespace Laravel\Lumen\Bootstrap;
 
 use Dotenv\Dotenv;
-use Dotenv\Environment\DotenvFactory;
+use Illuminate\Support\Env;
 use Dotenv\Exception\InvalidFileException;
-use Dotenv\Environment\Adapter\PutenvAdapter;
-use Dotenv\Environment\Adapter\EnvConstAdapter;
-use Dotenv\Environment\Adapter\ServerConstAdapter;
 use Symfony\Component\Console\Output\ConsoleOutput;
 
 class LoadEnvironmentVariables
@@ -68,7 +65,7 @@ protected function createDotenv()
         return Dotenv::create(
             $this->filePath,
             $this->fileName,
-            new DotenvFactory([new EnvConstAdapter, new PutenvAdapter, new ServerConstAdapter])
+            Env::getFactory()
         );
     }
 

src/helpers.php

@@ -1,13 +1,8 @@
 <?php
 
-use PhpOption\Option;
 use Illuminate\Container\Container;
-use Dotenv\Environment\DotenvFactory;
 use Laravel\Lumen\Bus\PendingDispatch;
 use Illuminate\Contracts\Bus\Dispatcher;
-use Dotenv\Environment\Adapter\PutenvAdapter;
-use Dotenv\Environment\Adapter\EnvConstAdapter;
-use Dotenv\Environment\Adapter\ServerConstAdapter;
 
 if (! function_exists('abort')) {
     /**
@@ -148,48 +143,6 @@ function encrypt($value)
     }
 }
 
-if (! function_exists('env')) {
-    /**
-     * Gets the value of an environment variable.
-     *
-     * @param  string  $key
-     * @param  mixed   $default
-     * @return mixed
-     */
-    function env($key, $default = null)
-    {
-        static $variables;
-
-        if ($variables === null) {
-            $variables = (new DotenvFactory([new EnvConstAdapter, new PutenvAdapter, new ServerConstAdapter]))
-                ->createImmutable();
-        }
-
-        return Option::fromValue($variables->get($key))
-            ->map(function ($value) {
-                switch (strtolower($value)) {
-                    case 'true':
-                    case '(true)':
-                        return true;
-                    case 'false':
-                    case '(false)':
-                        return false;
-                    case 'empty':
-                    case '(empty)':
-                        return '';
-                    case 'null':
-                    case '(null)':
-                        return;
-                }
-
-                return $value;
-            })
-            ->getOrCall(function () use ($default) {
-                return value($default);
-            });
-    }
-}
-
 if (! function_exists('event')) {
     /**
      * Dispatch an event and call the listeners.