feature #720 Make "env" argument in symfony:dump-env optional (ostrolucky)

This PR was merged into the 1.9-dev branch.

Discussion
----------

Make "env" argument in symfony:dump-env optional

Addresses #680

Commits
-------

41e1408 Make "env" argument in symfony:dump-env optional

Author: nicolas-grekas

src/Command/DumpEnvCommand.php

@@ -39,18 +39,29 @@ protected function configure()
             ->setAliases(['dump-env'])
             ->setDescription('Compiles .env files to .env.local.php.')
             ->setDefinition([
-                new InputArgument('env', InputArgument::REQUIRED, 'The application environment to dump .env files for - e.g. "prod".'),
+                new InputArgument('env', InputArgument::OPTIONAL, 'The application environment to dump .env files for - e.g. "prod".'),
             ])
             ->addOption('empty', null, InputOption::VALUE_NONE, 'Ignore the content of .env files')
         ;
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $_SERVER['APP_ENV'] = $env = $input->getArgument('env');
+        if ($env = $input->getArgument('env')) {
+            $_SERVER['APP_ENV'] = $env;
+        }
+
         $path = $this->options->get('root-dir').'/.env';
 
-        $vars = $input->getOption('empty') ? ['APP_ENV' => $env] : $this->loadEnv($path, $env);
+        if (!$env || !$input->getOption('empty')) {
+            $vars = $this->loadEnv($path, $env);
+            $env = $vars['APP_ENV'];
+        }
+
+        if ($input->getOption('empty')) {
+            $vars = ['APP_ENV' => $env];
+        }
+
         $vars = var_export($vars, true);
         $vars = <<<EOF
 <?php
@@ -67,7 +78,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         return 0;
     }
 
-    private function loadEnv(string $path, string $env): array
+    private function loadEnv(string $path, ?string $env): array
     {
         if (!file_exists($autoloadFile = $this->config->get('vendor-dir').'/autoload.php')) {
             throw new \RuntimeException(sprintf('Please run "composer install" before running this command: "%s" not found.', $autoloadFile));
@@ -90,6 +101,14 @@ private function loadEnv(string $path, string $env): array
                 $dotenv = new Dotenv(false);
             }
 
+            if (!$env && file_exists($p = "$path.local")) {
+                $env = $_ENV['APP_ENV'] = $dotenv->parse(file_get_contents($p), $p)['APP_ENV'] ?? null;
+            }
+
+            if (!$env) {
+                throw new \RuntimeException('Please provide the name of the environment either by using the "--env" command line argument or by defining the "APP_ENV" variable in the ".env.local" file.');
+            }
+
             if (method_exists($dotenv, 'loadEnv')) {
                 $dotenv->loadEnv($path);
             } else {

tests/Command/DumpEnvCommandTest.php

@@ -120,6 +120,50 @@ public function testEnvCanBeReferenced()
         unlink($envLocal);
     }
 
+    public function testRequiresToSpecifyEnvArgumentWhenLocalFileDoesNotSpecifyAppEnv()
+    {
+        @mkdir(FLEX_TEST_DIR);
+        $env = FLEX_TEST_DIR.'/.env';
+        $envLocal = FLEX_TEST_DIR.'/.env.local';
+
+        file_put_contents($env, 'APP_ENV=dev');
+        file_put_contents($envLocal, '');
+
+        $command = $this->createCommandDumpEnv();
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('Please provide the name of the environment either by using the "--env" command line argument or by defining the "APP_ENV" variable in the ".env.local" file.');
+
+        try {
+            $command->execute([]);
+        } finally {
+            unlink($env);
+            unlink($envLocal);
+        }
+    }
+
+    public function testDoesNotRequireToSpecifyEnvArgumentWhenLocalFileIsPresent()
+    {
+        @mkdir(FLEX_TEST_DIR);
+        $env = FLEX_TEST_DIR.'/.env';
+        $envLocal = FLEX_TEST_DIR.'/.env.local';
+        $envLocalPhp = FLEX_TEST_DIR.'/.env.local.php';
+        @unlink($envLocalPhp);
+
+        file_put_contents($env, 'APP_ENV=dev');
+        file_put_contents($envLocal, 'APP_ENV=staging');
+
+        $command = $this->createCommandDumpEnv();
+        $command->execute([]);
+
+        $this->assertFileExists($envLocalPhp);
+
+        $this->assertSame(['APP_ENV' => 'staging'], require $envLocalPhp);
+
+        unlink($env);
+        unlink($envLocal);
+        unlink($envLocalPhp);
+    }
+
     private function createCommandDumpEnv()
     {
         $command = new DumpEnvCommand(