bug #766 Use Composer vendor-dir (tgalopin)

This PR was merged into the 1.12-dev branch.

Discussion
----------

Use Composer vendor-dir

Extracted from #737

Commits
-------

9127994 Use Composer vendor-dir

Author: nicolas-grekas

src/Flex.php

@@ -48,6 +48,7 @@
 use Composer\Script\ScriptEvents;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Flex\Event\UpdateEvent;
 use Symfony\Flex\Unpack\Operation;
 use Symfony\Thanks\Thanks;
@@ -584,9 +585,12 @@ function ($value) {
         }
     }
 
-    private function synchronizePackageJson(?string $rootDir)
+    private function synchronizePackageJson(string $rootDir)
     {
-        $synchronizer = new PackageJsonSynchronizer($rootDir);
+        $rootDir = realpath($rootDir);
+        $vendorDir = trim((new Filesystem())->makePathRelative($this->config->get('vendor-dir'), $rootDir), \DIRECTORY_SEPARATOR);
+
+        $synchronizer = new PackageJsonSynchronizer($rootDir, $vendorDir);
 
         if ($synchronizer->shouldSynchronize()) {
             $packagesNames = array_column($this->composer->getLocker()->getLockData()['packages'] ?? [], 'name');

src/PackageJsonSynchronizer.php

@@ -24,10 +24,12 @@
 class PackageJsonSynchronizer
 {
     private $rootDir;
+    private $vendorDirname;
 
-    public function __construct(?string $rootDir)
+    public function __construct(string $rootDir, string $vendorDirname)
     {
         $this->rootDir = $rootDir;
+        $this->vendorDirname = $vendorDirname;
     }
 
     public function shouldSynchronize(): bool
@@ -81,7 +83,7 @@ private function addPackageJsonLink(string $phpPackage): bool
         }
 
         $manipulator = new JsonManipulator(file_get_contents($this->rootDir.'/package.json'));
-        $manipulator->addSubNode('devDependencies', '@'.$phpPackage, 'file:vendor/'.$phpPackage.$assetsDir);
+        $manipulator->addSubNode('devDependencies', '@'.$phpPackage, 'file:'.$this->vendorDirname.'/'.$phpPackage.$assetsDir);
 
         $content = json_decode($manipulator->getContents(), true);
 
@@ -112,7 +114,7 @@ private function registerWebpackResources(array $phpPackages)
             }
 
             // Register in config
-            $packageJsonPath = $this->rootDir.'/vendor/'.$phpPackage.$assetsDir.'/package.json';
+            $packageJsonPath = $this->rootDir.'/'.$this->vendorDirname.'/'.$phpPackage.$assetsDir.'/package.json';
             $packageJson = (new JsonFile($packageJsonPath))->read();
 
             foreach ($packageJson['symfony']['controllers'] ?? [] as $controllerName => $defaultConfig) {
@@ -169,7 +171,7 @@ public function registerPeerDependencies(array $phpPackages)
                 continue;
             }
 
-            $packageJsonPath = $this->rootDir.'/vendor/'.$phpPackage.$assetsDir.'/package.json';
+            $packageJsonPath = $this->rootDir.'/'.$this->vendorDirname.'/'.$phpPackage.$assetsDir.'/package.json';
             $packageJson = (new JsonFile($packageJsonPath))->read();
             $versionParser = new VersionParser();
 
@@ -198,7 +200,7 @@ public function registerPeerDependencies(array $phpPackages)
     private function resolveAssetsDir(string $phpPackage)
     {
         foreach (['/assets', '/Resources/assets'] as $subdir) {
-            if (file_exists($this->rootDir.'/vendor/'.$phpPackage.$subdir.'/package.json')) {
+            if (file_exists($this->rootDir.'/'.$this->vendorDirname.'/'.$phpPackage.$subdir.'/package.json')) {
                 return $subdir;
             }
         }

tests/FlexTest.php

@@ -325,12 +325,13 @@ private function mockFlex(BufferIO $io, RootPackageInterface $package, Recipe $r
         return \Closure::bind(function () use ($composer, $io, $configurator, $downloader, $lock) {
             $flex = new Flex();
             $flex->composer = $composer;
+            $flex->config = $composer->getConfig();
             $flex->io = $io;
             $flex->configurator = $configurator;
             $flex->downloader = $downloader;
             $flex->runningCommand = function () {
             };
-            $flex->options = new Options(['config-dir' => 'config', 'var-dir' => 'var']);
+            $flex->options = new Options(['config-dir' => 'config', 'var-dir' => 'var', 'root-dir' => '.']);
             $flex->lock = $lock;
 
             return $flex;

tests/PackageJsonSynchronizerTest.php

@@ -26,7 +26,7 @@ protected function setUp(): void
         $this->tempDir = sys_get_temp_dir().'/flex-package-json-'.substr(md5(uniqid('', true)), 0, 6);
         (new Filesystem())->mirror(__DIR__.'/Fixtures/packageJson', $this->tempDir);
 
-        $this->synchronizer = new PackageJsonSynchronizer($this->tempDir);
+        $this->synchronizer = new PackageJsonSynchronizer($this->tempDir, 'vendor');
     }
 
     protected function tearDown(): void