Fix smooth upgrades from older flex versions

nicolas-grekas · nicolas-grekas · commit 2597d0dda804 · 2021-05-19T09:19:15.000+02:00
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('');

Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,7 @@ private function synchronizePackageJson(string $rootDir)`
`602`	`602`	`$lockData['packages-dev'] = array_column($lockData['packages-dev'] ?? [], 'name');`
`603`	`603`	`}`
`604`	`604`
`605`		`- if ($synchronizer->synchronize($lockData['packages'] ?? []) \|\| $synchronizer->synchronize($lockData['packages-dev'] ?? [])) {`
	`605`	`+ if ($synchronizer->synchronize(array_merge($lockData['packages'] ?? [], $lockData['packages-dev'] ?? []))) {`
`606`	`606`	`$this->io->writeError('<info>Synchronizing package.json with PHP packages</>');`
`607`	`607`	`$this->io->writeError('<warning>Don\'t forget to run npm install --force or yarn install --force to refresh your JavaScript dependencies!</>');`
`608`	`608`	`$this->io->writeError('');`