Merge branch '1.x' into 2.x

* 1.x:
  Adding a DOCKER_SUPPORT env var to permanently activate docker support

Author: fabpot

src/Configurator/DockerComposeConfigurator.php

@@ -111,34 +111,14 @@ public static function shouldConfigureDockerRecipe(Composer $composer, IOInterfa
             return false;
         }
 
-        $warning = $io->isInteractive() ? 'WARNING' : 'IGNORING';
-        $io->writeError(sprintf('  - <warning> %s </> %s', $warning, $recipe->getFormattedOrigin()));
-        $question = '    The recipe for this package contains some Docker configuration.
-
-    This may create/update <comment>docker-compose.yml</comment> or update <comment>Dockerfile</comment> (if it exists).
-
-    Do you want to include Docker configuration from recipes?
-    [<comment>y</>] Yes
-    [<comment>n</>] No
-    [<comment>p</>] Yes permanently, never ask again for this project
-    [<comment>x</>] No permanently, never ask again for this project
-    (defaults to <comment>y</>): ';
-        $answer = $io->askAndValidate(
-            $question,
-            function ($value) {
-                if (null === $value) {
-                    return 'y';
-                }
-                $value = strtolower($value[0]);
-                if (!\in_array($value, ['y', 'n', 'p', 'x'], true)) {
-                    throw new \InvalidArgumentException('Invalid choice.');
-                }
+        if (!isset($_SERVER['SYMFONY_DOCKER'])) {
+            $answer = self::askDockerSupport($io, $recipe);
+        } elseif (filter_var($_SERVER['SYMFONY_DOCKER'], \FILTER_VALIDATE_BOOLEAN)) {
+            $answer = 'p';
+        } else {
+            $answer = 'x';
+        }
 
-                return $value;
-            },
-            null,
-            'y'
-        );
         if ('n' === $answer) {
             self::$configureDockerRecipes = false;
 
@@ -368,4 +348,37 @@ private function getContentsAfterApplyingRecipe(string $rootDir, Recipe $recipe,
 
         return $updatedContents;
     }
+
+    private static function askDockerSupport(IOInterface $io, Recipe $recipe): string
+    {
+        $warning = $io->isInteractive() ? 'WARNING' : 'IGNORING';
+        $io->writeError(sprintf('  - <warning> %s </> %s', $warning, $recipe->getFormattedOrigin()));
+        $question = '    The recipe for this package contains some Docker configuration.
+
+    This may create/update <comment>docker-compose.yml</comment> or update <comment>Dockerfile</comment> (if it exists).
+
+    Do you want to include Docker configuration from recipes?
+    [<comment>y</>] Yes
+    [<comment>n</>] No
+    [<comment>p</>] Yes permanently, never ask again for this project
+    [<comment>x</>] No permanently, never ask again for this project
+    (defaults to <comment>y</>): ';
+
+        return $io->askAndValidate(
+            $question,
+            function ($value) {
+                if (null === $value) {
+                    return 'y';
+                }
+                $value = strtolower($value[0]);
+                if (!\in_array($value, ['y', 'n', 'p', 'x'], true)) {
+                    throw new \InvalidArgumentException('Invalid choice.');
+                }
+
+                return $value;
+            },
+            null,
+            'y'
+        );
+    }
 }

tests/Configurator/DockerComposeConfiguratorTest.php

@@ -257,6 +257,26 @@ public function getInteractiveDockerPreferenceTests()
         yield 'no_forever' => ['x', false, true];
     }
 
+    public function testEnvVarUsedForDockerConfirmation()
+    {
+        $composerJsonPath = FLEX_TEST_DIR.'/composer.json';
+        file_put_contents($composerJsonPath, json_encode(['name' => 'test/app']));
+
+        $this->package->setExtra(['symfony' => []]);
+        $this->recipeDb->method('getJob')->willReturn('install');
+        $this->io->expects($this->never())->method('askAndValidate');
+
+        $_SERVER['SYMFONY_DOCKER'] = 1;
+        $this->configurator->configure($this->recipeDb, self::CONFIG_DB, $this->lock);
+        unset($_SERVER['SYMFONY_DOCKER']);
+
+        $this->assertFileExists(FLEX_TEST_DIR.'/docker-compose.yml');
+
+        $composerJsonData = json_decode(file_get_contents($composerJsonPath), true);
+        $this->assertArrayHasKey('extra', $composerJsonData);
+        $this->assertTrue($composerJsonData['extra']['symfony']['docker']);
+    }
+
     public function testConfigureFileWithExistingVolumes()
     {
         $originalContent = self::ORIGINAL_CONTENT.<<<'YAML'