bug symfony#235 Fix commented env vars support (fabpot)

This PR was merged into the 1.0-dev branch.

Discussion
----------

Fix commented env vars support

closes symfony#234

Commits
-------

8c93a2a fixed commented env vars support

src/Configurator/EnvConfigurator.php

@@ -44,15 +44,17 @@ private function configureEnvDist(Recipe $recipe, $vars)
             if ('%generate(secret)%' === $value) {
                 $value = bin2hex(random_bytes(16));
             }
-            if ('#' === $key[0]) {
+            if ('#' === $key[0] && ctype_digit(substr($key, 1))) {
                 $data .= '# '.$value."\n";
-            } else {
-                $value = $this->options->expandTargetDir($value);
-                if (false !== strpbrk($value, " \t\n&!\"")) {
-                    $value = '"'.str_replace(['\\', '"', "\t", "\n"], ['\\\\', '\\"', '\t', '\n'], $value).'"';
-                }
-                $data .= "$key=$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";
         }
         if (!file_exists(getcwd().'/.env')) {
             copy($distenv, getcwd().'/.env');
@@ -80,8 +82,17 @@ private function configurePhpUnit(Recipe $recipe, $vars)
                     $value = bin2hex(random_bytes(16));
                 }
                 if ('#' === $key[0]) {
-                    $doc = new \DOMDocument();
-                    $data .= '        '.$doc->saveXML($doc->createComment(' '.$value.' '))."\n";
+                    if (ctype_digit(substr($key, 1))) {
+                        $doc = new \DOMDocument();
+                        $data .= '        '.$doc->saveXML($doc->createComment(' '.$value.' '))."\n";
+                    } else {
+                        $value = $this->options->expandTargetDir($value);
+                        $doc = new \DOMDocument();
+                        $fragment = $doc->createElement('env');
+                        $fragment->setAttribute('name', substr($key, 1));
+                        $fragment->setAttribute('value', $value);
+                        $data .= '        '.str_replace(['<', '/>'], ['<!-- ', ' -->'], $doc->saveXML($fragment))."\n";
+                    }
                 } else {
                     $value = $this->options->expandTargetDir($value);
                     $doc = new \DOMDocument();

tests/Configurator/EnvConfiguratorTest.php

@@ -48,6 +48,7 @@ public function testConfigure()
             'MAILER_USER' => 'fabien',
             '#1' => 'Comment 1',
             '#2' => 'Comment 3',
+            '#TRUSTED_SECRET' => 's3cretf0rt3st"<>',
             'APP_SECRET' => 's3cretf0rt3st"<>',
         ]);
 
@@ -62,6 +63,7 @@ public function testConfigure()
 MAILER_USER=fabien
 # Comment 1
 # Comment 3
+#TRUSTED_SECRET="s3cretf0rt3st\"<>"
 APP_SECRET="s3cretf0rt3st\"<>"
 ###< FooBundle ###
 
@@ -89,6 +91,7 @@ public function testConfigure()
         <env name="MAILER_USER" value="fabien"/>
         <!-- Comment 1 -->
         <!-- Comment 3 -->
+        <!-- env name="TRUSTED_SECRET" value="s3cretf0rt3st&quot;&lt;&gt;" -->
         <env name="APP_SECRET" value="s3cretf0rt3st&quot;&lt;&gt;"/>
         <!-- ###- FooBundle ### -->
     </php>
@@ -111,6 +114,7 @@ public function testConfigure()
             'APP_DEBUG' => '0',
             '#1' => 'Comment 1',
             '#2' => 'Comment 3',
+            '#TRUSTED_SECRET' => 's3cretf0rt3st',
             'APP_SECRET' => 's3cretf0rt3st',
         ]);
 
@@ -123,6 +127,7 @@ public function testConfigure()
             'APP_DEBUG' => '0',
             '#1' => 'Comment 1',
             '#2' => 'Comment 3',
+            '#TRUSTED_SECRET' => 's3cretf0rt3st',
             'APP_SECRET' => 's3cretf0rt3st',
         ]);