iterate

Author: Kocal

src/Toolkit/src/Command/InstallComponentCommand.php

@@ -172,7 +172,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $this->io->success('The component has been installed.');
         $this->io->writeln('The following file(s) have been added to your project:');
-        $this->io->listing(array_map(fn (File $file) => Path::join($destinationPath, $file->toRelativePathName), $installationReport->newFiles));
+        $this->io->listing(array_map(fn (File $file) => Path::join($destinationPath, $file->sourceRelativePathName), $installationReport->newFiles));
 
         if ([] !== $installationReport->suggestedPhpPackages) {
             $this->io->writeln(\sprintf('Run <info>composer require %s</> to install the required PHP dependencies.', implode(' ', $installationReport->suggestedPhpPackages)));

src/Toolkit/src/Installer/Installer.php

@@ -15,8 +15,6 @@
 
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Filesystem\Path;
-use Symfony\UX\Toolkit\Asset\Component;
-use Symfony\UX\Toolkit\File\File;
 use Symfony\UX\Toolkit\Kit\Kit;
 use Symfony\UX\Toolkit\Recipe\Recipe;
 
@@ -49,25 +47,22 @@ private function handlePool(Pool $pool, Kit $kit, string $destinationPath, bool
     {
         $installedFiles = [];
 
-        foreach ($pool->getFiles() as $file) {
-            if ($this->installFile($kit, $file, $destinationPath, $force)) {
-                $installedFiles[] = $file;
+        foreach ($pool->getFiles() as $recipeAbsolutePath => $files) {
+            foreach ($files as $file) {
+                $sourceAbsolutePathName = Path::join($recipeAbsolutePath, $file->sourceRelativePathName);
+                $destinationAbsolutePathName = Path::join($destinationPath, $file->destinationRelativePathName);
+
+                if ($this->copyFile($kit, $sourceAbsolutePathName, $destinationAbsolutePathName, $force)) {
+                    $installedFiles[] = $file;
+                }
             }
         }
 
         return new InstallationReport(newFiles: $installedFiles, suggestedPhpPackages: $pool->getPhpPackageDependencies());
     }
 
-    /**
-     * @param non-empty-string $destinationPath
-     */
-    private function installFile(Kit $kit, File $file, string $destinationPath, bool $force): bool
+    private function copyFile(Kit $kit, string $sourceAbsolutePathName, string $destinationAbsolutePathName, bool $force): bool
     {
-        $sourceAbsolutePathName = Path::join($kit->absolutePath, $file->sourceRelativePathName);
-        $destinationAbsolutePathName = Path::join($destinationPath, $file->destinationRelativePathName);
-
-        dump(source: $sourceAbsolutePathName, destination: $destinationAbsolutePathName, force: $force);
-
         if ($this->filesystem->exists($destinationAbsolutePathName) && !$force) {
             if (!($this->askConfirmation)(\sprintf('File "%s" already exists. Do you want to overwrite it?', $destinationAbsolutePathName))) {
                 return false;

src/Toolkit/src/Installer/Pool.php

@@ -15,6 +15,7 @@
 
 use Symfony\UX\Toolkit\Dependency\PhpPackageDependency;
 use Symfony\UX\Toolkit\File\File;
+use Symfony\UX\Toolkit\Recipe\Recipe;
 
 /**
  * Represents a pool of files and dependencies to be installed.
@@ -35,13 +36,13 @@ final class Pool
      */
     private array $phpPackageDependencies = [];
 
-    public function addFile(File $file): void
+    public function addFile(Recipe $recipe, File $file): void
     {
-        $this->files[$file->destinationRelativePathName] ??= $file;
+        $this->files[$recipe->absolutePath][$file->destinationRelativePathName] ??= $file;
     }
 
     /**
-     * @return array<non-empty-string, File>
+     * @return array<non-empty-string, array<non-empty-string, File>>
      */
     public function getFiles(): array
     {

src/Toolkit/src/Installer/PoolResolver.php

@@ -39,15 +39,15 @@ public function resolveForRecipe(Kit $kit, Recipe $recipe): Pool
             $visitedRecipes->attach($currentComponent);
 
             foreach ($recipe->getFiles() as $file) {
-                $pool->addFile($file);
+                $pool->addFile($recipe, $file);
             }
 
             foreach ($recipe->manifest->dependencies as $dependency) {
                 if ($dependency instanceof PhpPackageDependency) {
                     $pool->addPhpPackageDependency($dependency);
-                } elseif($dependency instanceof RecipeDependency) {
+                } elseif ($dependency instanceof RecipeDependency) {
                     if (null === $recipeDependency = $kit->getRecipe($dependency->name)) {
-                        throw new \LogicException(sprintf('The recipe "%s" has a dependency on unregistered recipe "%s".', $recipe->manifest->name, $dependency->name));
+                        throw new \LogicException(\sprintf('The recipe "%s" has a dependency on unregistered recipe "%s".', $recipe->manifest->name, $dependency->name));
                     }
 
                     $recipesStack[] = $recipeDependency;

src/Toolkit/src/Kit/Kit.php

@@ -68,7 +68,7 @@ public function getRecipes(?RecipeType $type = null): array
     public function getRecipe(string $name, ?RecipeType $type = null): ?Recipe
     {
         foreach ($this->recipes as $recipe) {
-            if ($recipe->manifest->name === $name && ($type === null || $recipe->manifest->type === $type)) {
+            if ($recipe->manifest->name === $name && (null === $type || $recipe->manifest->type === $type)) {
                 return $recipe;
             }
         }