Rename DetectEnvironment to LoadEnvironmentVariables.

This bootstrapped didn’t actually “detect” the environment. It just
loads the environment variables.

Author: taylorotwell

src/Illuminate/Foundation/Application.php

@@ -218,7 +218,7 @@ public function bootstrapWith(array $bootstrappers)
     public function afterLoadingEnvironment(Closure $callback)
     {
         return $this->afterBootstrapping(
-            'Illuminate\Foundation\Bootstrap\DetectEnvironment', $callback
+            'Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables', $callback
         );
     }
 

src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php

@@ -28,20 +28,25 @@ public function bootstrap(Application $app)
             $loadedFromCache = true;
         }
 
-        $app->instance('config', $config = new Repository($items));
-
         // Next we will spin through all of the configuration files in the configuration
         // directory and load each one into the repository. This will make all of the
         // options available to the developer for use in various parts of this app.
+        $app->instance('config', $config = new Repository($items));
+
         if (! isset($loadedFromCache)) {
             $this->loadConfigurationFiles($app, $config);
         }
 
+        // Finally, we will set the application's environment based on the configuration
+        // values that were loaded. We will pass a callback which will be used to get
+        // the environment in a web context where an "--env" switch is not present.
         $app->detectEnvironment(function () use ($config) {
             return $config->get('app.env', 'production');
         });
 
-        $this->setPhpConfiguration($config);
+        date_default_timezone_set($config->get('app.timezone', 'UTC'));
+
+        mb_internal_encoding('UTF-8');
     }
 
     /**
@@ -74,17 +79,4 @@ protected function getConfigurationFiles(Application $app)
 
         return $files;
     }
-
-    /**
-     * Set a few PHP configuration options.
-     *
-     * @param  \Illuminate\Contracts\Config\Repository  $config
-     * @return void
-     */
-    protected function setPhpConfiguration(RepositoryContract $config)
-    {
-        date_default_timezone_set($config->get('app.timezone', 'UTC'));
-
-        mb_internal_encoding('UTF-8');
-    }
 }

…undation/Bootstrap/DetectEnvironment.php …n/Bootstrap/LoadEnvironmentVariables.phpsrc/Illuminate/Foundation/Bootstrap/DetectEnvironment.php renamed to src/Illuminate/Foundation/Bootstrap/LoadEnvironmentVariables.php src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php renamed to src/Illuminate/Foundation/Bootstrap/LoadEnvironmentVariables.php

@@ -7,7 +7,7 @@
 use Symfony\Component\Console\Input\ArgvInput;
 use Illuminate\Contracts\Foundation\Application;
 
-class DetectEnvironment
+class LoadEnvironmentVariables
 {
     /**
      * Bootstrap the given application.

src/Illuminate/Foundation/Console/Kernel.php

@@ -56,7 +56,7 @@ class Kernel implements KernelContract
      * @var array
      */
     protected $bootstrappers = [
-        'Illuminate\Foundation\Bootstrap\DetectEnvironment',
+        'Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables',
         'Illuminate\Foundation\Bootstrap\LoadConfiguration',
         'Illuminate\Foundation\Bootstrap\HandleExceptions',
         'Illuminate\Foundation\Bootstrap\RegisterFacades',

src/Illuminate/Foundation/Http/Kernel.php

@@ -34,7 +34,7 @@ class Kernel implements KernelContract
      * @var array
      */
     protected $bootstrappers = [
-        \Illuminate\Foundation\Bootstrap\DetectEnvironment::class,
+        \Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables::class,
         \Illuminate\Foundation\Bootstrap\LoadConfiguration::class,
         \Illuminate\Foundation\Bootstrap\HandleExceptions::class,
         \Illuminate\Foundation\Bootstrap\RegisterFacades::class,

tests/Foundation/FoundationApplicationTest.php

@@ -145,8 +145,8 @@ public function testMethodAfterLoadingEnvironmentAddsClosure()
         $closure = function () {
         };
         $app->afterLoadingEnvironment($closure);
-        $this->assertArrayHasKey(0, $app['events']->getListeners('bootstrapped: Illuminate\Foundation\Bootstrap\DetectEnvironment'));
-        $this->assertSame($closure, $app['events']->getListeners('bootstrapped: Illuminate\Foundation\Bootstrap\DetectEnvironment')[0]);
+        $this->assertArrayHasKey(0, $app['events']->getListeners('bootstrapped: Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables'));
+        $this->assertSame($closure, $app['events']->getListeners('bootstrapped: Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables')[0]);
     }
 
     public function testBeforeBootstrappingAddsClosure()