iterate

Kocal · Kocal · commit f9292eec40f5 · 2025-08-11T00:44:06.000+02:00
diff --git a/src/Toolkit/src/Dependency/DependencyInterface.php b/src/Toolkit/src/Dependency/DependencyInterface.php
@@ -21,4 +21,6 @@
 interface DependencyInterface extends \Stringable
 {
     public function isEquivalentTo(self $dependency): bool;
+
+    public function toDebug(): string;
 }
diff --git a/src/Toolkit/src/Dependency/PhpPackageDependency.php b/src/Toolkit/src/Dependency/PhpPackageDependency.php
@@ -50,8 +50,13 @@ public function isHigherThan(self $dependency): bool
         return $this->constraintVersion->isHigherThan($dependency->constraintVersion);
     }
 
+    public function toDebug(): string
+    {
+        return \sprintf('PHP package "%s"', $this->__toString());
+    }
+
     public function __toString(): string
     {
-        return \sprintf('PHP package "%s%s"', $this->name, null !== $this->constraintVersion ? ':'.$this->constraintVersion : '');
+        return $this->name.(null !== $this->constraintVersion ? ':'.$this->constraintVersion : '');
     }
 }
diff --git a/src/Toolkit/src/Dependency/RecipeDependency.php b/src/Toolkit/src/Dependency/RecipeDependency.php
@@ -30,8 +30,13 @@ public function isEquivalentTo(DependencyInterface $dependency): bool
         return $this->name === $dependency->name;
     }
 
+    public function toDebug(): string
+    {
+        return \sprintf('Recipe "%s"', $this->__toString());
+    }
+
     public function __toString(): string
     {
-        return \sprintf('Recipe "%s"', $this->name);
+        return $this->name;
     }
 }
diff --git a/src/Toolkit/src/Kit/KitSynchronizer.php b/src/Toolkit/src/Kit/KitSynchronizer.php
@@ -32,7 +32,7 @@ public function __construct(
     public function synchronize(Kit $kit): void
     {
         if ($this->filesystem->exists($installMd = Path::join($kit->absolutePath, 'INSTALL.md'))) {
-            $kit->installAsMarkdown = $this->filesystem->readFile($installMd);
+            $kit->installAsMarkdown = file_get_contents($installMd);
         }
 
         $this->synchronizeRecipes($kit);
diff --git a/src/Toolkit/tests/Command/DebugKitCommandTest.php b/src/Toolkit/tests/Command/DebugKitCommandTest.php
@@ -35,7 +35,7 @@ public function testShouldBeAbleToDebug()
                 '| File(s)      | templates/components/Avatar.html.twig                                            |',
                 '|              | templates/components/Avatar/Image.html.twig                                      |',
                 '|              | templates/components/Avatar/Text.html.twig                                       |',
-                '| Dependencies | PHP package "tales-from-a-dev/twig-tailwind-extra"                               |',
+                '| Dependencies | tales-from-a-dev/twig-tailwind-extra                                             |',
                 '+--------------+----------------------------------------------------------------------------------+',
             ]))
             ->assertOutputContains(implode(\PHP_EOL, [
@@ -48,7 +48,7 @@ public function testShouldBeAbleToDebug()
                 '|              | templates/components/Table/Head.html.twig                                        |',
                 '|              | templates/components/Table/Header.html.twig                                      |',
                 '|              | templates/components/Table/Row.html.twig                                         |',
-                '| Dependencies | PHP package "tales-from-a-dev/twig-tailwind-extra"                               |',
+                '| Dependencies | tales-from-a-dev/twig-tailwind-extra                                             |',
                 '+--------------+----------------------------------------------------------------------------------+',
             ]));
     }
diff --git a/src/Toolkit/tests/Dependency/PhpPackageDependencyTest.php b/src/Toolkit/tests/Dependency/PhpPackageDependencyTest.php
@@ -22,11 +22,13 @@ public function testShouldBeInstantiable()
         $dependency = new PhpPackageDependency('twig/html-extra');
         $this->assertSame('twig/html-extra', $dependency->name);
         $this->assertNull($dependency->constraintVersion);
-        $this->assertSame('PHP package "twig/html-extra"', (string) $dependency);
+        $this->assertSame('PHP package "twig/html-extra"', $dependency->toDebug());
+        $this->assertSame('twig/html-extra', (string) $dependency);
 
         $dependency = new PhpPackageDependency('twig/html-extra', new Version('^3.2.1'));
         $this->assertSame('twig/html-extra', $dependency->name);
