CommandDescriptionProcessor interface removed. Description processor …

…now can be implementec as callable
luzrain · Feb 28, 2024 · 12f4c9b · 12f4c9b
1 parent 2632ce1
commit 12f4c9b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 35 deletions.
diff --git a/src/TelegramBot/Command/ButtonUpdateCommand.php b/src/TelegramBot/Command/ButtonUpdateCommand.php
@@ -8,7 +8,6 @@
 use Luzrain\TelegramBotApi\Exception\TelegramApiException;
 use Luzrain\TelegramBotApi\Method;
 use Luzrain\TelegramBotApi\Type;
-use Luzrain\TelegramBotBundle\TelegramBot\CommandDescriptionProcessor;
 use Luzrain\TelegramBotBundle\TelegramBot\CommandMetadataProvider;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -17,11 +16,14 @@
 
 final class ButtonUpdateCommand extends Command
 {
+    private \Closure $descriptionProcessor;
+
     public function __construct(
         private BotApi $botApi,
         private CommandMetadataProvider $commandMetadataProvider,
-        private CommandDescriptionProcessor $descriptionProcessor,
+        callable|null $descriptionProcessor,
     ) {
+        $this->descriptionProcessor = $descriptionProcessor ? $descriptionProcessor(...) : static fn (string $str) => $str;
         parent::__construct();
     }
 
@@ -46,7 +48,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 continue;
             }
 
-            $description = $this->descriptionProcessor->process($attr->description);
+            $description = ($this->descriptionProcessor)($attr->description);
             $output->writeln(\sprintf("%s\t\t%s", $attr->command, $description));
             $commands[] = new Type\BotCommand(command: $attr->command, description: $description);
         }

diff --git a/src/TelegramBot/CommandDescriptionProcessor.php b/src/TelegramBot/CommandDescriptionProcessor.php
diff --git a/src/TelegramBot/DummyDescriptionProcessor.php b/src/TelegramBot/DummyDescriptionProcessor.php
diff --git a/src/config/services.php b/src/config/services.php
@@ -14,10 +14,10 @@
 use Luzrain\TelegramBotBundle\TelegramBot\Command\WebhookInfoCommand;
 use Luzrain\TelegramBotBundle\TelegramBot\Command\WebhookUpdateCommand;
 use Luzrain\TelegramBotBundle\TelegramBot\Controller\WebHookController;
-use Luzrain\TelegramBotBundle\TelegramBot\DummyDescriptionProcessor;
 use Luzrain\TelegramBotBundle\TelegramBot\LongPollingService;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Reference;
 
 return static function (array $config, ContainerBuilder $container) {
@@ -94,9 +94,8 @@
         ->setArguments([
             new Reference(BotApi::class),
             new Reference('telegram_bot.command_metadata_provider'),
-            new Reference('telegram_bot.description_processor'),
+            new Reference('telegram_bot.description_processor', ContainerInterface::NULL_ON_INVALID_REFERENCE),
         ])
-
     ;
 
     $container
@@ -105,10 +104,6 @@
         ->setArguments([new Reference(BotApi::class)])
     ;
 
-    $container
-        ->register('telegram_bot.description_processor', DummyDescriptionProcessor::class)
-    ;
-
     /** @var \Closure $controllerConfigurate */
     $controllerConfigurate = static function (ChildDefinition $definition, object $attribute, \ReflectionMethod $reflector): void {
         $definition->addTag('telegram_bot.command', [

diff --git a/tests/ServicesAutowiringTest.php b/tests/ServicesAutowiringTest.php
@@ -12,7 +12,6 @@
 use Luzrain\TelegramBotBundle\TelegramBot\Command\WebhookDeleteCommand;
 use Luzrain\TelegramBotBundle\TelegramBot\Command\WebhookInfoCommand;
 use Luzrain\TelegramBotBundle\TelegramBot\Command\WebhookUpdateCommand;
-use Luzrain\TelegramBotBundle\TelegramBot\CommandDescriptionProcessor;
 use Luzrain\TelegramBotBundle\TelegramBot\CommandMetadataProvider;
 use Luzrain\TelegramBotBundle\TelegramBot\Controller\WebHookController;
 use Luzrain\TelegramBotBundle\TelegramBot\LongPollingService;
@@ -49,6 +48,5 @@ public function testServiceAutowiring(): void
         $this->assertInstanceOf(ButtonDeleteCommand::class, self::$container->get('telegram_bot.menu_button_delete_command'));
         $this->assertInstanceOf(UpdateHandler::class, self::$container->get('telegram_bot.update_handler'));
         $this->assertInstanceOf(CommandMetadataProvider::class, self::$container->get('telegram_bot.command_metadata_provider'));
-        $this->assertInstanceOf(CommandDescriptionProcessor::class, self::$container->get('telegram_bot.description_processor'));
     }
 }