Self review 🤓

Author: Jibbarth

src/PackageJsonSynchronizer.php

@@ -147,6 +147,7 @@ private function resolveImportMapPackages($phpPackage): array
         }
 
         $dependencies = [];
+
         foreach ($packageJson->read()['symfony']['importmap'] ?? [] as $importMapName => $constraintConfig) {
             if (\is_string($constraintConfig)) {
                 // Case "jquery": "^3.0" | "@mybundle/script.js": "path:%PACKAGE%/script.js"
@@ -278,14 +279,12 @@ private function updateImportMap(array $importMapEntries): void
                 $this->io->writeError(sprintf('Updating package <comment>%s</> from <info>%s</> to <info>%s</>.', $name, $version, $versionConstraint));
             }
 
-            $arguments = [];
             if (isset($importMapEntry['path'])) {
+                $arguments = [$name, '--path='.$importMapEntry['path']];
                 if (isset($importMapEntry['entrypoint']) && true === $importMapEntry['entrypoint']) {
                     $arguments[] = '--entrypoint';
                 }
 
-                $arguments[] = $name;
-                $arguments[] = '--path='.$importMapEntry['path'];
                 $this->scriptExecutor->execute(
                     'symfony-cmd',
                     'importmap:require',
@@ -300,7 +299,7 @@ private function updateImportMap(array $importMapEntries): void
                 if ($importMapEntry['package'] !== $name) {
                     $packageName .= '='.$name;
                 }
-                $arguments[] = $packageName;
+                $arguments = [$packageName];
                 $this->scriptExecutor->execute(
                     'symfony-cmd',
                     'importmap:require',

tests/PackageJsonSynchronizerTest.php

@@ -331,8 +331,8 @@ public function testSynchronizeAssetMapperNewPackage()
             ->withConsecutive(
                 ['symfony-cmd', 'importmap:require', ['@hotcake/foo@^1.9.0']],
                 ['symfony-cmd', 'importmap:require', ['@symfony/new-package', '--path='.$fileModulePath]],
-                ['symfony-cmd', 'importmap:require', ['--entrypoint', '@symfony/new-package/entry.js', '--path='.$entrypointPath]],
-                ['symfony-cmd', 'importmap:require', ['--entrypoint', '@symfony/new-package/entry2.js', '--path='.$secondEntrypointPath]]
+                ['symfony-cmd', 'importmap:require', ['@symfony/new-package/entry.js', '--path='.$entrypointPath, '--entrypoint']],
+                ['symfony-cmd', 'importmap:require', ['@symfony/new-package/entry2.js', '--path='.$secondEntrypointPath, '--entrypoint']],
             );
 
         $this->synchronizer->synchronize([
@@ -412,8 +412,8 @@ public function testSynchronizeAssetMapperUpgradesPackageIfNeeded()
             ->withConsecutive(
                 ['symfony-cmd', 'importmap:require', ['@hotcake/foo@^1.9.0']],
                 ['symfony-cmd', 'importmap:require', ['@symfony/new-package', '--path='.$fileModulePath]],
-                ['symfony-cmd', 'importmap:require', ['--entrypoint', '@symfony/new-package/entry.js', '--path='.$entrypointPath]],
-                ['symfony-cmd', 'importmap:require', ['--entrypoint', '@symfony/new-package/entry2.js', '--path='.$secondEntrypointPath]]
+                ['symfony-cmd', 'importmap:require', ['@symfony/new-package/entry.js', '--path='.$entrypointPath, '--entrypoint']],
+                ['symfony-cmd', 'importmap:require', ['@symfony/new-package/entry2.js', '--path='.$secondEntrypointPath, '--entrypoint']]
             );
 
         $this->synchronizer->synchronize([
@@ -445,7 +445,7 @@ public function testSynchronizeAssetMapperSkipsUpgradeIfAlreadySatisfied()
             ->method('execute')
             ->withConsecutive(
                 ['symfony-cmd', 'importmap:require', ['@symfony/new-package', '--path='.$fileModulePath]],
-                ['symfony-cmd', 'importmap:require', ['--entrypoint', '@symfony/new-package/entry.js', '--path='.$entrypointPath]],
+                ['symfony-cmd', 'importmap:require', ['@symfony/new-package/entry.js', '--path='.$entrypointPath, '--entrypoint']],
             );
 
         $this->synchronizer->synchronize([