[Toolkit] Fix UXToolkitBundle name, refactor DependencyInjection/* in UXToolkitBundle,

Author: Kocal

src/Toolkit/config/services.php

@@ -0,0 +1,96 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+/*
+ * @author Hugo Alliaume <[email protected]>
+ */
+
+use Symfony\UX\Toolkit\Command\BuildRegistryCommand;
+use Symfony\UX\Toolkit\Command\DebugUxToolkitCommand;
+use Symfony\UX\Toolkit\Command\UxToolkitInstallCommand;
+use Symfony\UX\Toolkit\Compiler\RegistryCompiler;
+use Symfony\UX\Toolkit\Compiler\TwigComponentCompiler;
+use Symfony\UX\Toolkit\ComponentRepository\CurrentTheme;
+use Symfony\UX\Toolkit\ComponentRepository\GithubRepository;
+use Symfony\UX\Toolkit\ComponentRepository\OfficialRepository;
+use Symfony\UX\Toolkit\ComponentRepository\RepositoryFactory;
+use Symfony\UX\Toolkit\ComponentRepository\RepositoryIdentifier;
+use Symfony\UX\Toolkit\Registry\DependenciesResolver;
+use Symfony\UX\Toolkit\Registry\RegistryFactory;
+
+return static function (ContainerConfigurator $container): void {
+    $container->services()
+        ->set('.ux_toolkit.compiler.registry_compiler', RegistryCompiler::class)
+            ->args([
+                service('filesystem')
+            ])
+
+        ->set('.ux_toolkit.compiler.twig_component_compiler', TwigComponentCompiler::class)
+            ->args([
+                param('ux_toolkit.prefix'),
+                service('.ux_toolkit.registry.dependencies_resolver'),
+                service('filesystem'),
+            ])
+
+        ->set('.ux_toolkit.component_repository.official_repository', OfficialRepository::class)
+            ->args([
+                service('filesystem')
+            ])
+
+        ->set('.ux_toolkit.component_repository.github_repository', GithubRepository::class)
+            ->args([
+                service('filesystem'),
+                service('http_client')->nullOnInvalid(),
+            ])
+
+        ->set('.ux_toolkit.component_repository.repository_factory', RepositoryFactory::class)
+            ->args([
+                service('.ux_toolkit.component_repository.official_repository'),
+                service('.ux_toolkit.component_repository.github_repository'),
+            ])
+
+        ->set('.ux_toolkit.component_repository.current_theme', CurrentTheme::class)
+            ->args([
+                param('ux_toolkit.theme'),
+                service('.ux_toolkit.component_repository.repository_factory'),
+                service('.ux_toolkit.component_repository.repository_identifier'),
+            ])
+
+        ->set('.ux_toolkit.component_repository.repository_identifier', RepositoryIdentifier::class)
+
+        ->set('.ux_toolkit.registry.dependencies_resolver', DependenciesResolver::class)
+
+        ->set('.ux_toolkit.registry.registry_factory', RegistryFactory::class)
+
+        ->set('.ux_toolkit.command.build_registry', BuildRegistryCommand::class)
+            ->args([
+                service('.ux_toolkit.compiler.registry_compiler')
+            ])
+            ->tag('console.command')
+
+        ->set('.ux_toolkit.command.install', UxToolkitInstallCommand::class)
+            ->args([
+                service('.ux_toolkit.component_repository.current_theme'),
+                service('.ux_toolkit.registry.registry_factory'),
+                service('.ux_toolkit.compiler.twig_component_compiler'),
+            ])
+            ->tag('console.command')
+
+        ->set('.ux_toolkit.command.debug', DebugUxToolkitCommand::class)
+            ->args([
+                service('.ux_toolkit.component_repository.current_theme'),
+                service('.ux_toolkit.registry.registry_factory'),
+            ])
+            ->tag('console.command')
+    ;
+};

src/Toolkit/src/Compiler/RegistryCompiler.php

@@ -23,10 +23,10 @@
  *
  * @internal
  */
