Prepare release 3.2.3

Bump y18n from 3.2.1 to 3.2.2

.composer-require-checker.json

@@ -6,6 +6,10 @@
     "array_insert",
     "Contao\\ManagerPlugin\\Bundle\\BundlePluginInterface",
     "Contao\\ManagerPlugin\\Bundle\\Config\\BundleConfig",
-    "Contao\\ManagerPlugin\\Bundle\\Parser\\ParserInterface"
+    "Contao\\ManagerPlugin\\Bundle\\Parser\\ParserInterface",
+    "Contao\\ManagerPlugin\\Routing\\RoutingPluginInterface",
+    "Hofff\\Contao\\Consent\\Bridge\\Bridge",
+    "Hofff\\Contao\\Consent\\Bridge\\Plugin",
+    "Hofff\\Contao\\Consent\\Bridge\\Render\\RenderInformation"
   ]
 }

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [dmolineus]

.github/workflows/diagnostics.yml

@@ -0,0 +1,82 @@
+name: Code Quality Diagnostics
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    name: PHP ${{ matrix.php }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - php: 7.4
+            output: '-o github-action -o default'
+            phpcq_install: 'install'
+          - php: 8.0
+            output: '-o default'
+            phpcq_install: 'update'
+          - php: 8.1
+            output: '-o default'
+            phpcq_install: 'update'
+          - php: 8.2
+            output: '-o default'
+            phpcq_install: 'update'
+
+    steps:
+      - name: Pull source
+        uses: actions/checkout@v2
+
+      - name: Setup PHP with PECL extension
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+
+      - name: Cache composer cache directory
+        uses: actions/cache@v1
+        env:
+          cache-name: composer-cache-dir
+        with:
+          path: ~/.cache/composer
+          key: ${{ runner.os }}-${{ matrix.php }}-build-${{ env.cache-name }}
+
+      - name: Cache vendor directory
+        uses: actions/cache@v1
+        env:
+          cache-name: vendor
+        with:
+          path: vendor
+          key: ${{ runner.os }}-${{ matrix.php }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.php }}-build-${{ env.cache-name }}-
+
+      - name: Cache phpcq directory
+        uses: actions/cache@v1
+        env:
+          cache-name: phpcq
+        with:
+          path: .phpcq
+          key: ${{ runner.os }}-${{ matrix.php }}-build-${{ env.cache-name }}-${{ hashFiles('**/.phpcq.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.php }}-build-${{ env.cache-name }}-
+
+      - name: Install composer dependencies
+        run: composer install
+      - name: Install phpcq toolchain
+        run: ./vendor/bin/phpcq ${{ matrix.phpcq_install }} -v
+
+      - name: Run tests
+        run: ./vendor/bin/phpcq run -v ${{ matrix.output }}
+
+      - name: Upload build directory to artifact
+        uses: actions/upload-artifact@v2
+        if: ${{ success() }} || ${{ failure() }}
+        with:
+          name: phpcq-builds-php-${{ matrix.php }}
+          path: .phpcq/build/

.gitignore

@@ -25,3 +25,6 @@ build.properties
 
 # NPM
 node_modules
+
+.phpcq
+phpcq.yaml

.phpcq.lock

@@ -0,0 +1 @@
+{"plugins":{"composer-require-checker":{"api-version":"1.0.0","version":"1.0.1.0","type":"php-file","url":"https://phpcq.github.io/repository/composer-require-checker-1.0.1.0.php","signature":null,"requirements":{"php":{"php":"^7.4 || ^8.0"},"tool":{"composer-require-checker":"^3.8"}},"checksum":{"type":"sha-512","value":"5b0fd8cd5e0f5761c53b9d5375b6f6ba50f148468896248f823cc2a48361adfd872556066764b1b544ff51ffd5de60d6f9a75050db00b257d807976ac761bc3a"},"tools":{"composer-require-checker":{"version":"3.8.0","url":"https://github.com/maglnet/ComposerRequireChecker/releases/download/3.8.0/composer-require-checker.phar","requirements":{"php":{"php":"^7.4 || ^8.0","ext-json":"*","ext-phar":"*"}},"checksum":null,"signature":"https://github.com/maglnet/ComposerRequireChecker/releases/download/3.8.0/composer-require-checker.phar.asc"}}},"phpmd":{"api-version":"1.0.0","version":"1.0.1.0","type":"php-file","url":"https://phpcq.github.io/repository/phpmd-1.0.1.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0","ext-dom":"*"},"tool":{"phpmd":"^2.6.1"}},"checksum":{"type":"sha-512","value":"88e267b9c36b2edc85e924717606b626e005ac8d97b1f65f5331e2a3b3894dec2cf124f6187541bf759d026477b6d94daacc5d5c81bb09714a68ffabe5698dc5"},"tools":{"phpmd":{"version":"2.11.1","url":"https://github.com/phpmd/phpmd/releases/download/2.11.1/phpmd.phar","requirements":{"php":{"php":">=5.3.9","ext-xml":"*"}},"checksum":null,"signature":null}}},"phpcpd":{"api-version":"1.0.0","version":"1.1.1.0","type":"php-file","url":"https://phpcq.github.io/repository/phpcpd-1.1.1.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0","ext-dom":"*"},"tool":{"phpcpd":"^6.0"}},"checksum":{"type":"sha-512","value":"1189ce0bf3fade4cb4241f1d96f915ef8fc7651f4450dc79fdf464ee3d6be3009316f0d423ce2d4af9d76ad50807b7fdf4d77bfa6d9ee2c91d6eda32ea214433"},"tools":{"phpcpd":{"version":"6.0.3","url":"https://phar.phpunit.de/phpcpd-6.0.3.phar","requirements":{"php":{"php":">=7.3","ext-dom":"*"}},"checksum":{"type":"sha-256","value":"2cbaea7cfda1bb4299d863eb075e977c3f49055dd16d88529fae5150d48a84cb"},"signature":"https://phar.phpunit.de/phpcpd-6.0.3.phar.asc"}}},"phploc":{"api-version":"1.0.0","version":"1.0.0.0","type":"php-file","url":"https://phpcq.github.io/repository/phploc-1.0.0.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0","ext-dom":"*","ext-json":"*"},"tool":{"phploc":"^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0"}},"checksum":{"type":"sha-512","value":"f67b02d494796adf553cb3dd13ec06c1cb8e53c799954061749424251379541637538199afb3afa3c7a01cabd1cb6f1c53eb621f015dff9644c6c7cbf10c56d1"},"tools":{"phploc":{"version":"7.0.2","url":"https://phar.phpunit.de/phploc-7.0.2.phar","requirements":{"php":{"php":">=7.3","ext-dom":"*","ext-json":"*"}},"checksum":{"type":"sha-256","value":"3d59778ec86faf25fd00e3a329b2f9ad4a3c751ca91601ea7dab70f887b0bf46"},"signature":"https://phar.phpunit.de/phploc-7.0.2.phar.asc"}}},"phpcs":{"api-version":"1.0.0","version":"1.1.0.0","type":"php-file","url":"https://phpcq.github.io/repository/phpcs-1.1.0.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0","ext-dom":"*"},"tool":{"phpcs":"^3.0 || ^2.0","phpcbf":"^3.0 || ^2.0"}},"checksum":{"type":"sha-512","value":"2737022369da1318cc4e0ea194e8a81019f7b079080d869aab878b7486052fdbe68fee3f28131f35573226def1aabd4bd005e038ee7b767c137b1107c1492a83"},"tools":{"phpcs":{"version":"3.6.2","url":"https://github.com/squizlabs/PHP_CodeSniffer/releases/download/3.6.2/phpcs.phar","requirements":{"php":{"php":">=5.4.0","ext-tokenizer":"*","ext-xmlwriter":"*","ext-simplexml":"*"}},"checksum":null,"signature":"https://github.com/squizlabs/PHP_CodeSniffer/releases/download/3.6.2/phpcs.phar.asc"},"phpcbf":{"version":"3.6.2","url":"https://github.com/squizlabs/PHP_CodeSniffer/releases/download/3.6.2/phpcbf.phar","requirements":{"php":{"php":">=5.4.0","ext-tokenizer":"*","ext-xmlwriter":"*","ext-simplexml":"*"}},"checksum":null,"signature":"https://github.com/squizlabs/PHP_CodeSniffer/releases/download/3.6.2/phpcbf.phar.asc"}}},"composer-normalize":{"api-version":"1.0.0","version":"1.1.0.0","type":"php-file","url":"https://phpcq.github.io/repository/composer-normalize-1.1.0.0.php","signature":null,"requirements":{"php":{"php":"^7.3 || ^8.0","ext-json":"*"},"tool":{"composer-normalize":"^2.1"}},"checksum":{"type":"sha-512","value":"d59d3557cb20630734878a9115df5dd32d5aff815e5b15be36f6fb5d6e9d83dd36efd84215ab6529edcc924f600946f739a0d9e67723deff95c88346ab502498"},"tools":{"composer-normalize":{"version":"2.23.1","url":"https://github.com/ergebnis/composer-normalize/releases/download/2.23.1/composer-normalize.phar","requirements":{"php":{"php":"^7.4 || ^8.0"}},"checksum":null,"signature":"https://github.com/ergebnis/composer-normalize/releases/download/2.23.1/composer-normalize.phar.asc"}}}},"tools":[]}

.travis.yml

@@ -1,37 +0,0 @@
-dist: xenial
-
-addons:
-  apt:
-    packages:
-      - ant-optional
-
-language: php
-
-php:
-  - "7.3"
-  - "7.2"
-  - "7.1"
-
-env:
-  - CONTAO_VERSION=contao/core-bundle ~4.4.0
-  - CONTAO_VERSION=contao/core-bundle ~4.5.0
-  - CONTAO_VERSION=contao/core-bundle ~4.6.0
-
-matrix:
-  exclude:
-
-sudo: false
-
-install:
-  - travis_retry composer self-update && composer --version
-  - travis_retry composer require $CONTAO_VERSION --no-update
-  - travis_retry composer update --prefer-dist --no-interaction
-
-script: ant -keep-going
-
-git:
-  depth: 2147483647
-
-cache:
-  directories:
-    - vendor

