Fix docker configurator with many mark in volumes section

Author: maxhelias

src/Configurator/DockerComposeConfigurator.php

@@ -99,7 +99,7 @@ public function unconfigure(Recipe $recipe, $config, Lock $lock)
         }
 
         foreach ($config as $key => $value) {
-            if (0 === preg_match(sprintf('{^%s:[ \t\r\n]*([ \t]+\w)}m', $key), $contents, $matches)) {
+            if (0 === preg_match(sprintf('{^%s:[ \t\r\n]*([ \t]+\w|#)}m', $key), $contents, $matches)) {
                 $contents = preg_replace(sprintf('{\n?^%s:[ \t\r\n]*}sm', $key), '', $contents, -1, $count);
             }
         }

tests/Configurator/DockerComposeConfiguratorTest.php

@@ -234,8 +234,6 @@ public function testConfigureFileWithExistingMarks()
       - db-data:/var/lib/postgresql/data: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/postgresql/data:rw
-    ports:
-      - "5432:5432"
 ###< doctrine/doctrine-bundle ###
 
 volumes:
@@ -245,9 +243,6 @@ public function testConfigureFileWithExistingMarks()
 
 YAML;
 
-        $recipe = $this->getMockBuilder(Recipe::class)->disableOriginalConstructor()->getMock();
-        $recipe->method('getName')->willReturn('symfony/mercure-bundle');
-
         $dockerComposeFile = FLEX_TEST_DIR.'/docker-compose.yml';
         file_put_contents($dockerComposeFile, $originalContent);
 
@@ -267,8 +262,6 @@ public function testConfigureFileWithExistingMarks()
                 '    - CORS_ALLOWED_ORIGINS=*',
                 '    - PUBLISH_ALLOWED_ORIGINS=http://localhost:1337',
                 '    - DEMO=1',
-                '  ports:',
-                '    - "1337:80"',
             ],
         ];
 
@@ -288,8 +281,6 @@ public function testConfigureFileWithExistingMarks()
       - db-data:/var/lib/postgresql/data: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/postgresql/data:rw
-    ports:
-      - "5432:5432"
 ###< doctrine/doctrine-bundle ###
 
 ###> symfony/mercure-bundle ###
@@ -303,8 +294,6 @@ public function testConfigureFileWithExistingMarks()
       - CORS_ALLOWED_ORIGINS=*
       - PUBLISH_ALLOWED_ORIGINS=http://localhost:1337
       - DEMO=1
-    ports:
-      - "1337:80"
 ###< symfony/mercure-bundle ###
 
 volumes:
@@ -322,4 +311,76 @@ public function testConfigureFileWithExistingMarks()
         $this->configurator->unconfigure($this->recipeDb, self::CONFIG_DB, $this->lock);
         $this->assertEquals(self::ORIGINAL_CONTENT, file_get_contents($dockerComposeFile));
     }
+
+    public function testUnconfigureFileWithManyMarks()
+    {
+        $originalContent = self::ORIGINAL_CONTENT.<<<'YAML'
+
+###> symfony/messenger ###
+  rabbitmq:
+    image: rabbitmq:management-alpine
+    environment:
+      # You should definitely change the password in production
+      - RABBITMQ_DEFAULT_USER=guest
+      - RABBITMQ_DEFAULT_PASS=guest
+    volumes:
+      - rabbitmq-data:/var/lib/rabbitmq
+###< symfony/messenger ###
+
+###> doctrine/doctrine-bundle ###
+  db:
+    image: postgres:11-alpine
+    environment:
+      - POSTGRES_DB=symfony
+      - POSTGRES_USER=symfony
+      # You should definitely change the password in production
+      - POSTGRES_PASSWORD=!ChangeMe!
+    volumes:
+      - db-data:/var/lib/postgresql/data: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/postgresql/data:rw
+###< doctrine/doctrine-bundle ###
+
+volumes:
+###> symfony/messenger ###
+  rabbitmq-data: {}
+###< symfony/messenger ###
+
+###> doctrine/doctrine-bundle ###
+  db-data: {}
+###< doctrine/doctrine-bundle ###
+
+YAML;
+
+        $contentWithoutDoctrine = self::ORIGINAL_CONTENT.<<<'YAML'
+
+###> symfony/messenger ###
+  rabbitmq:
+    image: rabbitmq:management-alpine
+    environment:
+      # You should definitely change the password in production
+      - RABBITMQ_DEFAULT_USER=guest
+      - RABBITMQ_DEFAULT_PASS=guest
+    volumes:
+      - rabbitmq-data:/var/lib/rabbitmq
+###< symfony/messenger ###
+
+volumes:
+###> symfony/messenger ###
+  rabbitmq-data: {}
+###< symfony/messenger ###
+
+
+YAML;
+
+        $dockerComposeFile = FLEX_TEST_DIR.'/docker-compose.yml';
+        file_put_contents($dockerComposeFile, $originalContent);
+
+        /** @var Recipe|\PHPUnit\Framework\MockObject\MockObject $recipe */
+        $recipe = $this->getMockBuilder(Recipe::class)->disableOriginalConstructor()->getMock();
+        $recipe->method('getName')->willReturn('symfony/messenger');
+
+        $this->configurator->unconfigure($this->recipeDb, self::CONFIG_DB, $this->lock);
+        $this->assertEquals($contentWithoutDoctrine, file_get_contents($dockerComposeFile));
+    }
 }

tests/Configurator/DockerfileConfiguratorTest.php

@@ -21,6 +21,16 @@
 
 class DockerfileConfiguratorTest extends TestCase
 {
+    public function setUp()
+    {
+        @mkdir(FLEX_TEST_DIR);
+    }
+
+    protected function tearDown()
+    {
+        @unlink(FLEX_TEST_DIR.'/Dockerfile');
+    }
+
     public function testConfigure()
     {
         $originalContent = <<<'EOF'
@@ -94,7 +104,6 @@ public function testConfigure()
         $recipe = $this->getMockBuilder(Recipe::class)->disableOriginalConstructor()->getMock();
         $recipe->method('getName')->willReturn('doctrine/doctrine-bundle');
 
-        @mkdir(FLEX_TEST_DIR);
         $config = FLEX_TEST_DIR.'/Dockerfile';
         file_put_contents($config, $originalContent);