symfony
diff --git a/‎.gitignore
Lines changed: 1 addition & 0 deletions b/‎.gitignore
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Configurator/DockerComposeConfigurator.php
Lines changed: 51 additions & 11 deletions b/‎src/Configurator/DockerComposeConfigurator.php
Lines changed: 51 additions & 11 deletions
diff --git a/‎src/Configurator/DockerfileConfigurator.php
Lines changed: 11 additions & 5 deletions b/‎src/Configurator/DockerfileConfigurator.php
Lines changed: 11 additions & 5 deletions
diff --git a/‎tests/Configurator/DockerComposeConfiguratorTest.php
Lines changed: 57 additions & 40 deletions b/‎tests/Configurator/DockerComposeConfiguratorTest.php
Lines changed: 57 additions & 40 deletions
diff --git a/‎tests/Configurator/DockerfileConfiguratorTest.php
Lines changed: 16 additions & 9 deletions b/‎tests/Configurator/DockerfileConfiguratorTest.php
Lines changed: 16 additions & 9 deletions
@@ -1,4 +1,5 @@
 /vendor/
 /build/
+.php_cs
 .php_cs.cache
 composer.lock
@@ -11,6 +11,7 @@
 
 namespace Symfony\Flex\Configurator;
 
+use Symfony\Flex\Lock;
 use Symfony\Flex\Recipe;
 
 /**
@@ -20,37 +21,58 @@
  */
 class DockerComposeConfigurator extends AbstractConfigurator
 {
-    public function configure(Recipe $recipe, $config): void
+    public function configure(Recipe $recipe, $config, Lock $lock, array $options = [])
     {
-        $dockerCompose = getcwd().'/docker-compose.yaml';
+        $installDocker = $this->composer->getPackage()->getExtra()['symfony']['docker'] ?? false;
+        if (!$installDocker) {
+            return;
+        }
+
+        $dockerCompose = $this->options->get('root-dir').'/docker-compose.yaml';
         if (!file_exists($dockerCompose) || $this->isFileMarked($recipe, $dockerCompose)) {
             return;
         }
 
         $this->write('Adding Docker Compose entries');
 
+        $offset = 8;
+        $node = null;
+        $endAt = [];
         $lines = [];
-        foreach (file($dockerCompose) as $line) {
+        foreach (file($dockerCompose) as $i => $line) {
             $lines[] = $line;
-            if (!preg_match('/^[\'"]?([a-zA-Z0-9]+)[\'"]?:\s*$/', $line, $matches) || !isset($config[$matches[1]])) {
+            $ltrimedLine = ltrim($line, ' ');
+            if (('' !== $ltrimedLine && 0 === strpos($ltrimedLine, '#')) || '' === trim($line)) {
                 continue;
             }
-
-            $lines[] = ltrim($this->markData($recipe, implode("\n", $config[$matches[1]])), "\n");
-            unset($config[$matches[1]]);
+            if (!preg_match('/^[\'"]?([a-zA-Z0-9]+)[\'"]?:\s*$/', $line, $matches)) {
+                $offestLine = \strlen($line) - \strlen($ltrimedLine);
+                if ($offset > $offestLine && 0 !== $offestLine) {
+                    $offset = $offestLine;
+                }
+                continue;
+            }
+            $node = $matches[1];
+            $endAt[$node] = $i - 1;
         }
+        $endAt[$node] = \count($lines);
 
         foreach ($config as $key => $value) {
-            $lines[] = "\n$key:\n";
-            $lines[] = $this->markData($recipe, implode("\n", $value));
+            if (isset($endAt[$key])) {
+                array_splice($lines, $endAt[$key], 0, $this->markData($recipe, $this->parse(1, $offset, $value)));
+                continue;
+            }
+
+            $lines[] = sprintf("\n%s:", $key);
+            $lines[] = $this->markData($recipe, $this->parse(1, $offset, $value));
         }
 
         file_put_contents($dockerCompose, implode('', $lines));
     }
 
-    public function unconfigure(Recipe $recipe, $config): void
+    public function unconfigure(Recipe $recipe, $config, Lock $lock)
     {
-   
F438
     if (!file_exists($dockerCompose = getcwd().'/docker-compose.yaml')) {
+        if (!file_exists($dockerCompose = $this->options->get('root-dir').'/docker-compose.yaml')) {
             return;
         }
 
@@ -69,4 +91,22 @@ public function unconfigure(Recipe $recipe, $config): void
         $this->write(sprintf('Removing Docker Compose entries from %s', $dockerCompose));
         file_put_contents($dockerCompose, ltrim($contents, "\n"));
     }
+
+    private function parse($level, $indente, $services): string
+    {
+        $line = '';
+        foreach ($services as $key => $value) {
+            $line .= str_repeat(' ', $indente * $level);
+            if (!\is_array($value)) {
+                if (\is_string($key)) {
+                    $line .= sprintf('%s:', $key);
+                }
+                $line .= sprintf("%s\n", $value);
+                continue;
+            }
+            $line .= sprintf("%s:\n", $key).$this->parse($level + 1, $indente, $value);
+        }
+
+        return $line;
+    }
 }
@@ -11,6 +11,7 @@
 
 namespace Symfony\Flex\Configurator;
 
+use Symfony\Flex\Lock;
 use Symfony\Flex\Recipe;
 
 /**
@@ -20,9 +21,14 @@
  */
 class DockerfileConfigurator extends AbstractConfigurator
 {
-    public function configure(Recipe $recipe, $config): void
+    public function configure(Recipe $recipe, $config, Lock $lock, array $options = [])
     {
-        $dockerfile = getcwd() . '/Dockerfile';
+        $installDocker = $this->composer->getPackage()->getExtra()['symfony']['docker'] ?? false;
+        if (!$installDocker) {
+            return;
+        }
+
+        $dockerfile = $this->options->get('root-dir').'/Dockerfile';
         if (!file_exists($dockerfile) || $this->isFileMarked($recipe, $dockerfile)) {
             return;
         }
@@ -42,9 +48,9 @@ public function configure(Recipe $recipe, $config): void
         file_put_contents($dockerfile, implode('', $lines));
     }
 
-    public function unconfigure(Recipe $recipe, $config): void
+    public function unconfigure(Recipe $recipe, $config, Lock $lock)
     {
-        if (!file_exists($dockerfile = getcwd().'/Dockerfile')) {
+        if (!file_exists($dockerfile = $this->options->get('root-dir').'/Dockerfile')) {
             return;
         }
 
@@ -54,7 +60,7 @@ public function unconfigure(Recipe $recipe, $config): void
             return;
         }
 
-        $this->write(sprintf('Removing Dockerfile entries', $dockerfile));
+        $this->write('Removing Dockerfile entries');
         file_put_contents($dockerfile, ltrim($contents, "\n"));
     }
 }
@@ -11,12 +11,12 @@
 
 namespace Symfony\Flex\Tests\Configurator;
 
-require_once __DIR__.'/TmpDirMock.php';
-
 use Composer\Composer;
 use Composer\IO\IOInterface;
+use Composer\Package\Package;
 use PHPUnit\Framework\TestCase;
 use Symfony\Flex\Configurator\DockerComposeConfigurator;
+use Symfony\Flex\Lock;
 use Symfony\Flex\Options;
 use Symfony\Flex\Recipe;
 
@@ -45,6 +45,7 @@ public function testConfigure()
       - /srv/app/var/logs/
       - /srv/app/var/sessions/
       - /srv/app/vendor/
+      
   nginx:
     build:
       context: ./docker/nginx
@@ -55,63 +56,62 @@ public function testConfigure()
       - ./public:/srv/app/public:ro
     ports:
       - "80:80"
-
+      
 YAML;
 
+        $lock = $this->getMockBuilder(Lock::class)->disableOriginalConstructor()->getMock();
         $recipe = $this->getMockBuilder(Recipe::class)->disableOriginalConstructor()->getMock();
         $recipe->method('getName')->willReturn('doctrine/doctrine-bundle');
 
-        $dockerComposeFile = sys_get_temp_dir().'/docker-compose.yaml';
+        @mkdir(FLEX_TEST_DIR);
+        $dockerComposeFile = FLEX_TEST_DIR.'/docker-compose.yaml';
         file_put_contents($dockerComposeFile, $originalContent);
+
+        $package = new Package('dummy/dummy', '1.0.0', '1.0.0');
+        $package->setExtra(['symfony' => ['docker' => true]]);
+
+        $composer = $this->getMockBuilder(Composer::class)->getMock();
+        $composer->method('getPackage')->willReturn($package);
+
         $configurator = new DockerComposeConfigurator(
-            $this->getMockBuilder(Composer::class)->getMock(),
+            $composer,
             $this->getMockBuilder(IOInterface::class)->getMock(),
-            $this->getMockBuilder(Options::class)->getMock()
+            new Options(['config-dir' => 'config', 'root-dir' => FLEX_TEST_DIR])
         );
 
         $config = [
             'services' => [
-                '  db:',
-                '    build:',
-                '      context: ./docker/db',
-                '      dockerfile: ./Dockerfile',
-                '    environment:',
-                '      - MYSQL_DATABASE=app',
-                '      # You should definitely change the password in production',
-                '      - MYSQL_PASSWORD=symfony',
-                '      - MYSQL_RANDOM_ROOT_PASSWORD=true',
-                '      - MYSQL_USER=symfony',
-                '    volumes:',
-                '      - db-data:/var/lib/mysql:rw',
-                '      # You may use a bind-mounted host directory instead, so that it is harder to accidentally remove the volume and lose all your data!',
-                '      # - ./docker/db/data:/var/lib/mysql:rw',
+                'db' => [
+                    'build' => [
+                        'context: ./docker/db',
+                        'dockerfile: ./Dockerfile',
+                    ],
+                    'environment' => [
+                        '- MYSQL_DATABASE=app',
+                        '# You should definitely change the password in production',
+                        '- MYSQL_PASSWORD=symfony',
+                        '- MYSQL_RANDOM_ROOT_PASSWORD=true',
+                        '- MYSQL_USER=symfony',
+                    ],
+                    'volumes' => [
+                        '- db-data:/var/lib/mysql:rw',
+                        '# You may use a bind-mounted host directory instead, so that it is harder to accidentally remove the volume and lose all your data!',
+                        '# - ./docker/db/data:/var/lib/mysql:rw',
+                    ],
+                ],
+            ],
+            'volumes' => [
+                'db-data: {}',
             ],
-            'volumes' => ['  db-data: {}']
         ];
 
-        $configurator->configure($recipe, $config);
+        $configurator->configure($recipe, $config, $lock);
 
         $this->assertEquals(<<<'YAML'
 # comment
 version: '3'
 
 services:
-###> doctrine/doctrine-bundle ###
-  db:
-    build:
-      context: ./docker/db
-      dockerfile: ./Dockerfile
-    environment:
-      - MYSQL_DATABASE=app
-      # You should definitely change the password in production
-      - MYSQL_PASSWORD=symfony
-      - MYSQL_RANDOM_ROOT_PASSWORD=true
-      - MYSQL_USER=symfony
-    volumes:
-      - db-data:/var/lib/mysql:rw
-      # You may use a bind-mounted host directory instead, so that it is harder to accidentally remove the volume and lose all your data!
-      # - ./docker/db/data:/var/lib/mysql:rw
-###< doctrine/doctrine-bundle ###
   app:
     build:
       context: .
@@ -125,6 +125,7 @@ public function testConfigure()
       - /srv/app/var/logs/
       - /srv/app/var/sessions/
       - /srv/app/vendor/
+      
   nginx:
     build:
       context: ./docker/nginx
@@ -135,17 +136,33 @@ public function testConfigure()
       - ./public:/srv/app/public:ro
     ports:
       - "80:80"
+      
+###> doctrine/doctrine-bundle ###
+  db:
+    build:
+      context: ./docker/db
+      dockerfile: ./Dockerfile
+    environment:
+      - MYSQL_DATABASE=app
+      # You should definitely change the password in production
+      - MYSQL_PASSWORD=symfony
+      - MYSQL_RANDOM_ROOT_PASSWORD=true
+      - MYSQL_USER=symfony
+    volumes:
+      - db-data:/var/lib/mysql:rw
+      # You may use a bind-mounted host directory instead, so that it is harder to accidentally remove the volume and lose all your data!
+      # - ./docker/db/data:/var/lib/mysql:rw
+###< doctrine/doctrine-bundle ###
 
 volumes:
-
 ###> doctrine/doctrine-bundle ###
   db-data: {}
 ###< doctrine/doctrine-bundle ###
 
 YAML
             , file_get_contents($dockerComposeFile));
 
-        $configurator->unconfigure($recipe, $config);
+        $configurator->unconfigure($recipe, $config, $lock);
         $this->assertEquals($originalContent, file_get_contents($dockerComposeFile));
     }
 }
@@ -13,13 +13,12 @@
 
 use Composer\Composer;
 use Composer\IO\IOInterface;
+use Composer\Package\Package;
 use PHPUnit\Framework\TestCase;
-use Symfony\Flex\Configurator\DockerfileConfigurator;
+use Symfony\Flex\Lock;
 use Symfony\Flex\Options;
 use Symfony\Flex\Recipe;
 
-require_once __DIR__.'/TmpDirMock.php';
-
 class DockerfileConfiguratorTest extends TestCase
 {
     public function testConfigure()
@@ -91,17 +90,26 @@ public function testConfigure()
 
 EOF;
 
+        $lock = $this->getMockBuilder(Lock::class)->disableOriginalConstructor()->getMock();
         $recipe = $this->getMockBuilder(Recipe::class)->disableOriginalConstructor()->getMock();
         $recipe->method('getName')->willReturn('doctrine/doctrine-bundle');
 
-        $config = sys_get_temp_dir().'/Dockerfile';
+        @mkdir(FLEX_TEST_DIR);
+        $config = FLEX_TEST_DIR.'/Dockerfile';
         file_put_contents($config, $originalContent);
+
+        $package = new Package('dummy/dummy', '1.0.0', '1.0.0');
+        $package->setExtra(['symfony' => ['docker' => true]]);
+
+        $composer = $this->getMockBuilder(Composer::class)->getMock();
+        $composer->method('getPackage')->willReturn($package);
+
         $configurator = new DockerfileConfigurator(
-            $this->getMockBuilder(Composer::class)->getMock(),
+            $composer,
             $this->getMockBuilder(IOInterface::class)->getMock(),
-            $this->getMockBuilder(Options::class)->getMock()
+            new Options(['config-dir' => 'config', 'root-dir' => FLEX_TEST_DIR])
         );
-        $configurator->configure($recipe, ['RUN docker-php-ext-install pdo_mysql']);
+        $configurator->configure($recipe, ['RUN docker-php-ext-install pdo_mysql'], $lock);
         $this->assertEquals(<<<'EOF'
 FROM php:7.1-fpm-alpine
 
@@ -173,8 +181,7 @@ public function testConfigure()
 EOF
             , file_get_contents($config));
 
-
-        $configurator->unconfigure($recipe, []);
+        $configurator->unconfigure($recipe, [], $lock);
         $this->assertEquals($originalContent, file_get_contents($config));
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Flex\Configurator;`
`13`	`13`
	`14`	`+use Symfony\Flex\Lock;`
`14`	`15`	`use Symfony\Flex\Recipe;`
`15`	`16`
`16`	`17`	`/**`
`@@ -20,9 +21,14 @@`
`20`	`21`	`*/`
`21`	`22`	`class DockerfileConfigurator extends AbstractConfigurator`
`22`	`23`	`{`
`23`		`- public function configure(Recipe $recipe, $config): void`
	`24`	`+ public function configure(Recipe $recipe, $config, Lock $lock, array $options = [])`
`24`	`25`	`{`
`25`		`- $dockerfile = getcwd() . '/Dockerfile';`
	`26`	`+ $installDocker = $this->composer->getPackage()->getExtra()['symfony']['docker'] ?? false;`
	`27`	`+ if (!$installDocker) {`
	`28`	`+ return;`
	`29`	`+ }`
	`30`	`+`
	`31`	`+ $dockerfile = $this->options->get('root-dir').'/Dockerfile';`
`26`	`32`	`if (!file_exists($dockerfile) \|\| $this->isFileMarked($recipe, $dockerfile)) {`
`27`	`33`	`return;`
`28`	`34`	`}`
`@@ -42,9 +48,9 @@ public function configure(Recipe $recipe, $config): void`
`42`	`48`	`file_put_contents($dockerfile, implode('', $lines));`
`43`	`49`	`}`
`44`	`50`
`45`		`- public function unconfigure(Recipe $recipe, $config): void`
	`51`	`+ public function unconfigure(Recipe $recipe, $config, Lock $lock)`
`46`	`52`	`{`
`47`		`- if (!file_exists($dockerfile = getcwd().'/Dockerfile')) {`
	`53`	`+ if (!file_exists($dockerfile = $this->options->get('root-dir').'/Dockerfile')) {`
`48`	`54`	`return;`
`49`	`55`	`}`
`50`	`56`
`@@ -54,7 +60,7 @@ public function unconfigure(Recipe $recipe, $config): void`
`54`	`60`	`return;`
`55`	`61`	`}`
`56`	`62`
`57`		`- $this->write(sprintf('Removing Dockerfile entries', $dockerfile));`
	`63`	`+ $this->write('Removing Dockerfile entries');`
`58`	`64`	`file_put_contents($dockerfile, ltrim($contents, "\n"));`
`59`	`65`	`}`
`60`	`66`	`}`