Bootstrap environment

phpunit/phpunit/4.7/phpunit.xml.dist

@@ -5,16 +5,15 @@
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.1/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="vendor/autoload.php"
+         bootstrap="tests/bootstrap.php"
 >
     <php>
         <ini name="error_reporting" value="-1" />
         <env name="KERNEL_CLASS" value="App\Kernel" />
-        <env name="APP_ENV" value="test" />
-        <env name="APP_DEBUG" value="1" />
-        <env name="APP_SECRET" value="s$cretf0rt3st" />
         <env name="SHELL_VERBOSITY" value="-1" />
-        <!-- define your env variables for the test env here -->
+
+        <!-- override or set env variables for the test env here -->
+        <env name="APP_ENV" value="test" />
     </php>
 
     <testsuites>

phpunit/phpunit/4.7/tests/bootstrap.php

@@ -0,0 +1,18 @@
+<?php
+
+require __DIR__.'/../vendor/autoload.php';
+
+use App\Kernel;
+
+/*
+ * Environment variables can also be specified in phpunit.xml.dist.
+ * Those variables will override any defined in .env.
+ */
+
+Kernel::bootstrapEnvironment($_ENV['APP_ENV'] ?? null);
+
+$debug = $_SERVER['APP_DEBUG'] ?? true;
+
+if ($debug) {
+    umask(0000);
+}

symfony/console/3.3/bin/console

@@ -5,7 +5,6 @@ use App\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Debug\Debug;
-use Symfony\Component\Dotenv\Dotenv;
 
 set_time_limit(0);
 
@@ -15,15 +14,11 @@ if (!class_exists(Application::class)) {
     throw new \RuntimeException('You need to add "symfony/framework-bundle" as a Composer dependency.');
 }
 
-if (!isset($_SERVER['APP_ENV'])) {
-    if (!class_exists(Dotenv::class)) {
-        throw new \RuntimeException('APP_ENV environment variable is not defined. You need to define environment variables for configuration or add "symfony/dotenv" as a Composer dependency to load variables from a .env file.');
-    }
-    (new Dotenv())->load(__DIR__.'/../.env');
-}
-
 $input = new ArgvInput();
-$env = $input->getParameterOption(['--env', '-e'], $_SERVER['APP_ENV'] ?? 'dev', true);
+$env = $input->getParameterOption(['--env', '-e'], null, true);
+
+Kernel::bootstrapEnvironment($env);
+
 $debug = (bool) ($_SERVER['APP_DEBUG'] ?? ('prod' !== $env)) && !$input->hasParameterOption('--no-debug', true);
 
 if ($debug) {

symfony/framework-bundle/3.3/public/index.php

@@ -2,18 +2,11 @@
 
 use App\Kernel;
 use Symfony\Component\Debug\Debug;
-use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\HttpFoundation\Request;
 
 require __DIR__.'/../vendor/autoload.php';
 
-// The check is to ensure we don't use .env in production
-if (!isset($_SERVER['APP_ENV'])) {
-    if (!class_exists(Dotenv::class)) {
-        throw new \RuntimeException('APP_ENV environment variable is not defined. You need to define environment variables for configuration or add "symfony/dotenv" as a Composer dependency to load variables from a .env file.');
-    }
-    (new Dotenv())->load(__DIR__.'/../.env');
-}
+Kernel::bootstrapEnvironment();
 
 $env = $_SERVER['APP_ENV'] ?? 'dev';
 $debug = (bool) ($_SERVER['APP_DEBUG'] ?? ('prod' !== $env));

symfony/framework-bundle/3.3/src/Kernel.php

@@ -6,6 +6,7 @@
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
 use Symfony\Component\Routing\RouteCollectionBuilder;
 
@@ -35,6 +36,38 @@ public function registerBundles()
         }
     }
 
+    /**
+     * Bootstrap the environment if APP_ENV has not been set yet
+     * It will load the generic .env file and the .env for the APP_ENV set in the generic (if it exists)
+     *
+     * @param string|null $env If set it will load an additional ".env" file
+     */
+    public static function bootstrapEnvironment(string $env = null)
+    {
+        if (isset($_SERVER['APP_ENV'])) {
+            // environment is set, do not load .env
+            return;
+        }
+
+        $projectDir = __DIR__.'/..';
+        if (!class_exists(Dotenv::class) || !file_exists($projectDir.'/.env')) {
+            // Dotenv is not installed or generic env file is not present
+            return;
+        }
+
+        // Load default .env file
+        $dotEnv = new Dotenv();
+        $dotEnv->load($projectDir.'/.env');
+        $appEnv = $_SERVER['APP_ENV'] ?? 'dev';
+        if ($env && file_exists($file = "$projectDir/.env.$env")) {
+            // Load a specific environment requested by the user
+            $dotEnv->load($file);
+        } elseif ($appEnv && $appEnv !== $env && file_exists($file = "$projectDir/.env.$appEnv")) {
+            // Load the environment for the app set in the generic
+            $dotEnv->load($file);
+        }
+    }
+
     protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader)
     {
         $container->addResource(new FileResource($this->getProjectDir().'/config/bundles.php'));

symfony/phpunit-bridge/3.3/phpunit.xml.dist

@@ -5,16 +5,16 @@
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.1/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="vendor/autoload.php"
+         bootstrap="tests/bootstrap.php"
 >
     <php>
         <ini name="error_reporting" value="-1" />
         <env name="KERNEL_CLASS" value="App\Kernel" />
+        <env name="SHELL_VERBOSITY" value="-1" />
+
+        <!-- override or set env variables for the test env here -->
         <env name="APP_ENV" value="test" />
         <env name="APP_DEBUG" value="1" />
-        <env name="APP_SECRET" value="s$cretf0rt3st" />
-        <env name="SHELL_VERBOSITY" value="-1" />
-        <!-- define your env variables for the test env here -->
     </php>
 
     <testsuites>

symfony/phpunit-bridge/3.3/tests/bootstrap.php

@@ -0,0 +1,18 @@
+<?php
+
+require __DIR__.'/../vendor/autoload.php';
+
+use App\Kernel;
+
+/*
+ * Environment variables can also be specified in phpunit.xml.dist.
+ * Those variables will override any defined in .env.
+ */
+
+Kernel::bootstrapEnvironment($_ENV['APP_ENV'] ?? null);
+
+$debug = $_SERVER['APP_DEBUG'] ?? true;
+
+if ($debug) {
+    umask(0000);
+}