-        $this->assertSame('PHP package "twig/html-extra:^3.2.1"', (string) $dependency);
+        $this->assertSame('PHP package "twig/html-extra:^3.2.1"', $dependency->toDebug());
+        $this->assertSame('twig/html-extra:^3.2.1', (string) $dependency);
     }
 
     public function testShouldFailIfPackageNameIsInvalid()
diff --git a/src/Toolkit/tests/Dependency/RecipeDependencyTest.php b/src/Toolkit/tests/Dependency/RecipeDependencyTest.php
@@ -20,6 +20,7 @@ public function testShouldBeInstantiable()
     {
         $dependency = new RecipeDependency('Table');
         $this->assertSame('Table', $dependency->name);
-        $this->assertSame('Recipe "Table"', (string) $dependency);
+        $this->assertSame('Recipe "Table"', $dependency->toDebug());
+        $this->assertSame('Table', (string) $dependency);
     }
 }
diff --git a/src/Toolkit/tests/Installer/PoolResolverTest.php b/src/Toolkit/tests/Installer/PoolResolverTest.php
@@ -14,6 +14,7 @@
 namespace Symfony\UX\Toolkit\Tests\Installer;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Filesystem\Filesystem;
 use Symfony\UX\Toolkit\Dependency\RecipeDependency;
 use Symfony\UX\Toolkit\Installer\PoolResolver;
 use Symfony\UX\Toolkit\Kit\KitSynchronizer;
@@ -26,7 +27,7 @@ final class PoolResolverTest extends TestCase
 
     public function testCanResolveDependencies()
     {
-        $kitSynchronizer = new KitSynchronizer(new RecipeSynchronizer());
+        $kitSynchronizer = new KitSynchronizer(new Filesystem(), new RecipeSynchronizer());
         $kit = self::createLocalKit('shadcn');
         $kitSynchronizer->synchronize($kit);
 
@@ -56,7 +57,7 @@ public function testCanResolveDependencies()
 
     public function testCanHandleCircularRecipeDependencies()
     {
-        $kitSynchronizer = new KitSynchronizer(new RecipeSynchronizer());
+        $kitSynchronizer = new KitSynchronizer(new Filesystem(), new RecipeSynchronizer());
         $kit = self::createFixtureKit('with-circular-components-dependencies');
         $kitSynchronizer->synchronize($kit);
 
diff --git a/src/Toolkit/tests/Installer/PoolTest.php b/src/Toolkit/tests/Installer/PoolTest.php
@@ -85,11 +85,11 @@ public function testCanAddPhpPackageDependencyWithHigherVersion()
         $pool->addPhpPackageDependency(new PhpPackageDependency('twig/html-extra', new Version('^3.11.0')));
 
         $this->assertCount(1, $pool->getPhpPackageDependencies());
-        $this->assertEquals('PHP package "twig/html-extra:^3.11.0"', (string) $pool->getPhpPackageDependencies()['twig/html-extra']);
+        $this->assertEquals('twig/html-extra:^3.11.0', (string) $pool->getPhpPackageDependencies()['twig/html-extra']);
 
         $pool->addPhpPackageDependency(new PhpPackageDependency('twig/html-extra', new Version('^3.12.0')));
 
         $this->assertCount(1, $pool->getPhpPackageDependencies());
-        $this->assertEquals('PHP package "twig/html-extra:^3.12.0"', (string) $pool->getPhpPackageDependencies()['twig/html-extra']);
+        $this->assertEquals('twig/html-extra:^3.12.0', (string) $pool->getPhpPackageDependencies()['twig/html-extra']);
     }
 }
diff --git a/src/Toolkit/tests/Kit/KitSynchronizerTest.php b/src/Toolkit/tests/Kit/KitSynchronizerTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\UX\Toolkit\Tests\Kit;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Filesystem\Filesystem;
 use Symfony\UX\Toolkit\Dependency\PhpPackageDependency;
 use Symfony\UX\Toolkit\Dependency\Version;
 use Symfony\UX\Toolkit\Kit\KitSynchronizer;
