From 2597d0dda8042c43eed44a9cd07236b897e427d7 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 19 May 2021 09:18:21 +0200
Subject: [PATCH] Fix smooth upgrades from older flex versions

---
 src/Flex.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Flex.php b/src/Flex.php
index 33617b5d7..118536d19 100644
--- 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('');