introduce repo for choices

src/DependencyInjection/ValanticPimcoreFormsExtension.php

@@ -11,6 +11,7 @@
 use Valantic\PimcoreFormsBundle\Form\InputHandler\InputHandlerInterface;
 use Valantic\PimcoreFormsBundle\Form\Output\OutputInterface;
 use Valantic\PimcoreFormsBundle\Form\RedirectHandler\RedirectHandlerInterface;
+use Valantic\PimcoreFormsBundle\Form\Type\ChoicesInterface;
 use Valantic\PimcoreFormsBundle\Repository\ConfigurationRepository;
 
 /**
@@ -23,6 +24,7 @@ class ValanticPimcoreFormsExtension extends Extension
     final public const TAG_OUTPUT = 'valantic.pimcore_forms.output';
     final public const TAG_REDIRECT_HANDLER = 'valantic.pimcore_forms.redirect_handler';
     final public const TAG_INPUT_HANDLER = 'valantic.pimcore_forms.input_handler';
+    final public const TAG_CHOICES = 'valantic.pimcore_forms.choices';
 
     /**
      * @param array<mixed> $configs
@@ -38,6 +40,7 @@ public function load(array $configs, ContainerBuilder $container): void
         $container->registerForAutoconfiguration(OutputInterface::class)->addTag(self::TAG_OUTPUT);
         $container->registerForAutoconfiguration(RedirectHandlerInterface::class)->addTag(self::TAG_REDIRECT_HANDLER);
         $container->registerForAutoconfiguration(InputHandlerInterface::class)->addTag(self::TAG_INPUT_HANDLER);
+        $container->registerForAutoconfiguration(ChoicesInterface::class)->addTag(self::TAG_CHOICES);
 
         $ymlLoader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $ymlLoader->load('services.yml');

src/Exception/Repository/ItemNotFoundInRepositoryException.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Valantic\PimcoreFormsBundle\Exception\Repository;
+
+use Valantic\PimcoreFormsBundle\Exception\BaseException;
+
+class ItemNotFoundInRepositoryException extends BaseException
+{
+    public function __construct(string $key)
+    {
+        parent::__construct(sprintf('Item %s not found in repository', $key));
+    }
+}

src/Form/Builder.php

@@ -4,7 +4,6 @@
 
 namespace Valantic\PimcoreFormsBundle\Form;
 
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
@@ -15,16 +14,16 @@
 use Symfony\Component\Validator\Constraints\Choice;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Valantic\PimcoreFormsBundle\DependencyInjection\Configuration;
-use Valantic\PimcoreFormsBundle\Form\Type\ChoicesInterface;
 use Valantic\PimcoreFormsBundle\Form\Type\ConfigAwareInterface;
+use Valantic\PimcoreFormsBundle\Repository\ChoicesRepository;
 
 class Builder
 {
     public function __construct(
-        protected readonly ParameterBagInterface $container,
         protected readonly UrlGeneratorInterface $urlGenerator,
         protected readonly TranslatorInterface $translator,
-        protected readonly FormFactoryInterface $formFactory
+        protected readonly FormFactoryInterface $formFactory,
+        protected readonly ChoicesRepository $choicesRepository,
     ) {
     }
 
@@ -122,8 +121,7 @@ protected function getOptions(string $formName, array $definition, array $formCo
                 }
             }
             if (!empty($definition['provider']) && is_string($definition['provider'])) {
-                /** @var ChoicesInterface $choices */
-                $choices = $this->container->get($definition['provider']);
+                $choices = $this->choicesRepository->get($definition['provider']);
                 if ($choices instanceof ConfigAwareInterface) {
                     $choices->setFormName($formName);
                     $choices->setFieldConfig($formConfig);

src/Repository/AbstractRepository.php

@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Valantic\PimcoreFormsBundle\Repository;
+
+use Valantic\PimcoreFormsBundle\Exception\Repository\ItemNotFoundInRepositoryException;
+
+/**
+ * @template TItem
+ *
+ * @internal
+ */
+abstract class AbstractRepository
+{
+    /** @var TItem[] */
+    protected array $items;
+
+    public function __construct(
+        /** @var \Iterator<TItem> */
+        protected iterable $iterables,
+    ) {
+    }
+
+    /** @return TItem */
+    public function get(string $key)
+    {
+        return $this->all()[$key] ?? throw new ItemNotFoundInRepositoryException($key);
+    }
+
+    /** @return TItem[] */
+    protected function all(): array
+    {
+        $this->items ??= $this->initializeItemsFromIterables();
+
+        return $this->items;
+    }
+
+    /**
+     * @return array<class-string<TItem>,TItem>
+     */
+    protected function initializeItemsFromIterables(): array
+    {
+        $arr = [];
+
+        foreach ($this->iterables as $iterable) {
+            $arr[$iterable::class] = $iterable;
+        }
+
+        return $arr;
+    }
+}

src/Repository/ChoicesRepository.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Valantic\PimcoreFormsBundle\Repository;
+
+use Valantic\PimcoreFormsBundle\Form\Type\ChoicesInterface;
+
+/**
+ * @extends AbstractRepository<ChoicesInterface>
+ *
+ * @internal
+ */
+class ChoicesRepository extends AbstractRepository
+{
+}

src/Resources/config/services.yml

@@ -21,6 +21,10 @@ services:
   Valantic\PimcoreFormsBundle\Service\:
     resource: '../../Service/*'
 
+  Valantic\PimcoreFormsBundle\Repository\ChoicesRepository:
+    arguments:
+      - !tagged_iterator valantic.pimcore_forms.choices
+
   Valantic\PimcoreFormsBundle\Repository\InputHandlerRepository:
     arguments:
       - !tagged_iterator valantic.pimcore_forms.input_handler