Fix smooth upgrades from older flex versions

symfony · May 19, 2021 · 2597d0d · 2597d0d
1 parent b0d7714
commit 2597d0d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Flex.php b/src/Flex.php
@@ -602,7 +602,7 @@ private function synchronizePackageJson(string $rootDir)
                 $lockData['packages-dev'] = array_column($lockData['packages-dev'] ?? [], 'name');
             }
 
-            if ($synchronizer->synchronize($lockData['packages'] ?? []) || $synchronizer->synchronize($lockData['packages-dev'] ?? [])) {
+            if ($synchronizer->synchronize(array_merge($lockData['packages'] ?? [], $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!</>');
                 $this->io->writeError('');