Skip to content

Commit 862160b

Browse files
KocalKocal
committed
bug #2892 [Toolkit] Fix comptability with Windows (Kocal)
This PR was squashed before being merged into the 2.x branch. Discussion ---------- [Toolkit] Fix comptability with Windows | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | Docs? | no <!-- required for new features --> | Issues | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, explain below instead --> | License | MIT <!-- Replace this notice by a description of your feature/bugfix. This will help reviewers and should be a good start for the documentation. Additionally (see https://symfony.com/releases): - Always add tests and ensure they pass. - For new features, provide some code snippets to help understand usage. - Features and deprecations must be submitted against branch main. - Update/add documentation as required (we can help!) - Changelog entry should follow https://symfony.com/doc/current/contributing/code/conventions.html#writing-a-changelog-entry - Never break backward compatibility (see https://symfony.com/bc). --> Following #2816 Commits ------- 98aba7a [Toolkit] Fix comptability with Windows
2 parents 59cb869 + 98aba7a commit 862160b

File tree

3 files changed

+28
-29
lines changed

3 files changed

+28
-29
lines changed

‎src/Toolkit/src/Kit/KitSynchronizer.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ private function synchronizeComponents(Kit $kit): void
6969
;
7070

7171
foreach ($finder as $file) {
72-
$relativePathNameToKit = $file->getRelativePathname();
73-
$relativePathName = str_replace($componentsPath.\DIRECTORY_SEPARATOR, '', $relativePathNameToKit);
72+
$relativePathNameToKit = Path::normalize($file->getRelativePathname());
73+
$relativePathName = str_replace($componentsPath.'/', '', $relativePathNameToKit);
7474
$componentName = $this->extractComponentName($relativePathName);
7575

7676
$meta = null;
@@ -161,8 +161,8 @@ private function synchronizeStimulusControllers(Kit $kit): void
161161
;
162162

163163
foreach ($finder as $file) {
164-
$relativePathNameToKit = $file->getRelativePathname();
165-
$relativePathName = str_replace($controllersPath.\DIRECTORY_SEPARATOR, '', $relativePathNameToKit);
164+
$relativePathNameToKit = Path::normalize($file->getRelativePathname());
165+
$relativePathName = str_replace($controllersPath.'/', '', $relativePathNameToKit);
166166
$controllerName = $this->extractStimulusControllerName($relativePathName);
167167
$controller = new StimulusController(
168168
name: $controllerName,

‎src/Toolkit/tests/Command/DebugKitCommandTest.php‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\UX\Toolkit\Tests\Command;
1313

1414
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
15+
use Symfony\Component\Filesystem\Path;
1516
use Zenstruck\Console\Test\InteractsWithConsole;
1617

1718
class DebugKitCommandTest extends KernelTestCase
@@ -21,36 +22,34 @@ class DebugKitCommandTest extends KernelTestCase
2122
public function testShouldBeAbleToDebug(): void
2223
{
2324
$this->bootKernel();
24-
$this->consoleCommand(\sprintf('ux:toolkit:debug-kit %s', __DIR__.'/../../kits/shadcn'))
25+
$this->consoleCommand(\sprintf('ux:toolkit:debug-kit %s', Path::join(__DIR__, '/../../kits/shadcn')))
2526
->execute()
2627
->assertSuccessful()
2728
// Kit details
2829
->assertOutputContains('Name Shadcn')
2930
->assertOutputContains('Homepage https://ux.symfony.com/components')
3031
->assertOutputContains('License MIT')
3132
// Components details
32-
->assertOutputContains(<<<'EOF'
33-
+--------------+----------------------- Component: "Avatar" --------------------------------------+
34-
| File(s) | templates/components/Avatar.html.twig |
35-
| Dependencies | tales-from-a-dev/twig-tailwind-extra |
36-
| | Avatar:Image |
37-
| | Avatar:Text |
38-
+--------------+----------------------------------------------------------------------------------+
39-
EOF
40-
)
41-
->assertOutputContains(<<<'EOF'
42-
+--------------+----------------------- Component: "Table" ---------------------------------------+
43-
| File(s) | templates/components/Table.html.twig |
44-
| Dependencies | tales-from-a-dev/twig-tailwind-extra |
45-
| | Table:Body |
46-
| | Table:Caption |
47-
| | Table:Cell |
48-
| | Table:Footer |
49-
| | Table:Head |
50-
| | Table:Header |
51-
| | Table:Row |
52-
+--------------+----------------------------------------------------------------------------------+
53-
EOF
54-
);
33+
->assertOutputContains(implode(\PHP_EOL, [
34+
'+--------------+----------------------- Component: "Avatar" --------------------------------------+',
35+
'| File(s) | templates/components/Avatar.html.twig |',
36+
'| Dependencies | tales-from-a-dev/twig-tailwind-extra |',
37+
'| | Avatar:Image |',
38+
'| | Avatar:Text |',
39+
'+--------------+----------------------------------------------------------------------------------+',
40+
]))
41+
->assertOutputContains(implode(\PHP_EOL, [
42+
'+--------------+----------------------- Component: "Table" ---------------------------------------+',
43+
'| File(s) | templates/components/Table.html.twig |',
44+
'| Dependencies | tales-from-a-dev/twig-tailwind-extra |',
45+
'| | Table:Body |',
46+
'| | Table:Caption |',
47+
'| | Table:Cell |',
48+
'| | Table:Footer |',
49+
'| | Table:Head |',
50+
'| | Table:Header |',
51+
'| | Table:Row |',
52+
'+--------------+----------------------------------------------------------------------------------+',
53+
]));
5554
}
5655
}

‎src/Toolkit/tests/Command/InstallComponentCommandTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function testShouldAbleToInstallComponentTableAndItsDependencies(): void
5050
$this->assertFileDoesNotExist($expectedFile);
5151
}
5252

53-
$testCommand = $this->consoleCommand('ux:toolkit:install-component Table --destination='.$this->tmpDir)
53+
$testCommand = $this->consoleCommand(\sprintf('ux:toolkit:install-component Table --destination="%s"', str_replace('\\', '\\\\', $this->tmpDir)))
5454
->execute()
5555
->assertSuccessful()
5656
->assertOutputContains('Installing component Table from the Shadcn UI kit...')

0 commit comments

Comments
 (0)