@@ -31,7 +32,7 @@ protected function setUp(): void
 
     public function testCanResolveDependencies()
     {
-        $kitSynchronizer = new KitSynchronizer(new RecipeSynchronizer());
+        $kitSynchronizer = new KitSynchronizer(new Filesystem(), new RecipeSynchronizer());
         $kit = self::createLocalKit('shadcn');
 
         $kitSynchronizer->synchronize($kit);
diff --git a/ux.symfony.com/src/Service/Toolkit/ToolkitService.php b/ux.symfony.com/src/Service/Toolkit/ToolkitService.php
@@ -103,9 +103,7 @@ public function renderInstallationSteps(ToolkitKitId $kitId, Recipe $component):
 
         if ($phpPackageDependencies = $pool->getPhpPackageDependencies()) {
             $manual .= '<li><strong>If necessary, install the following Composer dependencies:</strong>';
-            $manual .= CodeBlockRenderer::highlightCode('shell', '$ composer require '.implode(' ',
-                array_map(fn (PhpPackageDependency $dependency) => $dependency->name.($dependency->constraintVersion ? ':'.$dependency->constraintVersion : ''), $phpPackageDependencies),
-            ), 'margin-bottom: 0');
+            $manual .= CodeBlockRenderer::highlightCode('shell', '$ composer require '.implode(' ', $phpPackageDependencies)), 'margin-bottom: 0');
             $manual .= '</li>';
         }
 

Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,6 @@`
`21`	`21`	`interface DependencyInterface extends \Stringable`
`22`	`22`	`{`
`23`	`23`	`public function isEquivalentTo(self $dependency): bool;`
	`24`	`+`
	`25`	`+ public function toDebug(): string;`
`24`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,13 @@ public function isHigherThan(self $dependency): bool`
`50`	`50`	`return $this->constraintVersion->isHigherThan($dependency->constraintVersion);`
`51`	`51`	`}`
`52`	`52`
	`53`	`+ public function toDebug(): string`
	`54`	`+ {`
	`55`	`+ return \sprintf('PHP package "%s"', $this->__toString());`
	`56`	`+ }`
	`57`	`+`
`53`	`58`	`public function __toString(): string`
`54`	`59`	`{`
`55`		`- return \sprintf('PHP package "%s%s"', $this->name, null !== $this->constraintVersion ? ':'.$this->constraintVersion : '');`
	`60`	`+ return $this->name.(null !== $this->constraintVersion ? ':'.$this->constraintVersion : '');`
`56`	`61`	`}`
`57`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,13 @@ public function isEquivalentTo(DependencyInterface $dependency): bool`
`30`	`30`	`return $this->name === $dependency->name;`
`31`	`31`	`}`
`32`	`32`
	`33`	`+ public function toDebug(): string`
	`34`	`+ {`
	`35`	`+ return \sprintf('Recipe "%s"', $this->__toString());`
	`36`	`+ }`
	`37`	`+`
`33`	`38`	`public function __toString(): string`
`34`	`39`	`{`
`35`		`- return \sprintf('Recipe "%s"', $this->name);`
	`40`	`+ return $this->name;`
`36`	`41`	`}`
`37`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function __construct(`
`32`	`32`	`public function synchronize(Kit $kit): void`
`33`	`33`	`{`
`34`	`34`	`if ($this->filesystem->exists($installMd = Path::join($kit->absolutePath, 'INSTALL.md'))) {`
`35`		`- $kit->installAsMarkdown = $this->filesystem->readFile($installMd);`
	`35`	`+ $kit->installAsMarkdown = file_get_contents($installMd);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`$this->synchronizeRecipes($kit);`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ public function testShouldBeInstantiable()`
`20`	`20`	`{`
`21`	`21`	`$dependency = new RecipeDependency('Table');`
`22`	`22`	`$this->assertSame('Table', $dependency->name);`
`23`		`- $this->assertSame('Recipe "Table"', (string) $dependency);`
	`23`	`+ $this->assertSame('Recipe "Table"', $dependency->toDebug());`
	`24`	`+ $this->assertSame('Table', (string) $dependency);`
`24`	`25`	`}`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,11 +85,11 @@ public function testCanAddPhpPackageDependencyWithHigherVersion()`
`85`	`85`	`$pool->addPhpPackageDependency(new PhpPackageDependency('twig/html-extra', new Version('^3.11.0')));`
`86`	`86`
`87`	`87`	`$this->assertCount(1, $pool->getPhpPackageDependencies());`
`88`		`- $this->assertEquals('PHP package "twig/html-extra:^3.11.0"', (string) $pool->getPhpPackageDependencies()['twig/html-extra']);`
	`88`	`+ $this->assertEquals('twig/html-extra:^3.11.0', (string) $pool->getPhpPackageDependencies()['twig/html-extra']);`
`89`	`89`
`90`	`90`	`$pool->addPhpPackageDependency(new PhpPackageDependency('twig/html-extra', new Version('^3.12.0')));`
`91`	`91`
`92`	`92`	`$this->assertCount(1, $pool->getPhpPackageDependencies());`
`93`		`- $this->assertEquals('PHP package "twig/html-extra:^3.12.0"', (string) $pool->getPhpPackageDependencies()['twig/html-extra']);`
	`93`	`+ $this->assertEquals('twig/html-extra:^3.12.0', (string) $pool->getPhpPackageDependencies()['twig/html-extra']);`
`94`	`94`	`}`
`95`	`95`	`}`