bug #677 Fix unpacking nested packs into composer.json (nicolas-grekas)

This PR was merged into the 1.8-dev branch.

Discussion
----------

Fix unpacking nested packs into composer.json

Fix #676

Commits
-------

958a3a3 Fix unpacking nested packs into composer.json

Author: fabpot

src/Unpacker.php

@@ -41,14 +41,12 @@ public function __construct(Composer $composer, PackageResolver $resolver, bool
         $this->dryRun = $dryRun;
     }
 
-    public function unpack(Operation $op, Result $result = null): Result
+    public function unpack(Operation $op, Result $result = null, &$links = []): Result
     {
         if (null === $result) {
             $result = new Result();
         }
 
-        $links = [];
-
         $localRepo = $this->composer->getRepositoryManager()->getLocalRepository();
         foreach ($op->getPackages() as $package) {
             $pkg = $localRepo->findPackage($package['name'], $package['version'] ?: '*');
@@ -83,7 +81,7 @@ public function unpack(Operation $op, Result $result = null): Result
                     if ('symfony-pack' === $subPkg->getType()) {
                         $subOp = new Operation(true, $op->shouldSort());
                         $subOp->addPackage($subPkg->getName(), $constraint, $package['dev']);
-                        $result = $this->unpack($subOp, $result);
+                        $result = $this->unpack($subOp, $result, $links);
                         continue;
                     }
 
@@ -117,6 +115,10 @@ public function unpack(Operation $op, Result $result = null): Result
             }
         }
 
+        if ($this->dryRun || 1 < \func_num_args()) {
+            return $result;
+        }
+
         $jsonPath = Factory::getComposerFile();
         $jsonContent = file_get_contents($jsonPath);
         $jsonStored = json_decode($jsonContent, true);
@@ -150,9 +152,7 @@ public function unpack(Operation $op, Result $result = null): Result
             }
         }
 
-        if (!$this->dryRun && 1 === \func_num_args()) {
-            file_put_contents($jsonPath, $jsonManipulator->getContents());
-        }
+        file_put_contents($jsonPath, $jsonManipulator->getContents());
 
         return $result;
     }