-final class RegistryCompiler
+final readonly class RegistryCompiler
 {
     public function __construct(
-        private readonly Filesystem $filesystem,
+        private Filesystem $filesystem,
     ) {
     }
 

src/Toolkit/src/Compiler/TwigComponentCompiler.php

@@ -23,11 +23,12 @@
  *
  * @internal
  */
-final class TwigComponentCompiler
+final readonly class TwigComponentCompiler
 {
     public function __construct(
-        private readonly ?string $prefix,
-        private readonly DependenciesResolver $dependenciesResolver,
+        private ?string $prefix,
+        private DependenciesResolver $dependenciesResolver,
+        private Filesystem $filesystem,
     ) {
     }
 
@@ -40,9 +41,8 @@ public function compile(
         // resolve dependencies (avoid circular dependencies)
         $this->dependenciesResolver->resolve($registry);
 
-        $filesystem = new Filesystem();
-        if (!$filesystem->exists($directory)) {
-            $filesystem->mkdir($directory);
+        if (!$this->filesystem->exists($directory)) {
+            $this->filesystem->mkdir($directory);
         }
 
         // We need to install all children components of each parent component
@@ -59,11 +59,11 @@ public function compile(
         $componentsToInstall = array_merge([$item->name], $componentsToInstall);
 
         foreach ($componentsToInstall as $componentName) {
-            $this->installComponent($registry->get($componentName), $directory, $filesystem, $overwrite);
+            $this->installComponent($registry->get($componentName), $directory, $overwrite);
         }
     }
 
-    private function installComponent(RegistryItem $item, string $directory, Filesystem $filesystem, bool $overwrite): void
+    private function installComponent(RegistryItem $item, string $directory, bool $overwrite): void
     {
         if (RegistryItemType::Component !== $item->type) {
             return;
@@ -75,10 +75,10 @@ private function installComponent(RegistryItem $item, string $directory, Filesys
             $item->name.'.html.twig',
         ]);
 
-        if ($filesystem->exists($filename) && !$overwrite) {
+        if ($this->filesystem->exists($filename) && !$overwrite) {
             throw new TwigComponentAlreadyExist("The component '{$item->name}' already exists.", 0, null);
         }
 
-        $filesystem->dumpFile($filename, $item->code);
+        $this->filesystem->dumpFile($filename, $item->code);
     }
 }

src/Toolkit/src/ComponentRepository/GithubRepository.php

@@ -21,18 +21,18 @@
  *
  * @internal
  */
-class GithubRepository implements ComponentRepository
+final readonly class GithubRepository implements ComponentRepository
 {
     public function __construct(
-        private readonly Filesystem $filesystem,
-        private readonly ?HttpClientInterface $httpClient = null,
+        private Filesystem $filesystem,
+        private ?HttpClientInterface $httpClient = null,
     ) {
         if (!class_exists(HttpClient::class)) {
-            throw new \LogicException('You must install "symfony/http-client" to use ux-toolkit with remote component. Try running "composer require symfony/http-client".');
+            throw new \LogicException('You must install "symfony/http-client" to use the UX Toolkit with remote components. Try running "composer require symfony/http-client".');
         }
 
         if (!class_exists(\ZipArchive::class)) {
-            throw new \LogicException('You must have the Zip extension installed to use ux-toolkit with remote components.');
+            throw new \LogicException('You must have the Zip extension installed to use UX Toolit with remote components.');
         }
     }
 

src/Toolkit/src/ComponentRepository/OfficialRepository.php

@@ -19,14 +19,18 @@
  *
  * @internal
  */
-class OfficialRepository implements ComponentRepository
+final class OfficialRepository implements ComponentRepository
 {
+    public function __construct(
+        private Filesystem $filesystem,
+    ) {
+    }
+
     public function fetch(RepositoryIdentity $repository): Finder
     {
         $finder = new Finder();
-        $fileystem = new Filesystem();
 
-        if (! $fileystem->exists(__DIR__.'/../../registry/'.$repository->getPackage())) {
+        if (!$this->filesystem->exists(__DIR__.'/../../registry/'.$repository->getPackage())) {
             throw new \InvalidArgumentException('This theme does not exist.');
         }
 

src/Toolkit/src/ComponentRepository/RepositoryFactory.php

@@ -16,11 +16,11 @@
  *
  * @internal
  */
-final class RepositoryFactory
+readonly final class RepositoryFactory
 {
     public function __construct(
-        private readonly OfficialRepository $officialRepository,
-        private readonly GithubRepository $githubRepository,
+        private OfficialRepository $officialRepository,
+        private GithubRepository $githubRepository,
     ) {
     }
 

src/Toolkit/src/ComponentRepository/RepositoryIdentifier.php

@@ -16,7 +16,7 @@
  *
  * @internal
  */
-final class RepositoryIdentifier
+final readonly class RepositoryIdentifier
 {
     public function identify(string $name): RepositoryIdentity
     {

src/Toolkit/src/DependencyInjection/Configuration.php

@@ -16,7 +16,7 @@
  *
  * @internal
  */
-class DependenciesResolver
+final readonly class DependenciesResolver
 {
     public function resolve(Registry $registry): array
     {