Refactor the factories so that they don't use the container.

src/Bundle/Resources/config/services.yml

@@ -83,7 +83,11 @@ services:
   netzmacht.contao_leaflet.frontend.element_factory:
     class: Netzmacht\Contao\Leaflet\Frontend\ContentElement\MapElementFactory
     arguments:
-      - '@service_container'
+      - '@templating'
+      - '@translator'
+      - '@netzmacht.contao_leaflet.map.provider'
+      - '@netzmacht.contao_toolkit.contao.input_adapter'
+      - '@netzmacht.contao_toolkit.contao.config_adapter'
     tags:
       - { name: 'netzmacht.contao_toolkit.component.content_element_factory' }
       - { name: 'netzmacht.contao_toolkit.component.content_element', alias: 'leaflet', category: 'includes' }
@@ -91,7 +95,11 @@ services:
   netzmacht.contao_leaflet.frontend.module_factory:
     class: Netzmacht\Contao\Leaflet\Frontend\Module\MapModuleFactory
     arguments:
-      - '@service_container'
+      - '@templating'
+      - '@translator'
+      - '@netzmacht.contao_leaflet.map.provider'
+      - '@netzmacht.contao_toolkit.contao.input_adapter'
+      - '@netzmacht.contao_toolkit.contao.config_adapter'
     tags:
       - { name: 'netzmacht.contao_toolkit.component.frontend_module_factory' }
       - { name: 'netzmacht.contao_toolkit.component.frontend_module', alias: 'leaflet', category: 'includes' }

src/Frontend/ContentElement/MapElementFactory.php

@@ -14,9 +14,14 @@ declare(strict_types=1);
 
 namespace Netzmacht\Contao\Leaflet\Frontend\ContentElement;
 
+use Contao\Config;
+use Contao\CoreBundle\Framework\Adapter;
+use Contao\Input;
+use Netzmacht\Contao\Leaflet\MapProvider;
 use Netzmacht\Contao\Toolkit\Component\Component;
 use Netzmacht\Contao\Toolkit\Component\ComponentFactory;
-use Psr\Container\ContainerInterface as Container;
+use Symfony\Component\Templating\EngineInterface as TemplateEngine;
+use Symfony\Component\Translation\TranslatorInterface as Translator;
 
 /**
  * Class MapElementFactory
@@ -26,20 +31,61 @@ use Psr\Container\ContainerInterface as Container;
 class MapElementFactory implements ComponentFactory
 {
     /**
-     * Dependency container.
+     * Template engine.
      *
-     * @var Container
+     * @var TemplateEngine
      */
-    private $container;
+    private $templating;
+
+    /**
+     * Translator.
+     *
+     * @var Translator
+     */
+    private $translator;
+
+    /**
+     * Map provider.
+     *
+     * @var MapProvider
+     */
+    private $mapProvider;
+
+    /**
+     * Input adapter.
+     *
+     * @var Input|Adapter
+     */
+    private $input;
+
+    /**
+     * Config adapter.
+     *
+     * @var Config|Adapter
+     */
+    private $config;
 
     /**
      * MapElementFactory constructor.
      *
-     * @param Container $container Dependency container.
+     * @param TemplateEngine $engine      Template engine.
+     * @param Translator     $translator  Translator.
+     * @param MapProvider    $mapProvider Map provider.
+     * @param Input|Adapter  $input       Input adapter.
+     * @param Config|Adapter $config      Config adapter.
      */
-    public function __construct(Container $container)
+    public function __construct(
-    {
+        TemplateEngine $engine,
-        $this->container = $container;
+        Translator $translator,
+        MapProvider $mapProvider,
+        $input,
+        $config
+    ) {
+        $this->templating  = $engine;
+        $this->translator  = $translator;
+        $this->mapProvider = $mapProvider;
+        $this->input       = $input;
+        $this->config      = $config;
     }
 
     /**
@@ -57,11 +103,11 @@ class MapElementFactory implements ComponentFactory
     {
         return new MapElement(
             $model,
-            $this->container->get('templating'),
+            $this->templating,
-            $this->container->get('translator'),
+            $this->translator,
-            $this->container->get('netzmacht.contao_leaflet.map.provider'),
+            $this->mapProvider,
-            $this->container->get('netzmacht.contao_toolkit.contao.input_adapter'),
+            $this->input,
-            $this->container->get('netzmacht.contao_toolkit.contao.config_adapter'),
+            $this->config,
             $column
         );
     }

src/Frontend/Module/MapModuleFactory.php

@@ -14,9 +14,14 @@ declare(strict_types=1);
 
 namespace Netzmacht\Contao\Leaflet\Frontend\Module;
 
+use Contao\Config;
+use Contao\CoreBundle\Framework\Adapter;
+use Contao\Input;
+use Netzmacht\Contao\Leaflet\MapProvider;
 use Netzmacht\Contao\Toolkit\Component\Component;
 use Netzmacht\Contao\Toolkit\Component\ComponentFactory;
-use Psr\Container\ContainerInterface as Container;
+use Symfony\Component\Templating\EngineInterface as TemplateEngine;
+use Symfony\Component\Translation\TranslatorInterface as Translator;
 
 /**
  * Class MapElementFactory
@@ -26,20 +31,61 @@ use Psr\Container\ContainerInterface as Container;
 class MapModuleFactory implements ComponentFactory
 {
     /**
-     * Dependency container.
+     * Template engine.
      *
-     * @var Container
+     * @var TemplateEngine
      */
-    private $container;
+    private $templating;
 
     /**
-     * MapModuleFactory constructor.
+     * Translator.
      *
-     * @param Container $container Dependency container.
+     * @var Translator
      */
-    public function __construct(Container $container)
+    private $translator;
-    {
+
-        $this->container = $container;
+    /**
+     * Map provider.
+     *
+     * @var MapProvider
+     */
+    private $mapProvider;
+
+    /**
+     * Input adapter.
+     *
+     * @var Input|Adapter
+     */
+    private $input;
+
+    /**
+     * Config adapter.
+     *
+     * @var Config|Adapter
+     */
+    private $config;
+
+    /**
+     * MapElementFactory constructor.
+     *
+     * @param TemplateEngine $engine      Template engine.
+     * @param Translator     $translator  Translator.
+     * @param MapProvider    $mapProvider Map provider.
+     * @param Input|Adapter  $input       Input adapter.
+     * @param Config|Adapter $config      Config adapter.
+     */
+    public function __construct(
+        TemplateEngine $engine,
+        Translator $translator,
+        MapProvider $mapProvider,
+        $input,
+        $config
+    ) {
+        $this->templating  = $engine;
+        $this->translator  = $translator;
+        $this->mapProvider = $mapProvider;
+        $this->input       = $input;
+        $this->config      = $config;
     }
 
     /**
@@ -57,11 +103,11 @@ class MapModuleFactory implements ComponentFactory
     {
         return new MapModule(
             $model,
-            $this->container->get('templating'),
+            $this->templating,
-            $this->container->get('translator'),
+            $this->translator,
-            $this->container->get('netzmacht.contao_leaflet.map.provider'),
+            $this->mapProvider,
-            $this->container->get('netzmacht.contao_toolkit.contao.input_adapter'),
+            $this->input,
-            $this->container->get('netzmacht.contao_toolkit.contao.config_adapter'),
+            $this->config,
             $column
         );
     }