Removed XML services declaration in favor of PHP services declaration

Author: yann-eugone

src/DependencyInjection/EnumExtension.php

@@ -5,13 +5,17 @@
 namespace Yokai\EnumBundle\DependencyInjection;
 
 use Symfony\Bundle\TwigBundle\TwigBundle;
-use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Yokai\EnumBundle\EnumInterface;
+use Yokai\EnumBundle\EnumRegistry;
+use Yokai\EnumBundle\Form\Extension\EnumTypeGuesser;
+use Yokai\EnumBundle\Form\Type\EnumType;
+use Yokai\EnumBundle\Twig\Extension\EnumExtension as EnumTwigExtension;
+use Yokai\EnumBundle\Validator\Constraints\EnumValidator;
 
 /**
  * @author Yann Eugoné <[email protected]>
@@ -23,24 +27,34 @@ class EnumExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container): void
     {
-        $xmlLoader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
-        $xmlLoader->load('enum.xml');
+        $container->register('yokai_enum.enum_registry', EnumRegistry::class);
+        $container->setAlias(EnumRegistry::class, 'yokai_enum.enum_registry');
+
+        $registry = new Reference(EnumRegistry::class);
 
         $requiresForm = interface_exists(FormInterface::class);
         $requiresValidator = interface_exists(ValidatorInterface::class);
         $requiresTwig = class_exists(TwigBundle::class);
 
         if ($requiresForm) {
-            $xmlLoader->load('form.xml');
-            if (!$requiresValidator) {
-                $container->removeDefinition('form_extention.type_guesser.enum');
+            $container->register('yokai_enum.form_type.enum_type', EnumType::class)
+                ->setArgument('$enumRegistry', $registry)
+                ->addTag('form.type');
+            if ($requiresValidator) {
+                $container->register('yokai_enum.form_extension.enum_type_guesser', EnumTypeGuesser::class)
+                    ->setArgument('$metadataFactory', new Reference('validator.mapping.class_metadata_factory'))
+                    ->addTag('form.type_guesser');
             }
         }
         if ($requiresValidator) {
-            $xmlLoader->load('validator.xml');
+            $container->register('yokai_enum.validator_constraints.enum_validator', EnumValidator::class)
+                ->setArgument('$enumRegistry', $registry)
+                ->addTag('validator.constraint_validator');
         }
         if ($requiresTwig) {
-            $xmlLoader->load('twig.xml');
+            $container->register('yokai_enum.twig_extension.enum_extension', EnumTwigExtension::class)
+                ->setArgument('$enumRegistry', $registry)
+                ->addTag('twig.extension');
         }
 
         $container->registerForAutoconfiguration(EnumInterface::class)

src/Form/Extension/EnumTypeGuesser.php

@@ -10,8 +10,6 @@
 use Symfony\Component\Form\Guess\ValueGuess;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Constraints\Compound;
-use Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface;
-use Yokai\EnumBundle\EnumRegistry;
 use Yokai\EnumBundle\Form\Type\EnumType;
 use Yokai\EnumBundle\Validator\Constraints\Enum;
 
@@ -20,22 +18,6 @@
  */
 class EnumTypeGuesser extends ValidatorTypeGuesser
 {
-    /**
-     * @var EnumRegistry
-     */
-    private $enumRegistry;
-
-    /**
-     * @param MetadataFactoryInterface $metadataFactory
-     * @param EnumRegistry             $enumRegistry
-     */
-    public function __construct(MetadataFactoryInterface $metadataFactory, EnumRegistry $enumRegistry)
-    {
-        parent::__construct($metadataFactory);
-
-        $this->enumRegistry = $enumRegistry;
-    }
-
     /**
      * @inheritdoc
      */