CHANGELOG.md

@@ -6,9 +6,75 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## 3.1.3 - 2019-01-10
+## [Unreleased]
 
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.2...3.1.3)
+## [3.2.3] - 2022-02-22
+
+### Changed
+
+ - Support symfony 5 (Contao 4.13 support) ([#110](https://github.com/netzmacht/contao-leaflet-maps/issues/110))
+ - Support doctrine/dbal 3 (Contao 4.13 support) ([#110](https://github.com/netzmacht/contao-leaflet-maps/issues/110))
+ - Fix missing icon in backend navigation ([#101](https://github.com/netzmacht/contao-leaflet-maps/issues/101))
+ - Fix empty help wizard ([#99](https://github.com/netzmacht/contao-leaflet-maps/issues/99))
+ - Update leaflet providers ([111](https://github.com/netzmacht/contao-leaflet-maps/issues/111), [102](https://github.com/netzmacht/contao-leaflet-maps/issues/102))
+ - Fix tile layer implementation ([#108](https://github.com/netzmacht/contao-leaflet-maps/issues/108))
+ - Fix access to tile layer fields ([#107](https://github.com/netzmacht/contao-leaflet-maps/issues/107))
+ - Fix nexted folder structure ([#97](https://github.com/netzmacht/contao-leaflet-maps/issues/97))
+
+## [3.2.2] - 2020-12-18
+
+### Fixed
+
+ - Remove template debug placeholders, it breaks generated javascript ([#93](https://github.com/netzmacht/contao-leaflet-maps/issues/93))
+ - Generate absolute urls for file layers ([#92](https://github.com/netzmacht/contao-leaflet-maps/issues/92)) 
+
+## [3.2.1] - 2020-09-02
+
+### Fixed
+
+ - Do not append javascript to the body anymore as consent tools might interrupt rendering
+
+## [3.2.0] - 2020-08-28
+
+### Added
+
+ - Add support for consent tools based on `hofff/contao-consent-bridge`
+
+## [3.1.7] - 2020-08-28
+
+### Fixed
+
+ - Duplicate map layer relations ([#89](https://github.com/netzmacht/contao-leaflet-maps/issues/89))
+
+## [3.1.6] - 2020-01-03
+
+### Fixed
+
+ - Do not add options which value is `NULL`
+ - Fix button labels ([#83](https://github.com/netzmacht/contao-leaflet-maps/issues/83))
+ - Fix potential security issue of symfony/dependency-injection (https://github.com/advisories/GHSA-pgwj-prpq-jpc2)
+
+### Changed 
+
+ - Use relative path for backend icon ([#82](https://github.com/netzmacht/contao-leaflet-maps/issues/82))
+
+
+## [3.1.5] - 2019-08-26
+
+### Fixed
+
+ - Use twig directly instead of templating component to restore Contao 4.8
+ 
+## [3.1.4] - 2019-02-13
+
+### Fixed
+
+ - Fix ordering changes in layer control element aren't recognized ([#72](https://github.com/netzmacht/contao-leaflet-maps/issues/72))
+ - Fix markers with negative coordinates aren't displayed ([#74](https://github.com/netzmacht/contao-leaflet-maps/issues/74))
+ - Fix image icon with non existing image throws exception ([#75](https://github.com/netzmacht/contao-leaflet-maps/issues/75))
+ - Fix invalid alias then using multiple edit. Aliases aren't copied anymore. ([#71](https://github.com/netzmacht/contao-leaflet-maps/issues/71))
+
+## [3.1.3] - 2019-01-10
 
 ### Fixed
 
@@ -38,9 +104,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - Add missing GeoportailFrance of leaflet-providers
  - Add missing OneMapSG of leaflet-providers
 
-## 3.1.1 - 2018-12-07
+## [3.1.1] - 2018-12-07
-
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.0...3.1.1)
 
 ### Fixed
 
@@ -74,43 +138,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - Fix broken marker cluster layer (#60).
 
 
-## 3.0.4 - 2018-10-08
+## [3.0.4] - 2018-10-08
-
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.3...3.0.4)
 
 ### Fixed
 
  - Fix broken content element attributes (Missing class and custom id).
 
-## 3.0.3 - 2018-09-18
+## [3.0.3] - 2018-09-18
-
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.2...3.0.3)
 
 ### Fixed
 
  - Make alias generator services public for Contao 4.6/Symfony 4.0 compatibility.
 
-## 3.0.2 - 2018-08-23
+## [3.0.2] - 2018-08-23
-
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.1...3.0.2)
 
  - Run composer require checker and solve issues.
  
-## 3.0.1 - 2018-06-20
+## [3.0.1] - 2018-06-20
-
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0...3.0.1)
 
  - Fix broken dynamic bbox related data loading (#57) 
 
-## 3.0.0 - 2018-01-05
+## [3.0.0] - 2018-01-05
-
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-beta1...3.0.0)
 
  - Make hook/dca listener services public
 
-## 3.0.0-beta1 - 2017-11-15
+## [3.0.0-beta1] - 2017-11-15
-
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-alpha2...3.0.0-beta1)
 
 Enhancements
 
@@ -121,9 +173,7 @@ Bugfixes
   - Broken service definitions
   - Broken file layer id 
 
-## 3.0.0-alpha1 - 2017-10-19
+## [3.0.0-alpha2] - 2017-10-19
-
-[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-alpha1...3.0.0-alpha2)
 
 Implemented enhancements
  
@@ -132,3 +182,21 @@ Implemented enhancements
  - New file layer for gpx,kml,wkt,topojson,geojson files added
  - Bypass filesystem cache in debug mode
  - Changelog added
+
+[Unreleased]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.2.2...hotfix/3.2.3
+[3.2.2]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.2.1...3.2.2
+[3.2.1]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.2.0...3.2.1
+[3.2.0]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.7...3.2.0
+[3.1.7]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.6...3.1.7
+[3.1.6]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.5...3.1.6
+[3.1.5]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.4...3.1.5
+[3.1.4]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.3...3.1.4
+[3.1.3]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.2...3.1.3
+[3.1.1]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.0...3.1.1
+[3.0.4]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.3...3.0.4
+[3.0.3]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.2...3.0.3
+[3.0.2]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.1...3.0.2
+[3.0.1]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0...3.0.1
+[3.0.0]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-beta1...3.0.0
+[3.0.0-beta1]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-alpha2...3.0.0-beta1
+[3.0-0-alpha2]: https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.0-alpha1...3.0.0-alpha2

README.md

@@ -2,9 +2,9 @@ Leaflet integration into Contao CMS
 ===================================
 
 [![Build Status](http://img.shields.io/travis/netzmacht/contao-leaflet-maps/master.svg?style=flat-square)](https://travis-ci.org/netzmacht/contao-leaflet-maps)
-[![Version](http://img.shields.io/packagist/v/netzmacht/contao-leaflet-maps.svg?style=flat-square)](http://packagist.com/packages/netzmacht/contao-leaflet-maps)
+[![Version](http://img.shields.io/packagist/v/netzmacht/contao-leaflet-maps.svg?style=flat-square)](http://packagist.org/packages/netzmacht/contao-leaflet-maps)
-[![License](http://img.shields.io/packagist/l/netzmacht/contao-leaflet-maps.svg?style=flat-square)](http://packagist.com/packages/netzmacht/contao-leaflet-maps)
+[![License](http://img.shields.io/packagist/l/netzmacht/contao-leaflet-maps.svg?style=flat-square)](http://packagist.org/packages/netzmacht/contao-leaflet-maps)
-[![Downloads](http://img.shields.io/packagist/dt/netzmacht/contao-leaflet-maps.svg?style=flat-square)](http://packagist.com/packages/netzmacht/contao-leaflet-maps)
+[![Downloads](http://img.shields.io/packagist/dt/netzmacht/contao-leaflet-maps.svg?style=flat-square)](http://packagist.org/packages/netzmacht/contao-leaflet-maps)
 [![Contao Community Alliance coding standard](http://img.shields.io/badge/cca-coding_standard-red.svg?style=flat-square)](https://github.com/contao-community-alliance/coding-standard)
 
 This extension provides a backend gui for integrating [Leaflet](http://leafletjs.com/) into the Contao CMS.
@@ -38,6 +38,12 @@ Features
  - Autoloading of required assets.
  - [Layer for MetaModels](https://github.com/netzmacht/contao-leaflet-metamodels)
  
+
+Documentation
+-------------
+
+A basic [user documentation](http://leaflet-maps-for-contao.readthedocs.org/) written in German is available.
+ 
 Changelog
 ---------
 

build.default.properties

@@ -1,4 +0,0 @@
-phpcs.standard  = ${basedir}/vendor/phpcq/coding-standard/phpcs/PhpCodeQuality/ruleset.xml
-phpmd.ruleset   = ${basedir}/vendor/phpcq/coding-standard/phpmd/ruleset.xml
-phpcs.excluded  = src/Bundle/Resources/contao/languages,src/Bundle/Resources/public/js
-phpcpd.excluded = contao

build.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="netzmacht/contao-leaflet-maps" default="build">
-    <!-- import the main build system -->
-    <import file="vendor/phpcq/phpcq/phpcq.main.xml" />
-</project>

composer.json

@@ -1,13 +1,13 @@
 {
   "name": "netzmacht/contao-leaflet-maps",
   "description": "Contao Leaflet maps integration",
+  "license": "LGPL-3.0-or-later",
+  "type": "contao-bundle",
   "keywords": [
     "contao",
     "maps",
     "leaflet"
   ],
-  "type": "contao-bundle",
-  "license": "LGPL-3.0-or-later",
   "authors": [
     {
       "name": "David Molineus",
@@ -19,60 +19,72 @@
   "support": {
     "email": "mail@netzmacht.de",
     "issues": "https://github.com/netzmacht/contao-leaflet-maps/issues",
-    "source": "https://github.com/netzmacht/contao-leaflet-maps"
+    "source": "https://github.com/netzmacht/contao-leaflet-maps",
+    "docs": "http://leaflet-maps-for-contao.readthedocs.org/"
   },
   "require": {
-    "php": ">=7.1",
+    "php": "^7.1 || ^8.0",
     "ext-json": "*",
     "ext-pdo": "*",
-    "contao/core-bundle": "~4.4",
+    "contao-community-alliance/meta-palettes": "^2.0",
-    "doctrine/dbal": "^2.5",
+    "contao/core-bundle": "^4.9",
-    "symfony/config": "~3.3 || ~4.0",
+    "doctrine/cache": "^1.0",
-    "symfony/event-dispatcher": "~3.3 || ~4.0",
+    "doctrine/dbal": "^2.11 || ^3.0",
-    "symfony/dependency-injection": "~3.3 || ~4.0",
+    "menatwork/contao-multicolumnwizard-bundle": "^3.4",
-    "symfony/filesystem": "~3.3 || ~4.0",
-    "symfony/http-kernel": "~3.3 || ~4.0",
-    "symfony/translation": "~3.3 || ~4.0",
-    "symfony/templating": "~3.3 || ~4.0",
-    "netzmacht/contao-leaflet-libraries": "^1.3.4",
     "netzmacht/contao-leaflet-geocode-widget": "^1.2",
+    "netzmacht/contao-leaflet-libraries": "^1.7.1.1",
+    "netzmacht/contao-page-context": "~1.0",
+    "netzmacht/contao-toolkit": "^3.7",
     "netzmacht/php-javascript-builder": "^1.0",
     "netzmacht/php-leaflet": "^1.1.0",
-    "netzmacht/contao-toolkit": "~3.0",
+    "symfony/config": "~4.4 || ^5.1",
-    "netzmacht/contao-page-context": "~1.0",
+    "symfony/dependency-injection": "~4.4 || ^5.1",
-    "contao-community-alliance/meta-palettes": "^2.0 || ^1.5",
+    "symfony/event-dispatcher": "~4.4 || ^5.1",
-    "menatwork/contao-multicolumnwizard": "^3.2",
+    "symfony/event-dispatcher-contracts": "^1.1 || ^2.0",
-    "doctrine/cache": "^1.0"
+    "symfony/filesystem": "~4.4 || ^5.1",
+    "symfony/http-foundation": "~4.4 || ^5.1",
+    "symfony/http-kernel": "~4.4 || ^5.1",
+    "symfony/routing": "~4.4 || ^5.1",
+    "symfony/templating": "~4.4 || ^5.1",
+    "symfony/translation-contracts": "^1.1 || ^2.0",
+    "symfony/twig-bundle": "~4.4 || ^5.1",
+    "twig/twig": "^2.0 || ^3.0"
   },
   "require-dev": {
-    "phpcq/all-tasks": "^1.2",
     "contao/manager-plugin": "^2.1",
-    "phpstan/phpstan": "^0.10.3"
+    "hofff/contao-consent-bridge": "^1.0",
+    "phpcq/coding-standard": "^2.1",
+    "phpcq/runner-bootstrap": "^1.0@dev"
+  },
+  "conflict": {
+    "hofff/contao-consent-bridge": "<1.0 || >= 2.0"
   },
   "autoload": {
     "psr-4": {
       "Netzmacht\\Contao\\Leaflet\\": "src/"
     }
   },
-  "autoload-dev": {
+  "config": {
-    "files": [
+    "allow-plugins": {
-      "vendor/phpcq/autoload-validation/hacks/contao-hack.php"
+      "contao-components/installer": true,
-    ]
+      "contao/manager-plugin": true,
+      "contao-community-alliance/composer-plugin": true
+    }
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "3.1.x-dev",
+      "dev-develop": "3.3.x-dev",
-      "dev-develop": "3.2.x-dev",
+      "dev-master": "3.2.x-dev",
       "dev-support/2.x": "2.0.x-dev"
     },
-    "contao-manager-plugin": "Netzmacht\\Contao\\Leaflet\\Bundle\\ContaoManager\\Plugin",
     "contao": {
       "transifex": {
-        "project": "contao-leaflet-maps",
-        "prefix": "core-",
         "languages_cto": "src/Bundle/Resources/contao/languages",
-        "languages_tx": ".tx"
+        "languages_tx": ".tx",
+        "prefix": "core-",
+        "project": "contao-leaflet-maps"
       }
-    }
+    },
+    "contao-manager-plugin": "Netzmacht\\Contao\\Leaflet\\Bundle\\ContaoManager\\Plugin"
   }
 }

package.json

@@ -4,10 +4,10 @@
   "description": "Leaflet maps for Contao",
   "main": "gulpfile.js",
   "dependencies": {
-    "gulp": "^4.0.0",
+    "gulp": "^4.0.2",
-    "gulp-cli": "^2.0.1",
+    "gulp-cli": "^2.2.0",
     "gulp-concat": "^2.6.1",
-    "gulp-uglify": "^3.0.1",
+    "gulp-uglify": "^3.0.2",
     "promised-del": "^1.0.2"
   },
   "devDependencies": {},

phpcq.yaml.dist

@@ -0,0 +1,98 @@
+phpcq:
+  repositories:
+    - https://phpcq.github.io/repository/repository.json
+  directories:
+    - src
+
+  plugins:
+    composer-require-checker:
+      version: ^1.0
+      signed: false
+    phpmd:
+      version: ^1.0
+      signed: false
+      requirements:
+        phpmd:
+          signed: false
+    phpcpd:
+      version: ^1.1
+      signed: false
+    phploc:
+      version: ^1.0
+      signed: false
+    phpcs:
+      version: ^1.0
+      signed: false
+    composer-normalize:
+      version: ^1.0
+      signed: false
+
+  trusted-keys:
+    # composer require checker
+    - 033E5F8D801A2F8D
+    # sb@sebastian-bergmann.de
+    - 4AA394086372C20A
+    # magl@magll.net
+    - D2CCAC42F6295E7D
+    # PHP_CodeSniffer
+    - 31C7E470E2138192
+    # Composer normalize
+    - C00543248C87FB13
+    # phpmd
+    - 0F9684B8B16B7AB0
+
+tasks:
+  fix:
+    - composer-normalize-fix
+    - phpcbf
+
+  verify:
+    - composer-require-checker
+    - composer-normalize
+
+  analyze:
+    - phploc
+    - phpcpd
+    - phpmd
+    - phpcs
+
+  default:
+    - verify
+    - analyze
+
+  phpcpd:
+    plugin: phpcpd
+
+  phpmd:
+    config:
+      ruleset:
+        - vendor/phpcq/coding-standard/phpmd/ruleset.xml
+
+  composer-normalize:
+    config:
+      ignore_output:
+       - '#Root package is not of type "project", we will not installing Contao extensions\.#'
+
+  composer-require-checker:
+    plugin: composer-require-checker
+    config:
+      config_file: '.composer-require-checker.json'
+
+  phpcs:
+    plugin: phpcs
+    config: &phpcs-config
+      standard: ~
+      excluded:
+        - src/Bundle/Resources/contao/languages
+        - src/Bundle/Resources/public/js
+
+  phpcbf:
+    plugin: phpcs
+    config:
+      <<: *phpcs-config
+      fix: true
+
+  composer-normalize-fix:
+    plugin: composer-normalize
+    config:
+      dry_run: false

phpcs.xml.dist

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="ContaoToolkit">
+    <rule ref="vendor/phpcq/coding-standard/phpcs/PhpCodeQuality/ruleset.xml" />
+</ruleset>

src/Backend/Action/AboutAction.php

@@ -5,15 +5,15 @@
  *
  * @package    contao-leaflet-maps
  * @author     David Molineus <david.molineus@netzmacht.de>
- * @copyright  2014-2017 netzmacht David Molineus. All rights reserved.
+ * @copyright  2014-2019 netzmacht David Molineus. All rights reserved.
  * @license    LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
  * @filesource
  */
 
 namespace Netzmacht\Contao\Leaflet\Backend\Action;
 
-use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface as Engine;
 use Symfony\Component\HttpFoundation\Response;
+use Twig\Environment;
 
 /**
  * Credits backend module.
@@ -23,11 +23,11 @@ use Symfony\Component\HttpFoundation\Response;
 final class AboutAction
 {
     /**
-     * Templating engine.
+     * Twig environment.
      *
-     * @var Engine
+     * @var Environment
      */
-    private $engine;
+    private $twig;
 
     /**
      * Project directory.
@@ -39,12 +39,12 @@ final class AboutAction
     /**
      * AboutAction constructor.
      *
-     * @param Engine $engine     Templating engine.
+     * @param Environment $twig       Twig environment.
-     * @param string $projectDir Project directory.
+     * @param string      $projectDir Project directory.
      */
-    public function __construct(Engine $engine, string $projectDir)
+    public function __construct(Environment $twig, string $projectDir)
     {
-        $this->engine     = $engine;
+        $this->twig       = $twig;
         $this->projectDir = $projectDir;
     }
 
@@ -62,7 +62,9 @@ final class AboutAction
 
         [$data['version'], $data['dependencies']] = $this->extractFromComposer();
 
-        return $this->engine->renderResponse('@NetzmachtContaoLeaflet/backend/about.html.twig', $data);
+        return new Response(
+            $this->twig->render('@NetzmachtContaoLeaflet/backend/about.html.twig', $data)
+        );
     }
 
     /**

src/Backend/Renderer/Label/Layer/ChainRenderer.php

@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer;
 
-use Symfony\Component\Translation\TranslatorInterface as Translator;
+use Symfony\Contracts\Translation\TranslatorInterface as Translator;
 
 /**
  * Class ChainRenderer.

src/Backend/Renderer/Label/Layer/FileLabelRenderer.php

@@ -16,7 +16,7 @@ namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer;
 
 use Contao\FilesModel;
 use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
-use Symfony\Component\Translation\TranslatorInterface as Translator;
+use Symfony\Contracts\Translation\TranslatorInterface as Translator;
 
 /**
  * Class FileLabelRenderer

src/Backend/Renderer/Label/Layer/LayerLabelRenderer.php

@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer;
 
-use Symfony\Component\Translation\TranslatorInterface as Translator;
+use Symfony\Contracts\Translation\TranslatorInterface as Translator;
 
 /**
  * Interface LayerLabelRenderer.

src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php

@@ -16,7 +16,7 @@ namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer;
 
 use Netzmacht\Contao\Leaflet\Model\MarkerModel;
 use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
-use Symfony\Component\Translation\TranslatorInterface as Translator;
+use Symfony\Contracts\Translation\TranslatorInterface as Translator;
 
 /**
  * Class MarkersLabelRenderer.

src/Backend/Renderer/Label/Layer/OverpassLabelRenderer.php

@@ -15,7 +15,7 @@ declare(strict_types=1);
 namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer;
 
 use Contao\StringUtil;
-use Symfony\Component\Translation\TranslatorInterface as Translator;
+use Symfony\Contracts\Translation\TranslatorInterface as Translator;
 
 /**
  * Class OverpassLabelRenderer.

src/Backend/Renderer/Label/Layer/ProviderLabelRenderer.php

@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer;
 
-use Symfony\Component\Translation\TranslatorInterface as Translator;
+use Symfony\Contracts\Translation\TranslatorInterface as Translator;
 
 /**
  * Backend label renderer for provider layer.

src/Backend/Renderer/Label/Layer/ReferenceLabelRenderer.php

@@ -16,7 +16,7 @@ namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer;
 
 use Netzmacht\Contao\Leaflet\Model\LayerModel;
 use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
-use Symfony\Component\Translation\TranslatorInterface as Translator;
+use Symfony\Contracts\Translation\TranslatorInterface as Translator;
 
 /**
  * Class ReferenceLabelRenderer.

src/Backend/Renderer/Label/Layer/VectorsLabelRenderer.php

@@ -16,7 +16,7 @@ namespace Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer;
 
 use Netzmacht\Contao\Leaflet\Model\VectorModel;
 use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
-use Symfony\Component\Translation\TranslatorInterface as Translator;
+use Symfony\Contracts\Translation\TranslatorInterface as Translator;
 
 /**
  * Class VectorsLabelRenderer.

src/Bundle/ConsentBridge/Plugin.php

@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Leaflet maps for Contao CMS.
+ *
+ * @package    contao-leaflet-maps
+ * @author     David Molineus <david.molineus@netzmacht.de>
+ * @copyright  2014-2017 netzmacht David Molineus. All rights reserved.
+ * @license    LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
+ * @filesource
+ */
+
+declare(strict_types=1);
+
+namespace Netzmacht\Contao\Leaflet\Bundle\ConsentBridge;
+
+use Hofff\Contao\Consent\Bridge\Bridge;
+use Hofff\Contao\Consent\Bridge\Plugin as ConsentBridgePlugin;
+use Hofff\Contao\Consent\Bridge\Render\RenderInformation;
+
+/**
+ * Consent Bridge plugin for leaflet.
+ */
+final class Plugin implements ConsentBridgePlugin
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function load(Bridge $bridge): void
+    {
+        $renderInformation = RenderInformation::autoRenderWithPlaceholder('leaflet_consent_bridge_placeholder');
+
+        $bridge
+            ->supportContentElement('leaflet', $renderInformation)
+            ->supportFrontendModule('leaflet', $renderInformation);
+    }
+}

src/Bundle/DependencyInjection/Pass/RegisterLibrariesPass.php

@@ -18,6 +18,8 @@ use Netzmacht\LeafletPHP\Assets;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
+use function array_pad;
+
 /**
  * Class RegisterLibrariesPass.
  *
@@ -43,12 +45,12 @@ class RegisterLibrariesPass implements CompilerPassInterface
 
         foreach ($libraries as $name => $assets) {
             if (!empty($assets['css'])) {
-                list ($source, $type) = (array) $assets['css'];
+                [$source, $type] = array_pad((array) $assets['css'], 2, null);
                 $definition->addMethodCall('registerStylesheet', [$name, $source, $type ?: Assets::TYPE_FILE]);
             }
 
             if (!empty($assets['javascript'])) {
-                list ($source, $type) = (array) $assets['javascript'];
+                [$source, $type] = array_pad((array) $assets['javascript'], 2, null);
                 $definition->addMethodCall('registerJavascript', [$name, $source, $type ?: Assets::TYPE_FILE]);
             }
         }

src/Bundle/Resources/config/listeners.yml

@@ -4,7 +4,7 @@ services:
     public: true
     arguments:
       - '@netzmacht.contao_toolkit.repository_manager'
-      - '@templating'
+      - '@netzmacht.contao_toolkit.template_renderer'
       - '@filesystem'
       - '@netzmacht.contao_toolkit.contao.system_adapter'
       - '%netzmacht.contao_leaflet.cache_dir%'

src/Bundle/Resources/config/mappers.yml

@@ -77,6 +77,7 @@ services:
     class: Netzmacht\Contao\Leaflet\Mapper\Layer\FileLayerMapper
     arguments:
       - '@netzmacht.contao_toolkit.repository_manager'
+      - '@netzmacht.contao_toolkit.contao.environment_adapter'
     tags:
       - { name: netzmacht.contao_leaflet.mapper }
 

src/Bundle/Resources/config/providers.yml

@@ -1,13 +1,13 @@
 parameters:
   netzmacht.contao_leaflet.providers:
     OpenStreetMap:
-      variants: ['Mapnik', 'BlackAndWhite', 'DE', 'CH', 'France', 'HOT', 'BZH']
+      variants: ['Mapnik', 'DE', 'CH', 'France', 'HOT', 'BZH']
 
     OpenSeaMap: []
 
-    OpenTopoMap: []
+    OPNVKarte: []
 
-    OpenPtMap: []
+    OpenTopoMap: []
 
     OpenRailwayMap: []
 
@@ -15,6 +15,9 @@ parameters:
 
     SafeCast: []
 
+    Stadia:
+      variants: ['AlidadeSmooth', 'AlidadeSmoothDark', 'OSMBright', 'Outdoors']
+
     Thunderforest:
       class: 'Netzmacht\LeafletPHP\Plugins\LeafletProviders\ThunderforestProvider'
       variants:
@@ -25,12 +28,13 @@ parameters:
         - 'Landscape'
         - 'Outdoors'
         - 'Pioneer'
+        - 'MobileAtlas'
+        - 'Neighbourhood'
       options:
         apiKey: 'tile_provider_key'
       fields: ['tile_provider_key']
 
-    OpenMapSurfer:
+    CyclOSM:  []
-      variants: ['Roads', 'AdminBounds', 'Grayscale']
 
     Hydda:
       variants: ['Full', 'Base', 'RoadsAndLabels']
@@ -41,6 +45,8 @@ parameters:
         accessToken: 'tile_provider_key'
       fields: ['tile_provider_key']
 
+    MapTiler: []
+
     Stamen:
       variants:
         - 'Toner'
@@ -112,6 +118,7 @@ parameters:
         - 'hybridDayMobile'
         - 'hybridDayTransit'
         - 'hybridDayGrey'
+        - 'hybridDayTraffic'
         - 'pedestrianDay'
         - 'pedestrianNight'
         - 'satelliteDay'

src/Bundle/Resources/config/services.yml

@@ -16,7 +16,7 @@ services:
       - '@netzmacht.contao_leaflet.cache'
       - '@netzmacht.contao_leaflet.frontend.data_controller'
       - '@netzmacht.contao_toolkit.repository_manager'
-      - '@templating'
+      - '@netzmacht.contao_toolkit.template_renderer'
 
   netzmacht.contao_leaflet.libraries:
     class: Netzmacht\Contao\Leaflet\Frontend\Assets\LibrariesConfiguration
@@ -136,5 +136,9 @@ services:
   Netzmacht\Contao\Leaflet\Backend\Action\AboutAction:
     public: true
     arguments:
-      - '@templating'
+      - '@twig'
       - '%kernel.project_dir%'
+
+  Netzmacht\Contao\Leaflet\Bundle\ConsentBridge\Plugin:
+    tags:
+      - { name: hofff_contao_consent_bridge.plugin }

src/Bundle/Resources/contao/dca/tl_content.php

@@ -5,6 +5,7 @@
  *
  * @package    contao-leaflet-maps
  * @author     David Molineus <david.molineus@netzmacht.de>
+ * @author     Fritz Michael Gschwantner <fmg@inspiredminds.at>
  * @copyright  2014-2017 netzmacht David Molineus. All rights reserved.
  * @license    LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
  * @filesource
@@ -13,7 +14,7 @@
 $GLOBALS['TL_DCA']['tl_content']['metapalettes']['leaflet'] = [
     'type'      => ['type', 'headline'],
     'leaflet'   => ['leaflet_map', 'leaflet_mapId', 'leaflet_width', 'leaflet_height'],
-    'templates' => [':hide', 'customTpl', 'leaflet_template'],
+    'template'  => [':hide', 'customTpl', 'leaflet_template'],
     'protected' => [':hide', 'protected'],
     'expert'    => [':hide', 'guests', 'cssID', 'space'],
     'invisible' => [':hide', 'invisible', 'start', 'start'],

src/Bundle/Resources/contao/dca/tl_leaflet_control.php

@@ -164,6 +164,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [
                 'maxlength'   => 255,
                 'tl_class'    => 'w50',
                 'nullIfEmpty' => true,
+                'doNotCopy'   => true,
             ],
             'toolkit'       => [
                 'alias_generator' => [

src/Bundle/Resources/contao/dca/tl_leaflet_icon.php

@@ -179,7 +179,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
                 ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
-            'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
+            'eval'          => [
+                'mandatory'   => false,
+                'maxlength'   => 255,
+                'tl_class'    => 'w50',
+                'unique'      => true,
+                'doNotCopy'   => true,
+                'nullIfEmpty' => true,
+            ],
             'toolkit'       => [
                 'alias_generator' => [
                     'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',

src/Bundle/Resources/contao/dca/tl_leaflet_layer.php

@@ -10,6 +10,8 @@
  * @filesource
  */
 
+\Contao\Controller::loadLanguageFile('leaflet');
+
 $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
     'config' => [
         'dataContainer'     => 'Table',
@@ -71,6 +73,11 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
                 'class'      => 'header_edit_all',
                 'attributes' => 'onclick="Backend.getScrollOffset();"',
             ],
+            'toggleNodes' => [
+                'href'         => 'ptg=all',
+                'class'        => 'header_toggle',
+                'showOnSelect' => true,
+            ],
         ],
         'operations'        => [
             'markers' => [
@@ -278,7 +285,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
                 ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
-            'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
+            'eval' => [
+                'mandatory'   => false,
+                'maxlength'   => 255,
+                'tl_class'    => 'w50',
+                'unique'      => true,
+                'nullIfEmpty' => true,
+                'doNotCopy'   => true,
+            ],
             'toolkit'       => [
                 'alias_generator' => [
                     'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',
@@ -626,7 +640,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
             'exclude'   => true,
             'inputType' => 'text',
             'default'   => '',
-            'eval'      => ['maxlength' => 255, 'tl_class' => 'long', 'allowHtml' => true],
+            'eval'      => ['maxlength' => 255, 'tl_class' => 'clr long', 'allowHtml' => true],
             'sql'       => "varchar(255) NOT NULL default ''",
         ],
         'tms'                            => [

src/Bundle/Resources/contao/dca/tl_leaflet_map.php

@@ -28,6 +28,9 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [
         'onsubmit_callback' => [
             ['netzmacht.contao_leaflet.listeners.dca.leaflet', 'clearCache'],
         ],
+        'oncopy_callback' => [
+            ['netzmacht.contao_leaflet.listeners.dca.map', 'copyLayerRelations'],
+        ],
     ],
 
     'list' => [
@@ -157,7 +160,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
                 ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
-            'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
+            'eval'          => [
+                'mandatory'   => false,
+                'maxlength'   => 255,
+                'tl_class'    => 'w50',
+                'unique'      => true,
+                'doNotCopy'   => true,
+                'nullIfEmpty' => true,
+            ],
             'toolkit'       => [
                 'alias_generator' => [
                     'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',

src/Bundle/Resources/contao/dca/tl_leaflet_marker.php

@@ -160,7 +160,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
                 ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
-            'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
+            'eval'          => [
+                'mandatory'   => false,
+                'maxlength'   => 255,
+                'tl_class'    => 'w50',
+                'unique'      => true,
+                'doNotCopy'   => true,
+                'nullIfEmpty' => true,
+            ],
             'toolkit'       => [
                 'alias_generator' => [
                     'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',

src/Bundle/Resources/contao/dca/tl_leaflet_popup.php

@@ -151,7 +151,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
                 ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
-            'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
+            'eval'          => [
+                'mandatory'   => false,
+                'maxlength'   => 255,
+                'tl_class'    => 'w50',
+                'unique'      => true,
+                'doNotCopy'   => true,
+                'nullIfEmpty' => true,
+            ],
             'toolkit'       => [
                 'alias_generator' => [
                     'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',

src/Bundle/Resources/contao/dca/tl_leaflet_style.php

@@ -145,7 +145,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
                 ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
-            'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
+            'eval'          => [
+                'mandatory'   => false,
+                'maxlength'   => 255,
+                'tl_class'    => 'w50',
+                'unique'      => true,
+                'doNotCopy'   => true,
+                'nullIfEmpty' => true,
+            ],
             'toolkit'       => [
                 'alias_generator' => [
                     'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',

src/Bundle/Resources/contao/dca/tl_leaflet_vector.php

@@ -185,7 +185,14 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [
                 ['netzmacht.contao_toolkit.dca.listeners.alias_generator', 'handleSaveCallback'],
                 ['netzmacht.contao_leaflet.listeners.dca.validator', 'validateAlias'],
             ],
-            'eval'          => ['mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true],
+            'eval'          => [
+                'mandatory'   => false,
+                'maxlength'   => 255,
+                'tl_class'    => 'w50',
+                'unique'      => true,
+                'doNotCopy'   => true,
+                'nullIfEmpty' => true,
+            ],
             'toolkit'       => [
                 'alias_generator' => [
                     'factory' => 'netzmacht.contao_leaflet.definition.alias_generator.factory_default',

src/Bundle/Resources/contao/dca/tl_module.php

@@ -5,6 +5,7 @@
  *
  * @package    contao-leaflet-maps
  * @author     David Molineus <david.molineus@netzmacht.de>
+ * @author     Fritz Michael Gschwantner <fmg@inspiredminds.at>
  * @copyright  2014-2017 netzmacht David Molineus. All rights reserved.
  * @license    LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
  * @filesource
@@ -13,7 +14,7 @@
 $GLOBALS['TL_DCA']['tl_module']['metapalettes']['leaflet'] = [
     'type'      => ['name', 'type', 'headline'],
     'leaflet'   => ['leaflet_map', 'leaflet_mapId', 'leaflet_width', 'leaflet_height', 'leaflet_template'],
-    'templates' => [':hide', 'customTpl'],
+    'template'  => [':hide', 'customTpl'],
     'protected' => [':hide', 'protected'],
     'expert'    => [':hide', 'guests', 'cssID', 'space'],
     'invisible' => [':hide', 'invisible', 'start', 'start'],

src/Bundle/Resources/contao/languages/de/tl_leaflet_layer.php

@@ -58,7 +58,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_layer']['groupTypes']['layer']['1']        = 'Ba
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['iconCreateFunction']['0']         = 'Cluster-Icon-Funktion erstellen';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['iconCreateFunction']['1']         = 'Diese Funktion wird zum Erstellen des Cluster-Icons benutzt.';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['icons']['0']                      = 'Icons verwalten';
-$GLOBALS['TL_LANG']['tl_leaflet_layer']['icons']['1']                      = 'Stile verwalten';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['icons']['1']                      = 'Icon-Stile verwalten';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['map']['0']                        = 'Karten verwalten';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['map']['1']                        = 'Leaflet-Karten verwalten.';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['markerCluster']['0']              = 'Marker-Cluster';
@@ -83,7 +83,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_layer']['pasteafter']['1']                 = 'Na
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['pasteinto']['1']                  = 'In Layer %s einfügen';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['polygonOptions']['0']             = 'Polygon-Optionen';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['popups']['0']                     = 'Popups verwalten';
-$GLOBALS['TL_LANG']['tl_leaflet_layer']['popups']['1']                     = 'Popup-Icons verwalten';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['popups']['1']                     = 'Marker Popups verwalten';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['reference']['0']                  = 'Referenz';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['reference']['1']                  = 'Wählen Sie den Referenzlayer aus. Ansonsten wird dasselbe JavaScript-Objekt benutzt.';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['removeOutsideVisibleBounds']['0'] = 'Entfernen, wenn außerhalb der sichtbaren Begrenzung';

src/Bundle/Resources/contao/languages/de/tl_leaflet_popup.php

@@ -35,8 +35,8 @@ $GLOBALS['TL_LANG']['tl_leaflet_popup']['delete']['0']         = 'Popup löschen
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['delete']['1']         = 'Popup ID %s  löschen';
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['edit']['0']           = 'Popup bearbeiten';
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['edit']['1']           = 'Popup ID %s  bearbeiten';
-$GLOBALS['TL_LANG']['tl_leaflet_popup']['icons']['0']          = 'Popups verwalten';
+$GLOBALS['TL_LANG']['tl_leaflet_popup']['icons']['0']          = 'Icons verwalten';
-$GLOBALS['TL_LANG']['tl_leaflet_popup']['icons']['1']          = 'Marker-Popups verwalten';
+$GLOBALS['TL_LANG']['tl_leaflet_popup']['icons']['1']          = 'Marker-Icons verwalten';
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['keepInView']['0']     = 'Im Sichtfeld behalten';
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['keepInView']['1']     = 'Aktivieren Sie diese Einstellung um ein herausschieben des Popups aus dem sichbaren Bereich zu verhindern.';
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['layersBtn']['0']      = 'Layer verwalten';

src/Bundle/Resources/contao/languages/de/tl_leaflet_style.php

@@ -44,7 +44,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_style']['new']['1']         = 'Neuen Stil erstel
 $GLOBALS['TL_LANG']['tl_leaflet_style']['opacity']['0']     = 'Linientransparenz';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['opacity']['1']     = 'Die Transparenz des Striches kann einen Wert zwischen 0 und 1 annehmen.';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['popups']['0']      = 'Popups verwalten';
-$GLOBALS['TL_LANG']['tl_leaflet_style']['popups']['1']      = 'Popup-Icons verwalten';
+$GLOBALS['TL_LANG']['tl_leaflet_style']['popups']['1']      = 'Popup-Stile verwalten';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['show']['0']        = 'Details anzeigen';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['show']['1']        = 'Details des Stils ID %s anzeigen';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['stroke']['0']      = 'Linie ziehen';

src/Bundle/Resources/contao/languages/en/tl_leaflet_layer.php

@@ -21,7 +21,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_layer']['map'][1]    = 'Manage leaflet maps';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['icons'][0]  = 'Manage icons';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['icons'][1]  = 'Manage marker icons';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['popups'][0] = 'Manage popups';
-$GLOBALS['TL_LANG']['tl_leaflet_layer']['popups'][1] = 'Manage popups icons';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['popups'][1] = 'Manage popups styles';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['styles'][0] = 'Manage styles';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['styles'][1] = 'Manage vector styles';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['new'][0]    = 'Create layer';

src/Bundle/Resources/contao/languages/en/tl_leaflet_popup.php

@@ -19,8 +19,8 @@ $GLOBALS['TL_LANG']['tl_leaflet_popup']['layersBtn'][0] = 'Manage layers';
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['layersBtn'][1] = 'Manage leaflet layers';
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['styles'][0]    = 'Manage styles';
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['styles'][1]    = 'Manage vector styles';
-$GLOBALS['TL_LANG']['tl_leaflet_popup']['icons'][0]     = 'Manage popups';
+$GLOBALS['TL_LANG']['tl_leaflet_popup']['icons'][0]     = 'Manage icons';
-$GLOBALS['TL_LANG']['tl_leaflet_popup']['icons'][1]     = 'Manage marker popups';
+$GLOBALS['TL_LANG']['tl_leaflet_popup']['icons'][1]     = 'Manage marker icons';
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['new'][0]       = 'Create popup';
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['new'][1]       = 'Create new popup';
 $GLOBALS['TL_LANG']['tl_leaflet_popup']['edit'][0]      = 'Edit popup';

src/Bundle/Resources/contao/languages/en/tl_leaflet_style.php

@@ -19,7 +19,7 @@ $GLOBALS['TL_LANG']['tl_leaflet_style']['layersBtn'][1] = 'Manage leaflet layers
 $GLOBALS['TL_LANG']['tl_leaflet_style']['icons'][0]     = 'Manage icons';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['icons'][1]     = 'Manage marker icons';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['popups'][0]    = 'Manage popups';
-$GLOBALS['TL_LANG']['tl_leaflet_style']['popups'][1]    = 'Manage popups icons';
+$GLOBALS['TL_LANG']['tl_leaflet_style']['popups'][1]    = 'Manage popups styles';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['new'][0]       = 'Create style';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['new'][1]       = 'Create new style';
 $GLOBALS['TL_LANG']['tl_leaflet_style']['edit'][0]      = 'Edit style';

src/Bundle/Resources/contao/templates/ce_leaflet_map.html5

@@ -9,5 +9,5 @@
 
 </div>
 <!-- indexer::continue -->
-<?php $GLOBALS['TL_BODY'][] = '<script>' . $this->javascript . '</script>'; ?>
+<script><?= $this->javascript ?></script>
 

src/Bundle/Resources/contao/templates/mod_leaflet_map.html5

@@ -9,4 +9,4 @@
 
 </div>
 <!-- indexer::continue -->
-<?php $GLOBALS['TL_BODY'][] = '<script>' . $this->javascript . '</script>'; ?>
+<script><?= $this->javascript ?></script>

src/Bundle/Resources/public/css/backend.css

@@ -23,6 +23,10 @@
     padding-left: 20px !important;
 }
 
+.tl_listing .tl_left {
+    overflow: unset;
+}
+
 .long .tl_text_2 {
     width: 325px;
 }

src/Bundle/Resources/public/css/backend_global.css

@@ -1,6 +1,6 @@
 
-#tl_navigation .tl_level_1_group .group-leaflet {
+#tl_navigation .group-leaflet {
-    background: url(/bundles/netzmachtcontaoleaflet/img/leaflet.svg) 3px 2px no-repeat;
+    background: url(../img/leaflet.svg) 3px 2px no-repeat;
 }
 
 .tl_help_table a {

src/Event/BuildDefinitionEvent.php

@@ -15,7 +15,7 @@ namespace Netzmacht\Contao\Leaflet\Event;
 use Contao\Model;
 use Netzmacht\Contao\Leaflet\Mapper\Request;
 use Netzmacht\LeafletPHP\Definition;
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 
 /**
  * Class BuildDefinitionEvent is emitted when the mapper maps between the model and the definition.

src/Event/ConvertToGeoJsonEvent.php

@@ -14,7 +14,7 @@ namespace Netzmacht\Contao\Leaflet\Event;
 
 use Netzmacht\LeafletPHP\Definition;
 use Netzmacht\LeafletPHP\Value\GeoJson\GeoJsonObject;
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 
 /**
  * Class ConvertToGeoJsonEvent is emitted when the DefinitionMapper converts a definition to a geo json feature.

src/Event/GetHashEvent.php

@@ -12,7 +12,7 @@
 
 namespace Netzmacht\Contao\Leaflet\Event;
 
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 
 /**
  * Class GetHashEvent is emitted then a hash for a data object with an unknown type is required.

src/Event/GetJavascriptEvent.php

@@ -13,7 +13,7 @@
 namespace Netzmacht\Contao\Leaflet\Event;
 
 use Netzmacht\LeafletPHP\Definition\Map;
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 
 /**
  * Class GetJavascriptEvent is emitted after the map javascript was created.

src/Frontend/AbstractMapHybrid.php

@@ -24,7 +24,7 @@ use Netzmacht\Contao\Leaflet\Model\MapModel;
 use Netzmacht\Contao\Toolkit\Component\Hybrid\AbstractHybrid;
 use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
 use Symfony\Component\Templating\EngineInterface as TemplateEngine;
-use Symfony\Component\Translation\TranslatorInterface as Translator;
+use Symfony\Contracts\Translation\TranslatorInterface as Translator;
 
 /**
  * Class HybridTrait provides method required by the frontend module and content element the same time.

src/Frontend/ContentElement/MapElementFactory.php

@@ -22,7 +22,7 @@ use Netzmacht\Contao\Toolkit\Component\Component;
 use Netzmacht\Contao\Toolkit\Component\ComponentFactory;
 use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
 use Symfony\Component\Templating\EngineInterface as TemplateEngine;
-use Symfony\Component\Translation\TranslatorInterface as Translator;
+use Symfony\Contracts\Translation\TranslatorInterface as Translator;
 
 /**
  * Class MapElementFactory

src/Frontend/DataController.php

@@ -93,7 +93,7 @@ class DataController
                 $filter = null;
             }
 
-            list($data, $error) = $this->loadData($mapProvider, $input['type'], $input['id'], $filter);
+            [$data, $error] = $this->loadData($mapProvider, $input['type'], $input['id'], $filter);
             $this->encodeData($input['format'], $data);
         } catch (\Exception $e) {
             if ($this->debugMode) {

src/Frontend/Module/MapModuleFactory.php

@@ -14,7 +14,6 @@ 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;
@@ -22,7 +21,7 @@ use Netzmacht\Contao\Toolkit\Component\Component;
 use Netzmacht\Contao\Toolkit\Component\ComponentFactory;
 use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
 use Symfony\Component\Templating\EngineInterface as TemplateEngine;
-use Symfony\Component\Translation\TranslatorInterface as Translator;
+use Symfony\Contracts\Translation\TranslatorInterface as Translator;
 
 /**
  * Class MapElementFactory

src/Listener/Backend/UserNavigationListener.php

@@ -18,7 +18,7 @@ use Contao\CoreBundle\Event\MenuEvent;
 use Netzmacht\Contao\Toolkit\View\Assets\AssetsManager;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Routing\RouterInterface as Router;
-use Symfony\Component\Translation\TranslatorInterface as Translator;
+use Symfony\Contracts\Translation\TranslatorInterface as Translator;
 
 /**
  * Class BackendMenuListener adds backend entries to the navigation.

src/Listener/Dca/ControlDcaListener.php

@@ -147,9 +147,9 @@ class ControlDcaListener extends AbstractListener
         $statement = $this->connection->prepare($query);
 
         $statement->bindValue('cid', $dataContainer->id);
-        $statement->execute();
+        $result = $statement->executeQuery();
 
-        return $statement->fetchAll();
+        return $result->fetchAllAssociative();
     }
 
     /**
@@ -167,9 +167,9 @@ class ControlDcaListener extends AbstractListener
         $query     = 'SELECT * FROM tl_leaflet_control_layer WHERE cid=:cid order BY sorting';
         $statement = $this->connection->prepare($query);
         $statement->bindValue('cid', $dataContainer->id);
-        $statement->execute();
+        $result = $statement->executeQuery();
 
-        while ($row = $statement->fetch()) {
+        while ($row = $result->fetchAssociative()) {
             $values[$row['lid']] = $row;
         }
 

src/Listener/Dca/FrontendIntegrationListener.php

@@ -20,7 +20,7 @@ use Contao\StringUtil;
 use Netzmacht\Contao\Leaflet\Model\MapModel;
 use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
 use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder;
-use Symfony\Component\Translation\TranslatorInterface as Translator;
+use Symfony\Contracts\Translation\TranslatorInterface as Translator;
 
 /**
  * Class Module is the helper for the tl_module dca.
@@ -103,7 +103,7 @@ final class FrontendIntegrationListener
                 )
             ),
             Image::getHtml(
-                'alias.gif',
+                'alias.svg',
                 $this->translator->trans('editalias.0', [$dataContainer->value], 'contao_tl_content'),
                 'style="vertical-align:top"'
             )

src/Listener/Dca/LayerDcaListener.php

@@ -25,7 +25,7 @@ use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
 use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener;
 use Netzmacht\Contao\Toolkit\Dca\Manager;
 use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder;
-use Symfony\Component\Translation\TranslatorInterface as Translator;
+use Symfony\Contracts\Translation\TranslatorInterface as Translator;
 
 /**
  * Class Layer is the helper class for the tl_leaflet_layer dca.
@@ -197,7 +197,7 @@ class LayerDcaListener extends AbstractListener
         if (!empty($this->layers[$row['type']]['icon'])) {
             $src = $this->layers[$row['type']]['icon'];
         } else {
-            $src = 'iconPLAIN.gif';
+            $src = 'iconPLAIN.svg';
         }
 
         $activeIcon   = $src;
@@ -275,12 +275,12 @@ class LayerDcaListener extends AbstractListener
             $pasteAfterUrl,
             StringUtil::specialchars($this->translator->trans('pasteafter.1', [$row['id']], 'contao_' . $table)),
             Image::getHtml(
-                'pasteafter.gif',
+                'pasteafter.svg',
                 $this->translator->trans('pasteafter.1', [$row['id']], 'contao_' . $table)
             )
         );
 
-        if (!empty($this->layers[$row['type']]['children'])) {
+        if (isset($row['type']) && !empty($this->layers[$row['type']]['children'])) {
             $pasteIntoUrl = $this->backendAdapter->addToUrl(
                 sprintf(
                     'act=%s&mode=2&pid=%s%s',
@@ -295,12 +295,12 @@ class LayerDcaListener extends AbstractListener
                 $pasteIntoUrl,
                 StringUtil::specialchars($this->translator->trans('pasteinto.1', [$row['id']], 'contao_' . $table)),
                 Image::getHtml(
-                    'pasteinto.gif',
+                    'pasteinto.svg',
                     $this->translator->trans('pasteinto.1', [$row['id']], 'contao_' . $table)
                 )
             );
         } elseif ($row['id'] > 0) {
-            $buffer .= Image::getHtml('pasteinto_.gif');
+            $buffer .= Image::getHtml('pasteinto_.svg');
         }
 
         return $buffer;
@@ -361,25 +361,25 @@ class LayerDcaListener extends AbstractListener
         if ($undoId) {
             $statement = $this->connection->prepare('SELECT * FROM tl_undo WHERE id=:id LIMIT 0,1');
             $statement->bindValue('id', $undoId);
-            $statement->execute();
+            $result = $statement->executeQuery();
 
-            $undo = $statement->fetch();
+            $undo = $result->fetchAssociative();
 
             $statement = $this->connection->prepare('SELECT * FROM tl_leaflet_map_layer WHERE lid=:lid');
             $statement->bindValue('lid', $dataContainer->id);
-            $statement->execute();
+            $result = $statement->executeQuery();
 
             $undo['data'] = StringUtil::deserialize($undo['data'], true);
 
-            while ($row = $statement->fetch()) {
+            while ($row = $result->fetchAssociative()) {
                 $undo['data']['tl_leaflet_map_layer'][] = $row;
             }
 
             $statement = $this->connection->prepare('SELECT * FROM tl_leaflet_control_layer WHERE lid=:lid');
             $statement->bindValue('lid', $dataContainer->id);
-            $statement->execute();
+            $result = $statement->executeQuery();
 
-            $undo['data']['tl_leaflet_control_layer'] = $statement->fetchAll();
+            $undo['data']['tl_leaflet_control_layer'] = $result->fetchAllAssociative();
 
             $this->connection->update('tl_undo', ['data' => $undo['data']], ['id' => $undo['id']]);
         }

src/Listener/Dca/LeafletDcaListener.php

@@ -17,9 +17,9 @@ use Contao\DataContainer;
 use Contao\System;
 use Netzmacht\Contao\Leaflet\Model\LayerModel;
 use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
+use Netzmacht\Contao\Toolkit\View\Template\TemplateRenderer;
 use Netzmacht\LeafletPHP\Value\LatLng;
 use Symfony\Component\Filesystem\Filesystem;
-use Symfony\Component\Templating\EngineInterface as TemplateEngine;
 
 /**
  * Class Leaflet is the base helper providing different methods.
@@ -50,11 +50,11 @@ class LeafletDcaListener
     private $repositoryManager;
 
     /**
-     * Template engine.
+     * Template renderer.
      *
-     * @var TemplateEngine
+     * @var TemplateRenderer
      */
-    private $templateEngine;
+    private $templateRenderer;
 
     /**
      * System adapter.
@@ -67,20 +67,20 @@ class LeafletDcaListener
      * LeafletCallbacks constructor.
      *
      * @param RepositoryManager $repositoryManager Repository manager.
-     * @param TemplateEngine    $templateEngine    Template engine.
+     * @param TemplateRenderer  $templateRenderer  Template renderer.
      * @param Filesystem        $fileSystem        File system.
      * @param Adapter|System    $systemAdapter     Contao system adapter.
      * @param string            $cacheDir          Cache dir.
      */
     public function __construct(
         RepositoryManager $repositoryManager,
-        TemplateEngine $templateEngine,
+        TemplateRenderer $templateRenderer,
         Filesystem $fileSystem,
         $systemAdapter,
         string $cacheDir
     ) {
         $this->repositoryManager = $repositoryManager;
-        $this->templateEngine    = $templateEngine;
+        $this->templateRenderer  = $templateRenderer;
         $this->fileSystem        = $fileSystem;
         $this->systemAdapter     = $systemAdapter;
         $this->cacheDir          = $cacheDir;
@@ -125,7 +125,7 @@ class LeafletDcaListener
             $data['marker'] = null;
         }
 
-        return $this->templateEngine->render('toolkit:be:be_leaflet_geocode.html5', $data);
+        return $this->templateRenderer->render('be:be_leaflet_geocode', $data);
     }
 
     /**

src/Listener/Dca/MapDcaListener.php

@@ -24,11 +24,8 @@ use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
 use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener;
 use Netzmacht\Contao\Toolkit\Dca\Manager;
 use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder;
-use PDO;
-use function strlen;
 use Symfony\Component\HttpFoundation\Session\Session;
-use Symfony\Component\Translation\TranslatorInterface as Translator;
+use Symfony\Contracts\Translation\TranslatorInterface as Translator;
-use function var_dump;
 
 /**
  * Class Map is the helper class for the tl_leaflet_map dca.
@@ -138,12 +135,9 @@ class MapDcaListener extends AbstractListener
     {
         $statement = $this->connection->prepare('SELECT lid FROM tl_leaflet_map_layer WHERE mid=:mid ORDER BY sorting');
         $statement->bindValue('mid', $dataContainer->id);
+        $result = $statement->executeQuery();
 
-        if ($statement->execute()) {
+        return $result->fetchFirstColumn();
-            return $statement->fetchAll(PDO::FETCH_COLUMN, 0);
-        }
-
-        return [];
     }
 
     /**
@@ -161,9 +155,9 @@ class MapDcaListener extends AbstractListener
         $statement = $this->connection->prepare('SELECT * FROM tl_leaflet_map_layer WHERE mid=:mid order BY sorting');
 
         $statement->bindValue('mid', $dataContainer->id);
-        $statement->execute();
+        $result = $statement->executeQuery();
 
-        while ($row = $statement->fetch()) {
+        while ($row = $result->fetchAssociative()) {
             $values[$row['lid']] = $row;
         }
 
@@ -228,4 +222,26 @@ class MapDcaListener extends AbstractListener
             ->asTree()
             ->getOptions();
     }
+
+    /**
+     * Copy layer relations if a map is duplicated.
+     *
+     * @param string|int    $insertId      Insert id of the new map.
+     * @param DataContainer $dataContainer Data container driver.
+     *
+     * @return void
+     */
+    public function copyLayerRelations($insertId, DataContainer $dataContainer): void
+    {
+        $statement = $this->connection->prepare('SELECT * FROM tl_leaflet_map_layer WHERE mid=:mid order BY sorting');
+        $statement->bindValue('mid', $dataContainer->id);
+        $result = $statement->executeQuery();
+
+        while ($row = $result->fetchAssociative()) {
+            unset($row['id']);
+            $row['tstamp'] = time();
+            $row['mid']    = $insertId;
+            $this->connection->insert('tl_leaflet_map_layer', $row);
+        }
+    }
 }

src/Listener/Dca/MarkerDcaListener.php

@@ -145,9 +145,9 @@ class MarkerDcaListener
         $statement = $this->connection->prepare($query);
         $statement->bindValue('id', $dataContainer->id);
 
-        $statement->execute();
+        $result = $statement->executeQuery();
 
-        if ($row = $statement->fetch()) {
+        if ($row = $result->fetchAssociative()) {
             $buffer = $row['latitude'];
 
             if ($buffer && $row['longitude']) {

src/Listener/Dca/Validator.php

@@ -16,7 +16,7 @@ use Contao\DataContainer;
 use Contao\StringUtil;
 use Netzmacht\Contao\Toolkit\Dca\Manager;
 use Netzmacht\LeafletPHP\Value\LatLng;
-use Symfony\Component\Translation\TranslatorInterface as Translator;
+use Symfony\Contracts\Translation\TranslatorInterface as Translator;
 
 /**
  * Class Validator.

src/Listener/GeoJsonListener.php

@@ -178,8 +178,8 @@ final class GeoJsonListener
     private function parseModelValue(Model $model, &$property)
     {
         if (is_array($property)) {
-            list($property, $type) = $property;
+            [$property, $type] = $property;
-            $value                 = $model->$property;
+            $value             = $model->$property;
 
             switch ($type) {
                 case 'array':

src/Listener/LoadAssetsListener.php

@@ -143,12 +143,12 @@ class LoadAssetsListener
             $assets = $this->libraries[$library];
 
             if (!empty($assets['css'])) {
-                list ($source, $type) = (array) $assets['css'];
+                [$source, $type] = array_pad((array) $assets['css'], 2, null);
                 $this->assets->addStylesheet($source, $type ?: Assets::TYPE_FILE);
             }
 
             if (!empty($assets['javascript'])) {
-                list ($source, $type) = (array) $assets['javascript'];
+                [$source, $type] = array_pad((array) $assets['javascript'], 2, null);
                 $this->assets->addJavascript($source, $type ?: Assets::TYPE_FILE);
             }
         }

src/Listener/RegisterLibrariesListener.php

@@ -60,11 +60,11 @@ final class RegisterLibrariesListener
     {
         foreach ($this->libraries as $name => $assets) {
             if (!empty($assets['css'])) {
-                list ($source, $type) = (array) $assets['css'];
+                [$source, $type] = array_pad((array) $assets['css'], 2, null);
                 $this->leaflet->registerStylesheet($name, $source, $type ?: Assets::TYPE_FILE);
             }
             if (!empty($assets['javascript'])) {
-                list ($source, $type) = (array) $assets['javascript'];
+                [$source, $type] = array_pad((array) $assets['javascript'], 2, null);
                 $this->leaflet->registerJavascript($name, $source, $type ?: Assets::TYPE_FILE);
             }
         }

src/MapProvider.php

@@ -24,11 +24,11 @@ use Netzmacht\Contao\Leaflet\Model\LayerModel;
 use Netzmacht\Contao\Leaflet\Model\MapModel;
 use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
 use Netzmacht\Contao\Toolkit\View\Template\TemplateReference;
+use Netzmacht\Contao\Toolkit\View\Template\TemplateRenderer;
 use Netzmacht\LeafletPHP\Definition\Map;
 use Netzmacht\LeafletPHP\Leaflet;
 use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface as EventDispatcher;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface as EventDispatcher;
-use Symfony\Component\Templating\EngineInterface as TemplateEngine;
 
 /**
  * Class MapProvider.
@@ -94,11 +94,11 @@ class MapProvider
     private $repositoryManager;
 
     /**
-     * Template engine.
+     * Template renderer.
      *
-     * @var TemplateEngine
+     * @var TemplateRenderer
      */
-    private $templateEngine;
+    private $templateRenderer;
 
     /**
      * Construct.
@@ -111,7 +111,7 @@ class MapProvider
      * @param Cache             $cache             Cache.
      * @param DataController    $dataController    Data controller.
      * @param RepositoryManager $repositoryManager Repository manager.
-     * @param TemplateEngine    $templateEngine    Template engine.
+     * @param TemplateRenderer  $templateRenderer  Template rednerer.
      */
     public function __construct(
         DefinitionMapper $mapper,
@@ -122,7 +122,7 @@ class MapProvider
         Cache $cache,
         DataController $dataController,
         RepositoryManager $repositoryManager,
-        TemplateEngine $templateEngine
+        TemplateRenderer $templateRenderer
     ) {
         $this->mapper            = $mapper;
         $this->leaflet           = $leaflet;
@@ -132,7 +132,7 @@ class MapProvider
         $this->cache             = $cache;
         $this->dataController    = $dataController;
         $this->repositoryManager = $repositoryManager;
-        $this->templateEngine    = $templateEngine;
+        $this->templateRenderer  = $templateRenderer;
     }
 
     /**
@@ -374,7 +374,7 @@ class MapProvider
         $javascript = $this->leaflet->build($definition, $this->assets);
         $mapId      = $definition->getId();
 
-        $templateReference = new TemplateReference($template, 'html5', TemplateReference::SCOPE_FRONTEND);
+        $templateReference = 'fe:' . $template;
         $parameters        = [
             'definition' => $definition,
             'model'      => $model,
@@ -384,12 +384,16 @@ class MapProvider
             'mapId'      => $mapId,
         ];
 
-        $content = $this->templateEngine->render($templateReference, $parameters);
+        $content = $this->templateRenderer->render($templateReference, $parameters);
-        $event   = new GetJavascriptEvent($definition, $content);
+        $content = preg_replace(
-        $this->eventDispatcher->dispatch($event::NAME, $event);
+            ['/^<!-- TEMPLATE (START): .+ -->\n*/', '/\n*<!-- TEMPLATE (END): .+ -->$/'],
+            '',
+            $content
+        );
 
-        $buffer = $event->getJavascript();
+        $event = new GetJavascriptEvent($definition, $content);
+        $this->eventDispatcher->dispatch($event, $event::NAME);
 
-        return $buffer;
+        return $event->getJavascript();
     }
 }

src/Mapper/DefinitionMapper.php

@@ -20,7 +20,7 @@ use Netzmacht\LeafletPHP\Value\GeoJson\ConvertsToGeoJsonFeature;
 use Netzmacht\LeafletPHP\Value\GeoJson\Feature;
 use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection;
 use Netzmacht\LeafletPHP\Value\GeoJson\GeoJsonFeature;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface as EventDispatcher;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface as EventDispatcher;
 
 /**
  * Class DefinitionMapper is the main mapper instance which contains all other mappers as children.
@@ -111,7 +111,7 @@ class DefinitionMapper
 
             if ($definition) {
                 $event = new BuildDefinitionEvent($definition, $model, $request);
-                $this->eventDispatcher->dispatch($event::NAME, $event);
+                $this->eventDispatcher->dispatch($event, $event::NAME);
             }
 
             $this->mapped[$hash] = $definition;
@@ -172,7 +172,7 @@ class DefinitionMapper
         }
 
         $event = new ConvertToGeoJsonEvent($definition, $feature, $model);
-        $this->eventDispatcher->dispatch($event::NAME, $event);
+        $this->eventDispatcher->dispatch($event, $event::NAME);
 
         return $feature;
     }
@@ -190,7 +190,7 @@ class DefinitionMapper
     private function hash($model, $elementId = null)
     {
         $event = new GetHashEvent($model);
-        $this->eventDispatcher->dispatch($event::NAME, $event);
+        $this->eventDispatcher->dispatch($event, $event::NAME);
         $hash = $event->getHash();
 
         if (!$hash) {

src/Mapper/Layer/FileLayerMapper.php

@@ -14,6 +14,8 @@ declare(strict_types=1);
 
 namespace Netzmacht\Contao\Leaflet\Mapper\Layer;
 
+use Contao\CoreBundle\Framework\Adapter;
+use Contao\Environment;
 use Contao\FilesModel;
 use Contao\Model;
 use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
@@ -58,16 +60,25 @@ class FileLayerMapper extends AbstractLayerMapper
      */
     private $repositoryManager;
 
+    /**
+     * Environment.
+     *
+     * @var Adapter<Environment>
+     */
+    private $environmentAdapter;
+
     /**
      * Construct.
      *
-     * @param RepositoryManager $repositoryManager Repository manager.
+     * @param RepositoryManager    $repositoryManager  Repository manager.
+     * @param Adapter<Environment> $environmentAdapter Environment adapter.
      */
-    public function __construct(RepositoryManager $repositoryManager)
+    public function __construct(RepositoryManager $repositoryManager, Adapter $environmentAdapter)
     {
-        $this->repositoryManager = $repositoryManager;
-
         parent::__construct();
+
+        $this->repositoryManager  = $repositoryManager;
+        $this->environmentAdapter = $environmentAdapter;
     }
 
     /**
@@ -103,25 +114,26 @@ class FileLayerMapper extends AbstractLayerMapper
         $layerId = $this->getElementId($model, $elementId);
 
         if ($fileModel instanceof FilesModel && $fileModel->type === 'file') {
+            $url = $this->environmentAdapter->get('url') . '/' . $fileModel->path;
             switch ($model->fileFormat) {
                 case 'gpx':
-                    $layer = new Gpx($layerId, $fileModel->path);
+                    $layer = new Gpx($layerId, $url);
                     break;
 
                 case 'kml':
-                    $layer = new Kml($layerId, $fileModel->path);
+                    $layer = new Kml($layerId, $url);
                     break;
 
                 case 'wkt':
-                    $layer = new Wkt($layerId, $fileModel->path);
+                    $layer = new Wkt($layerId, $url);
                     break;
 
                 case 'geojson':
-                    $layer = new OmnivoreGeoJson($layerId, $fileModel->path);
+                    $layer = new OmnivoreGeoJson($layerId, $url);
                     break;
 
                 case 'topojson':
-                    $layer = new TopoJson($layerId, $fileModel->path);
+                    $layer = new TopoJson($layerId, $url);
                     break;
 
                 default:

src/Mapper/Layer/TileLayerMapper.php

@@ -93,7 +93,7 @@ class TileLayerMapper extends AbstractLayerMapper
         /** @var TileLayer $definition */
         $bounds = StringUtil::deserialize($model->bounds);
 
-        if ($request[0] && $request[1]) {
+        if ($bounds[0] && $bounds[1]) {
             $bounds = array_map(
                 function ($value) {
                     return explode(',', $value, 3);

src/Mapper/OptionsBuilder.php

@@ -210,6 +210,10 @@ class OptionsBuilder
         foreach ($options as $option => $mapping) {
             $default = static::getDefaultOption($option, $definition);
 
+            if ($model->$mapping === null) {
+                continue;
+            }
+
             if ($model->$mapping === '1' || $model->$mapping === '') {
                 if (((bool) $model->$mapping) !== $default) {
                     static::applyOption($option, $model->$mapping, $definition);

src/Mapper/Type/ImageIconMapper.php

@@ -71,16 +71,10 @@ class ImageIconMapper extends AbstractIconMapper
         Request $request = null,
         $elementId = null
     ) {
-        $arguments = parent::buildConstructArguments($model, $mapper, $request, $elementId);
+        $arguments   = parent::buildConstructArguments($model, $mapper, $request, $elementId);
-
+        $repository  = $this->repositoryManager->getRepository(FilesModel::class);
-        if ($model->iconImage) {
+        $file        = $repository->findByUuid($model->iconImage);
-            $repository = $this->repositoryManager->getRepository(FilesModel::class);
+        $arguments[] = $file ? $file->path : '';
-            $file       = $repository->findByUuid($model->iconImage);
-
-            if ($file) {
-                $arguments[] = $file->path;
-            }
-        }
 
         return $arguments;
     }
@@ -117,8 +111,6 @@ class ImageIconMapper extends AbstractIconMapper
             $file = $repository->findByUuid($model->iconImage);
 
             if ($file) {
-                $definition->setIconUrl($file->path);
-
                 $file = new File($file->path);
                 $definition->setIconSize([$file->width, $file->height]);
 

src/Model/ControlModel.php

@@ -41,6 +41,7 @@ SELECT    l.*, c.mode as controlMode
 FROM      tl_leaflet_layer l
 LEFT JOIN tl_leaflet_control_layer c ON l.id = c.lid
 WHERE     c.cid=?
+ORDER BY  c.sorting
 SQL;
 
         $result = Database::getInstance()
@@ -67,6 +68,7 @@ FROM      tl_leaflet_layer l
 LEFT JOIN tl_leaflet_control_layer
 c ON      l.id = c.lid
 WHERE     c.cid=? AND l.active=1
+ORDER BY  c.sorting
 SQL;
 
         $result = Database::getInstance()

src/Model/MarkerModel.php

@@ -17,7 +17,6 @@ use Netzmacht\Contao\Leaflet\Filter\BboxFilter;
 use Netzmacht\Contao\Leaflet\Filter\DistanceFilter;
 use Netzmacht\Contao\Leaflet\Filter\Filter;
 use Netzmacht\LeafletPHP\Value\LatLngBounds;
-use function var_dump;
 
 /**
  * Class MarkerModel for the tl_leaflet_marker table.
@@ -50,8 +49,8 @@ class MarkerModel extends AbstractActiveModel
                 [
                     $table . '.active=1',
                     $table . '.pid=?',
-                    $table . '.latitude>0',
+                    $table . '.latitude IS NOT NULL',
-                    $table . '.longitude>0',
+                    $table . '.longitude IS NOT NULL',
                 ],
                 [$pid],
                 ['order' => 'sorting']