Skip updating phpunit.xml files when .env.test exists

Author: nicolas-grekas

src/Configurator/EnvConfigurator.php

@@ -23,7 +23,9 @@ public function configure(Recipe $recipe, $vars)
         $this->write('Added environment variable defaults');
 
         $this->configureEnvDist($recipe, $vars);
-        $this->configurePhpUnit($recipe, $vars);
+        if (!file_exists(getcwd().'/.env.test')) {
+            $this->configurePhpUnit($recipe, $vars);
+        }
     }
 
     public function unconfigure(Recipe $recipe, $vars)
@@ -34,32 +36,34 @@ public function unconfigure(Recipe $recipe, $vars)
 
     private function configureEnvDist(Recipe $recipe, $vars)
     {
-        $distenv = getcwd().'/.env.dist';
-        if (!is_file($distenv) || $this->isFileMarked($recipe, $distenv)) {
-            return;
-        }
-
-        $data = '';
-        foreach ($vars as $key => $value) {
-            $value = $this->evaluateValue($value);
-            if ('#' === $key[0] && is_numeric(substr($key, 1))) {
-                $data .= '# '.$value."\n";
+        foreach (['.env.dist', '.env'] as $file) {
+            $env = getcwd().'/'.$file;
+            if (!is_file($env)) {
+                continue;
+            }
 
+            if ($this->isFileMarked($recipe, $env)) {
                 continue;
             }
 
-            $value = $this->options->expandTargetDir($value);
-            if (false !== strpbrk($value, " \t\n&!\"")) {
-                $value = '"'.str_replace(['\\', '"', "\t", "\n"], ['\\\\', '\\"', '\t', '\n'], $value).'"';
+            $data = '';
+            foreach ($vars as $key => $value) {
+                $value = $this->evaluateValue($value);
+                if ('#' === $key[0] && is_numeric(substr($key, 1))) {
+                    $data .= '# '.$value."\n";
+
+                    continue;
+                }
+
+                $value = $this->options->expandTargetDir($value);
+                if (false !== strpbrk($value, " \t\n&!\"")) {
+                    $value = '"'.str_replace(['\\', '"', "\t", "\n"], ['\\\\', '\\"', '\t', '\n'], $value).'"';
+                }
+                $data .= "$key=$value\n";
             }
-            $data .= "$key=$value\n";
-        }
-        if (!file_exists(getcwd().'/.env')) {
-            copy($distenv, getcwd().'/.env');
+            $data = $this->markData($recipe, $data);
+            file_put_contents($env, $data, FILE_APPEND);
         }
-        $data = $this->markData($recipe, $data);
-        file_put_contents($distenv, $data, FILE_APPEND);
-        file_put_contents(getcwd().'/.env', $data, FILE_APPEND);
     }
 
     private function configurePhpUnit(Recipe $recipe, $vars)

src/Flex.php

@@ -304,8 +304,9 @@ public function update(Event $event, $operations = [])
         if ($operations) {
             $this->operations = $operations;
         }
+        $cwd = getcwd();
 
-        if (!file_exists(getcwd().'/.env') && file_exists(getcwd().'/.env.dist')) {
+        if (!file_exists("$cwd/.env") && !file_exists("$cwd/.env.local") && file_exists("$cwd/.env.dist") && false === strpos(file_get_contents("$cwd/.env.dist"), '.env.local')) {
             copy(getcwd().'/.env.dist', getcwd().'/.env');
         }