Support for smooth upgrades from older flex versions

Author: nicolas-grekas

src/Flex.php

@@ -595,6 +595,13 @@ private function synchronizePackageJson(string $rootDir)
         if ($synchronizer->shouldSynchronize()) {
             $lockData = $this->composer->getLocker()->getLockData();
 
+            $r = new \ReflectionParameter([$synchronizer, 'addPackageJsonLink'], 'phpPackage');
+            if ('string' === $r->getType()->getName()) {
+                // support for smooth upgrades from older flex versions
+                $lockData['packages'] = array_column($lockData['packages'] ?? [], 'name');
+                $lockData['packages-dev'] = array_column($lockData['packages-dev'] ?? [], 'name');
+            }
+
             if ($synchronizer->synchronize($lockData['packages'] ?? []) || $synchronizer->synchronize($lockData['packages-dev'] ?? [])) {
                 $this->io->writeError('<info>Synchronizing package.json with PHP packages</>');
                 $this->io->writeError('<warning>Don\'t forget to run npm install --force or yarn install --force to refresh your JavaScript dependencies!</>');

src/PackageJsonSynchronizer.php

@@ -24,12 +24,12 @@
 class PackageJsonSynchronizer
 {
     private $rootDir;
-    private $vendorDirname;
+    private $vendorDir;
 
-    public function __construct(string $rootDir, string $vendorDirname)
+    public function __construct(string $rootDir, string $vendorDir = 'vendor')
     {
         $this->rootDir = $rootDir;
-        $this->vendorDirname = $vendorDirname;
+        $this->vendorDir = $vendorDir;
     }
 
     public function shouldSynchronize(): bool
@@ -42,7 +42,14 @@ public function synchronize(array $phpPackages): bool
         // Remove all links and add again only the existing packages
         $didAddLink = $this->removePackageJsonLinks((new JsonFile($this->rootDir.'/package.json'))->read());
 
-        foreach ($phpPackages as $phpPackage) {
+        foreach ($phpPackages as $k => $phpPackage) {
+            if (\is_string($phpPackage)) {
+                // support for smooth upgrades from older flex versions
+                $phpPackages[$k] = $phpPackage = [
+                    'name' => $phpPackage,
+                    'keywords' => ['symfony-ux'],
+                ];
+            }
             $didAddLink = $this->addPackageJsonLink($phpPackage) || $didAddLink;
         }
 
@@ -194,7 +201,7 @@ public function registerPeerDependencies(array $phpPackages)
 
     private function resolvePackageJson(array $phpPackage): ?JsonFile
     {
-        $packageDir = $this->rootDir.'/'.$this->vendorDirname.'/'.$phpPackage['name'];
+        $packageDir = $this->rootDir.'/'.$this->vendorDir.'/'.$phpPackage['name'];
 
         if (!\in_array('symfony-ux', $phpPackage['keywords'] ?? [], true)) {
             return null;