diff --git a/src/Frontend/AbstractMapHybrid.php b/src/Frontend/AbstractMapHybrid.php index 4c807d3..e4ba0b7 100644 --- a/src/Frontend/AbstractMapHybrid.php +++ b/src/Frontend/AbstractMapHybrid.php @@ -22,7 +22,7 @@ use Contao\Model\Collection; use Netzmacht\Contao\Leaflet\MapProvider; use Netzmacht\Contao\Leaflet\Model\MapModel; use Netzmacht\Contao\Toolkit\Component\Hybrid\AbstractHybrid; -use Netzmacht\Contao\Toolkit\View\Template\TemplateFactory; +use Symfony\Component\Templating\EngineInterface as TemplateEngine; use Symfony\Component\Translation\TranslatorInterface as Translator; /** @@ -56,24 +56,24 @@ abstract class AbstractMapHybrid extends AbstractHybrid /** * HybridTrait constructor. * - * @param Result|Model|Collection $model Component model. - * @param TemplateFactory $templateFactory Template factory. - * @param Translator $translator Translator. - * @param MapProvider $mapProvider Map provider. - * @param Input $input Request Input. - * @param Config $config Config. - * @param string $column Column in which the element appears. + * @param Result|Model|Collection $model Component model. + * @param TemplateEngine $templateEngine Template engine. + * @param Translator $translator Translator. + * @param MapProvider $mapProvider Map provider. + * @param Input $input Request Input. + * @param Config $config Config. + * @param string $column Column in which the element appears. */ public function __construct( $model, - TemplateFactory $templateFactory, + TemplateEngine $templateEngine, Translator $translator, MapProvider $mapProvider, $input, $config, $column = null ) { - parent::__construct($model, $templateFactory, $translator, $column); + parent::__construct($model, $templateEngine, $translator, $column); $this->mapProvider = $mapProvider; $this->input = $input; @@ -90,44 +90,38 @@ abstract class AbstractMapHybrid extends AbstractHybrid $this->mapProvider->handleAjaxRequest($this->getIdentifier()); if (TL_MODE === 'BE') { - $model = MapModel::findByPk($this->get('leaflet_map')); - - $template = $this->getTemplateFactory()->createBackendTemplate('be_wildcard'); + $model = MapModel::findByPk($this->get('leaflet_map')); + $parameters = [ + 'title' => $this->get('headline'), + ]; if ($model) { - $href = 'contao/main.php?do=leaflet&table=tl_leaflet_map&act=edit&id=' . $model->id; + $href = 'contao/main.php?do=leaflet&table=tl_leaflet_map&act=edit&id=' . $model->id;; - $template->set('wildcard', '### LEAFLET MAP ' . $model->title . ' ###'); - $template->set('title', $this->get('headline')); - $template->set('id', $model->id); - $template->set('link', $model->title); - $template->set('href', $href); + $parameters['wildcard'] = '### LEAFLET MAP ' . $model->title . ' ###'; + $parameters['id'] = $model->id; + $parameters['link'] = $model->title; + $parameters['href'] = $href; } - return $template->parse(); + return $this->render('toolkit:be:be_wildcard.html5', $parameters); } return parent::generate(); } /** - * Do the frontend integration compiling. - * - * @return void - * - * @throws \Exception If the map could not be created. - * - * @SuppressWarnings(PHPMD.Superglobals) + * {@inheritdoc} */ - protected function compile(): void + protected function prepareTemplateData(array $data): array { try { $template = $this->get('leaflet_template') ?: 'leaflet_map_js'; $mapId = $this->getIdentifier(); $map = $this->mapProvider->generate($this->get('leaflet_map'), null, $mapId, $template); - $this->template->set('javascript', $map); - $this->template->set('mapId', $mapId); + $data['javascript'] = $map; + $data['mapId'] = $mapId; $style = ''; $height = deserialize($this->get('leaflet_height'), true); @@ -141,10 +135,12 @@ abstract class AbstractMapHybrid extends AbstractHybrid $style .= 'height:' . $height['value'] . $height['unit'] . ';'; } - $this->template->set('mapStyle', $style); + $data['mapStyle'] = $style; } catch (\Exception $e) { throw $e; } + + return $data; } /** diff --git a/src/Frontend/ContentElement/MapElementFactory.php b/src/Frontend/ContentElement/MapElementFactory.php index 30e525d..8c4d33b 100644 --- a/src/Frontend/ContentElement/MapElementFactory.php +++ b/src/Frontend/ContentElement/MapElementFactory.php @@ -14,7 +14,6 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet\Frontend\ContentElement; -use Netzmacht\Contao\Leaflet\Frontend\ContentElement\MapElement; use Netzmacht\Contao\Toolkit\Component\Component; use Netzmacht\Contao\Toolkit\Component\ComponentFactory; use Psr\Container\ContainerInterface as Container; @@ -58,7 +57,7 @@ class MapElementFactory implements ComponentFactory { return new MapElement( $model, - $this->container->get('netzmacht.contao_toolkit.view.template_factory'), + $this->container->get('templating'), $this->container->get('translator'), $this->container->get('netzmacht.contao_leaflet_maps.map.provider'), $this->container->get('netzmacht.contao_toolkit.contao.input'), diff --git a/src/Frontend/Module/MapModuleFactory.php b/src/Frontend/Module/MapModuleFactory.php index 9622258..34c9d70 100644 --- a/src/Frontend/Module/MapModuleFactory.php +++ b/src/Frontend/Module/MapModuleFactory.php @@ -14,7 +14,6 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet\Frontend\Module; -use Netzmacht\Contao\Leaflet\Frontend\Module\MapModule; use Netzmacht\Contao\Toolkit\Component\Component; use Netzmacht\Contao\Toolkit\Component\ComponentFactory; use Psr\Container\ContainerInterface as Container; @@ -58,7 +57,7 @@ class MapModuleFactory implements ComponentFactory { return new MapModule( $model, - $this->container->get('netzmacht.contao_toolkit.view.template_factory'), + $this->container->get('templating'), $this->container->get('translator'), $this->container->get('netzmacht.contao_leaflet_maps.map.provider'), $this->container->get('netzmacht.contao_toolkit.contao.input'), diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml index 6ddfc8b..e5f9d87 100644 --- a/src/Resources/config/services.yml +++ b/src/Resources/config/services.yml @@ -83,6 +83,7 @@ services: - '@service_container' tags: - { name: 'netzmacht.contao_toolkit.component.content_element_factory' } + - { name: 'netzmacht.contao_toolkit.component.content_element', alias: 'leaflet', category: 'include' } netzmacht.contao_leaflet_maps.frontend.module_factory: class: Netzmacht\Contao\Leaflet\Frontend\Module\MapModuleFactory @@ -90,6 +91,7 @@ services: - '@service_container' tags: - { name: 'netzmacht.contao_toolkit.component.frontend_module_factory' } + - { name: 'netzmacht.contao_toolkit.component.frontend_module', alias: 'leaflet', category: include } netzmacht.contao_leaflet_maps.frontend.insert_tag: class: Netzmacht\Contao\Leaflet\Frontend\InsertTag\LeafletInsertTagParser diff --git a/src/Resources/contao/config/config.php b/src/Resources/contao/config/config.php index 8d928ec..d373225 100644 --- a/src/Resources/contao/config/config.php +++ b/src/Resources/contao/config/config.php @@ -10,9 +10,6 @@ * @filesource */ -use Netzmacht\Contao\Toolkit\Component\ContentElement\ContentElementDecorator; -use Netzmacht\Contao\Toolkit\Component\Module\ModuleDecorator; - /* * Backend module. */ @@ -57,21 +54,6 @@ array_insert( ) ); - -/* - * Content elements. - */ - -$GLOBALS['TL_CTE']['includes']['leaflet'] = ContentElementDecorator::class; - - -/* - * Frontend modules - */ - -$GLOBALS['FE_MOD']['includes']['leaflet'] = ModuleDecorator::class; - - /* * Models. */