Merge pull request #822 from dunglas/fix/docker-compose-yml

fix: use .yml instead of .yaml for Docker Compose files

Author: fabpot

src/Configurator/DockerComposeConfigurator.php

@@ -45,10 +45,9 @@ public function configure(Recipe $recipe, $config, Lock $lock, array $options =
         foreach ($this->normalizeConfig($config) as $file => $extra) {
             $dockerComposeFile = $this->findDockerComposeFile($rootDir, $file);
             if (null === $dockerComposeFile) {
-                $dockerComposeFileName = preg_replace('/\.yml$/', '.yaml', $file);
-                $dockerComposeFile = $rootDir.'/'.$dockerComposeFileName;
+                $dockerComposeFile = $rootDir.'/'.$file;
                 file_put_contents($dockerComposeFile, "version: '3'\n");
-                $this->write(sprintf('  Created <fg=green>"%s"</>', $dockerComposeFileName));
+                $this->write(sprintf('  Created <fg=green>"%s"</>', $file));
             }
             if ($this->isFileMarked($recipe, $dockerComposeFile)) {
                 continue;
@@ -168,7 +167,6 @@ private function findDockerComposeFile(string $rootDir, string $file): ?string
 
         // COMPOSE_FILE not set, or doesn't contain the file we're looking for
         $dir = $rootDir;
-        $previousDir = null;
         do {
             // Test with the ".yaml" extension if the file doesn't end up with ".yml".
             if (

tests/Configurator/DockerComposeConfiguratorTest.php

@@ -531,7 +531,7 @@ public function testConfigureFileInParentDir()
 
     public function testConfigureWithoutExistingDockerComposeFiles()
     {
-        $dockerComposeFile = FLEX_TEST_DIR.'/docker-compose.yaml';
+        $dockerComposeFile = FLEX_TEST_DIR.'/docker-compose.yml';
         $defaultContent = "version: '3'\n";
 
         $this->configurator->configure($this->recipeDb, self::CONFIG_DB, $this->lock);