diff --git a/composer.json b/composer.json index 83af883..8585b83 100644 --- a/composer.json +++ b/composer.json @@ -23,16 +23,16 @@ "docs": "http://leaflet-maps-for-contao.readthedocs.org/" }, "require": { - "php": ">=7.1", + "php": "^7.1 || ^8.0", "ext-json": "*", "ext-pdo": "*", - "contao-community-alliance/meta-palettes": "^2.0 || ^1.11", + "contao-community-alliance/meta-palettes": "^2.0", "contao/core-bundle": "^4.9", "doctrine/cache": "^1.0", "doctrine/dbal": "^2.11 || ^3.0", - "menatwork/contao-multicolumnwizard": "^3.3", + "menatwork/contao-multicolumnwizard-bundle": "^3.4", "netzmacht/contao-leaflet-geocode-widget": "^1.2", - "netzmacht/contao-leaflet-libraries": "^1.3.4", + "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", @@ -46,7 +46,7 @@ "symfony/http-kernel": "~4.4 || ^5.1", "symfony/routing": "~4.4 || ^5.1", "symfony/templating": "~4.4 || ^5.1", - "symfony/translation": "~4.4 || ^5.1", + "symfony/translation-contracts": "^1.1 || ^2.0", "symfony/twig-bundle": "~4.4 || ^5.1", "twig/twig": "^2.0 || ^3.0" }, diff --git a/src/Backend/Renderer/Label/Layer/ChainRenderer.php b/src/Backend/Renderer/Label/Layer/ChainRenderer.php index 9fa24e8..42e99d0 100644 --- a/src/Backend/Renderer/Label/Layer/ChainRenderer.php +++ b/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. diff --git a/src/Backend/Renderer/Label/Layer/FileLabelRenderer.php b/src/Backend/Renderer/Label/Layer/FileLabelRenderer.php index 3c3a354..0205ea9 100644 --- a/src/Backend/Renderer/Label/Layer/FileLabelRenderer.php +++ b/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 diff --git a/src/Backend/Renderer/Label/Layer/LayerLabelRenderer.php b/src/Backend/Renderer/Label/Layer/LayerLabelRenderer.php index 4c5a71d..6f8651b 100644 --- a/src/Backend/Renderer/Label/Layer/LayerLabelRenderer.php +++ b/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. diff --git a/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php b/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php index 7a1e1f6..0bd0585 100644 --- a/src/Backend/Renderer/Label/Layer/MarkersLabelRenderer.php +++ b/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. diff --git a/src/Backend/Renderer/Label/Layer/OverpassLabelRenderer.php b/src/Backend/Renderer/Label/Layer/OverpassLabelRenderer.php index f32f19a..35a6b38 100644 --- a/src/Backend/Renderer/Label/Layer/OverpassLabelRenderer.php +++ b/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. diff --git a/src/Backend/Renderer/Label/Layer/ProviderLabelRenderer.php b/src/Backend/Renderer/Label/Layer/ProviderLabelRenderer.php index 9148b97..020a854 100644 --- a/src/Backend/Renderer/Label/Layer/ProviderLabelRenderer.php +++ b/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. diff --git a/src/Backend/Renderer/Label/Layer/ReferenceLabelRenderer.php b/src/Backend/Renderer/Label/Layer/ReferenceLabelRenderer.php index afb5497..0abef5d 100644 --- a/src/Backend/Renderer/Label/Layer/ReferenceLabelRenderer.php +++ b/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. diff --git a/src/Backend/Renderer/Label/Layer/VectorsLabelRenderer.php b/src/Backend/Renderer/Label/Layer/VectorsLabelRenderer.php index b892440..ed4a203 100644 --- a/src/Backend/Renderer/Label/Layer/VectorsLabelRenderer.php +++ b/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. diff --git a/src/Frontend/AbstractMapHybrid.php b/src/Frontend/AbstractMapHybrid.php index 63e1083..5814e72 100644 --- a/src/Frontend/AbstractMapHybrid.php +++ b/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. diff --git a/src/Frontend/ContentElement/MapElementFactory.php b/src/Frontend/ContentElement/MapElementFactory.php index 6b8da7f..2ebc4ae 100644 --- a/src/Frontend/ContentElement/MapElementFactory.php +++ b/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 diff --git a/src/Frontend/Module/MapModuleFactory.php b/src/Frontend/Module/MapModuleFactory.php index 53e255d..2b1e59a 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 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 diff --git a/src/Listener/Backend/UserNavigationListener.php b/src/Listener/Backend/UserNavigationListener.php index b42789e..72e9aff 100644 --- a/src/Listener/Backend/UserNavigationListener.php +++ b/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. diff --git a/src/Listener/Dca/FrontendIntegrationListener.php b/src/Listener/Dca/FrontendIntegrationListener.php index 8a4f4c9..1fe9e92 100644 --- a/src/Listener/Dca/FrontendIntegrationListener.php +++ b/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. diff --git a/src/Listener/Dca/LayerDcaListener.php b/src/Listener/Dca/LayerDcaListener.php index 664853b..02f1af1 100644 --- a/src/Listener/Dca/LayerDcaListener.php +++ b/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. diff --git a/src/Listener/Dca/MapDcaListener.php b/src/Listener/Dca/MapDcaListener.php index 66b882a..721e6a9 100644 --- a/src/Listener/Dca/MapDcaListener.php +++ b/src/Listener/Dca/MapDcaListener.php @@ -25,7 +25,7 @@ use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener; use Netzmacht\Contao\Toolkit\Dca\Manager; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; use Symfony\Component\HttpFoundation\Session\Session; -use Symfony\Component\Translation\TranslatorInterface as Translator; +use Symfony\Contracts\Translation\TranslatorInterface as Translator; /** * Class Map is the helper class for the tl_leaflet_map dca. diff --git a/src/Listener/Dca/Validator.php b/src/Listener/Dca/Validator.php index e05fd5c..644c125 100644 --- a/src/Listener/Dca/Validator.php +++ b/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.