Config files update

src/TelegramBotBundle.php

@@ -4,21 +4,29 @@
 
 namespace Luzrain\TelegramBotBundle;
 
-use Luzrain\TelegramBotBundle\DependencyInjection\CommandCompilerPass;
-use Luzrain\TelegramBotBundle\DependencyInjection\TelegramBotExtension;
+use Symfony\Component\Config\Definition\Configurator\DefinitionConfigurator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
-use Symfony\Component\HttpKernel\Bundle\Bundle;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symfony\Component\HttpKernel\Bundle\AbstractBundle;
 
-final class TelegramBotBundle extends Bundle
+final class TelegramBotBundle extends AbstractBundle
 {
+    protected string $extensionAlias = 'telegram_bot';
+
+    public function configure(DefinitionConfigurator $definition): void
+    {
+        $configurator = require __DIR__ . '/config/configuration.php';
+        $configurator($definition);
+    }
+
     public function build(ContainerBuilder $container): void
     {
-        $container->addCompilerPass(new CommandCompilerPass());
+        $container->addCompilerPass(require __DIR__ . '/config/compilerpass.php');
     }
 
-    public function getContainerExtension(): ExtensionInterface
+    public function loadExtension(array $config, ContainerConfigurator $container, ContainerBuilder $builder): void
     {
-        return new TelegramBotExtension();
+        $configurator = require __DIR__ . '/config/services.php';
+        $configurator($config, $builder);
     }
 }

src/DependencyInjection/CommandCompilerPass.php → src/config/compilerpass.php

@@ -2,20 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Luzrain\TelegramBotBundle\DependencyInjection;
-
 use Luzrain\TelegramBotBundle\TelegramBot\CommandMetadataProvider;
 use Luzrain\TelegramBotBundle\TelegramBot\UpdateHandler;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ServiceLocator;
 
-final class CommandCompilerPass implements CompilerPassInterface
-{
-    /**
-     * @psalm-suppress ArgumentTypeCoercion
-     */
+return new class () implements CompilerPassInterface {
     public function process(ContainerBuilder $container): void
     {
         $controllers = $container->findTaggedServiceIds('telegram_bot.command');
@@ -69,4 +63,4 @@ private function referenceMap(array $serviceClasses): array
         }
         return $result;
     }
-}
+};

src/config/configuration.php

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Luzrain\TelegramBotBundle\config;
+
+use Luzrain\TelegramBotApi\Type\Update;
+use Symfony\Component\Config\Definition\Configurator\DefinitionConfigurator;
+
+/** @php-cs-fixer-ignore */
+return static function (DefinitionConfigurator $definition) {
+    $definition->rootNode()
+        ->children()
+            ->scalarNode('http_client')
+                ->isRequired()
+                ->cannotBeEmpty()
+                ->end()
+            ->scalarNode('request_factory')
+                ->isRequired()
+                ->cannotBeEmpty()
+                ->end()
+            ->scalarNode('stream_factory')
+                ->isRequired()
+                ->cannotBeEmpty()
+                ->end()
+            ->scalarNode('api_token')
+                ->isRequired()
+                ->cannotBeEmpty()
+                ->end()
+            ->scalarNode('secret_token')
+                ->defaultNull()
+                ->end()
+            ->arrayNode('allowed_updates')
+                ->prototype('scalar')->end()
+                ->beforeNormalization()
+                ->always(fn ($values) => array_map(strval(...), $values))
+                ->end()
+                ->validate()
+                ->ifTrue(fn ($configArray) => array_diff($configArray, Update::getUpdateTypes()) !== [])
+                ->then(function ($configArray) {
+                    if (array_diff($configArray, Update::getUpdateTypes()) !== []) {
+                        $allowedKeys = implode(', ', Update::getUpdateTypes());
+                        throw new \InvalidArgumentException(sprintf('Invalid updates list. Allowed updates: %s', $allowedKeys));
+                    }
+                    return $configArray;
+                })
+                ->end()
+            ->end()
+        ->end();
+};