Merge branch '1.x' into 2.x

* 1.x:
  Fix problem of overwriting envs
  Fix parsing docker-composer files with no "version"

Author: fabpot

src/Configurator/BundlesConfigurator.php

@@ -69,12 +69,11 @@ private function configureBundles(array $bundles): array
             unset($classes[$fwb]);
         }
         foreach ($classes as $class => $envs) {
-            // if the class already existed, clear so we can update the envs
-            if (isset($registered[$class])) {
-                $registered[$class] = [];
-            }
-            foreach ($envs as $env) {
-                $registered[$class][$env] = true;
+            // do not override existing configured envs for a bundle
+            if (!isset($registered[$class])) {
+                foreach ($envs as $env) {
+                    $registered[$class][$env] = true;
+                }
             }
         }
 

src/Configurator/DockerComposeConfigurator.php

@@ -259,7 +259,7 @@ private function configureDockerCompose(Recipe $recipe, array $config, bool $upd
                 }
 
                 // Keep end in memory (check break line on previous line)
-                $endAt[$node] = '' !== trim($lines[$i - 1]) ? $i : $i - 1;
+                $endAt[$node] = !$i || '' !== trim($lines[$i - 1]) ? $i : $i - 1;
                 $node = $matches[1];
                 if (!isset($nodesLines[$node])) {
                     $nodesLines[$node] = [];

tests/Configurator/BundlesConfiguratorTest.php

@@ -170,12 +170,13 @@ public function testUpdate()
 EOF
         ], $recipeUpdate->getOriginalFiles());
 
+        // FooBundle::class => ['dev' => true, 'test' => true]: configured envs should not be overwritten
         $this->assertSame(['config/bundles.php' => <<<EOF
 <?php
 
 return [
     BarBundle::class => ['prod' => false, 'all' => true],
-    FooBundle::class => ['all' => true],
+    FooBundle::class => ['dev' => true, 'test' => true],
     BazBundle::class => ['all' => true],
     NewBundle::class => ['all' => true],
 ];

tests/Configurator/DockerComposeConfiguratorTest.php

@@ -13,7 +13,7 @@
 
 use Composer\Composer;
 use Composer\IO\IOInterface;
-use Composer\Package\Package;
+use Composer\Package\RootPackage;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Flex\Configurator\DockerComposeConfigurator;
@@ -114,7 +114,7 @@ class DockerComposeConfiguratorTest extends TestCase
     /** @var DockerComposeConfigurator */
     private $configurator;
 
-    /** @var Package */
+    /** @var RootPackage */
     private $package;
 
     private $originalEnvComposer;
@@ -139,7 +139,7 @@ protected function setUp(): void
         $this->lock = $this->getMockBuilder(Lock::class)->disableOriginalConstructor()->getMock();
 
         // Configurator
-        $this->package = new Package('dummy/dummy', '1.0.0', '1.0.0');
+        $this->package = new RootPackage('dummy/dummy', '1.0.0', '1.0.0');
         $this->package->setExtra(['symfony' => ['docker' => true]]);
 
         $this->composer = $this->getMockBuilder(Composer::class)->getMock();

tests/Configurator/DockerfileConfiguratorTest.php

@@ -13,7 +13,7 @@
 
 use Composer\Composer;
 use Composer\IO\IOInterface;
-use Composer\Package\Package;
+use Composer\Package\RootPackage;
 use PHPUnit\Framework\TestCase;
 use Symfony\Flex\Lock;
 use Symfony\Flex\Options;
@@ -278,7 +278,7 @@ public function testUpdate()
 
     private function createConfigurator(): DockerfileConfigurator
     {
-        $package = new Package('dummy/dummy', '1.0.0', '1.0.0');
+        $package = new RootPackage('dummy/dummy', '1.0.0', '1.0.0');
         $package->setExtra(['symfony' => ['docker' => true]]);
 
         $composer = $this->getMockBuilder(Composer::class)->getMock();

tests/FlexTest.php

@@ -22,6 +22,7 @@
 use Composer\Package\Package;
 use Composer\Package\RootPackageInterface;
 use Composer\Plugin\PluginInterface;
+use Composer\Repository\LockArrayRepository;
 use Composer\Repository\RepositoryInterface;
 use Composer\Repository\RepositoryManager;
 use Composer\Repository\WritableRepositoryInterface;
@@ -275,7 +276,10 @@ public function testFetchRecipesWithConflicts()
         $downloader->expects($this->once())->method('removeRecipeFromIndex')->with('doctrine/doctrine-bundle', '2.4');
 
         $locker = $this->getMockBuilder(Locker::class)->disableOriginalConstructor()->getMock();
-        $lockedRepository = $this->getMockBuilder(RepositoryInterface::class)->disableOriginalConstructor()->getMock();
+        $lockedRepository = $this->getMockBuilder(
+            // LockArrayRepository does not exist on composer 1.0.2 fallback to RepositoryInterface
+            class_exists(LockArrayRepository::class) ? LockArrayRepository::class : RepositoryInterface::class
+        )->disableOriginalConstructor()->getMock();
         // make the conflicted package show up
         $locker->expects($this->any())
             ->method('getLockedRepository')