Configuration codestyle. Readonly classes.

luzrain · Feb 28, 2024 · 4c2f2b7 · 4c2f2b7
1 parent c3b12ed
commit 4c2f2b7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/src/TelegramBot/Controller/WebHookController.php b/src/TelegramBot/Controller/WebHookController.php
@@ -14,7 +14,7 @@
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 
-final class WebHookController
+final readonly class WebHookController
 {
     public function __construct(
         private UpdateHandler $updateHandler,

diff --git a/src/TelegramBot/UpdateHandler.php b/src/TelegramBot/UpdateHandler.php
@@ -11,15 +11,15 @@
 use Luzrain\TelegramBotApi\Type\Update;
 use Symfony\Component\DependencyInjection\ServiceLocator;
 
-final class UpdateHandler
+final readonly class UpdateHandler
 {
     public function __construct(
         private ClientApi $client,
         private ServiceLocator $serviceLocator,
         array $controllersMap,
     ) {
-        foreach ($controllersMap as ['event' => $event, 'value' => $value, 'controller' => $controller]) {
-            $this->client->on($this->createClosure($event, $value, $controller));
+        foreach ($controllersMap as ['event' => $eventClass, 'value' => $value, 'controller' => $controller]) {
+            $this->client->on($this->createEvent($eventClass, $value, $controller));
         }
     }
 
@@ -34,13 +34,13 @@ public function handle(Update $update): Method|null
     /**
      * @param class-string<Event> $event
      */
-    private function createClosure(string $event, string $value, string $controller): Event
+    private function createEvent(string $event, string $value, string $controller): Event
     {
         return match ($event) {
             Event\Command::class => new $event($value, function (object $update, string ...$params) use ($controller) {
                 return $this->runController($controller, $update, $params);
             }),
-            Event\NamedCallbackQuery::class => new $event($value, function (object $update) use ($controller) {
+            Event\CallbackDataQuery::class => new $event($value, function (object $update) use ($controller) {
                 return $this->runController($controller, $update);
             }),
             default => new $event(function (object $update) use ($controller) {

diff --git a/src/config/compilerpass.php b/src/config/compilerpass.php
@@ -27,32 +27,31 @@ public function process(ContainerBuilder $container): void
         }
 
         // Commands have the highest priority by default
-        usort($controllersMap, fn (array $a, array $b) => str_starts_with($a['value'], '/') ? -1 : 1);
+        \usort($controllersMap, fn (array $a, array $b) => \str_starts_with($a['value'], '/') ? -1 : 1);
 
         // Sort by priority
-        usort($controllersMap, fn (array $a, array $b) => $b['priority'] <=> $a['priority']);
+        \usort($controllersMap, fn (array $a, array $b) => $b['priority'] <=> $a['priority']);
 
         foreach ($controllersMap as $id => $row) {
             unset($controllersMap[$id]['priority']);
         }
 
         $container
             ->register('telegram_bot.controllers_locator', ServiceLocator::class)
-            ->setArguments([$this->referenceMap(array_keys($controllers))])
-            ->addTag('container.service_locator')
-        ;
+            ->setArguments([$this->referenceMap(\array_keys($controllers))])
+            ->addTag('container.service_locator');
 
         $container
             ->register('telegram_bot.update_handler', UpdateHandler::class)
-            ->setArgument('$client', new Reference('telegram_bot.client_api'))
-            ->setArgument('$serviceLocator', new Reference('telegram_bot.controllers_locator'))
-            ->setArgument('$controllersMap', $controllersMap)
-        ;
+            ->setArguments([
+                new Reference('telegram_bot.client_api'),
+                new Reference('telegram_bot.controllers_locator'),
+                $controllersMap,
+            ]);
 
         $container
             ->register('telegram_bot.command_metadata_provider', CommandMetadataProvider::class)
-            ->setArgument('$controllersMap', $controllersMap)
-        ;
+            ->setArguments([$controllersMap]);
     }
 
     private function referenceMap(array $serviceClasses): array