From 6a88ed380b4a3ed2f1dae37823e742c347994cf8 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 18 Dec 2018 10:56:29 +0100 Subject: [PATCH 1/3] Update travis configuration for compatibility issues with phpcq v1.2.0. Test against PHP 7.3 as well. --- .travis.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 59a4489..58d570a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,16 @@ +dist: xenial + +addons: + apt: + packages: + - ant-optional + language: php php: - - "7.1" + - "7.3" - "7.2" + - "7.1" env: - CONTAO_VERSION=contao/core-bundle ~4.4.0 From cb3e9bc8b42da4f12aac8fec8b87523d2f92ce32 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 10 Jan 2019 16:39:43 +0100 Subject: [PATCH 2/3] Make controller public as it's required by Symfony 4. --- CHANGELOG.md | 12 ++++++++++-- src/Bundle/Resources/config/services.yml | 2 ++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b6da8c..9cd8d5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,9 +6,17 @@ 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.2 - TBD +## 3.1.3 - 2019-01-10 -[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.1...hotfix/3.1.2) +[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.2...3.1.3) + +### Fixed + + - Fix broken api routes in Contao 4.6/Symfony 4 (#69). + +## 3.1.2 - 2018-12-18 + +[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.1.1...3.1.2) ### Fixed diff --git a/src/Bundle/Resources/config/services.yml b/src/Bundle/Resources/config/services.yml index e7cff08..a129799 100644 --- a/src/Bundle/Resources/config/services.yml +++ b/src/Bundle/Resources/config/services.yml @@ -128,11 +128,13 @@ services: - { name: Netzmacht\Contao\PageContext\Request\PageIdDeterminator } Netzmacht\Contao\Leaflet\Frontend\Action\LayerDataAction: + public: true arguments: - '@netzmacht.contao_leaflet.map.provider' - '@netzmacht.contao_leaflet.filter_factory' Netzmacht\Contao\Leaflet\Backend\Action\AboutAction: + public: true arguments: - '@templating' - '%kernel.project_dir%' From c4feeb1b38c53cb1bee491f2358dcb0a306199ad Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 10 Jan 2019 16:41:03 +0100 Subject: [PATCH 3/3] Add missing error block. --- CHANGELOG.md | 3 ++- src/Bundle/Resources/views/backend/about.html.twig | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cd8d5d..3d1bcc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - - Fix broken api routes in Contao 4.6/Symfony 4 (#69). + - Fix broken api routes in Contao 4.6/Symfony 4 (#69) + - Fix broken about.html.twig template. Error block was missing ## 3.1.2 - 2018-12-18 diff --git a/src/Bundle/Resources/views/backend/about.html.twig b/src/Bundle/Resources/views/backend/about.html.twig index 26fc47f..b426c24 100644 --- a/src/Bundle/Resources/views/backend/about.html.twig +++ b/src/Bundle/Resources/views/backend/about.html.twig @@ -2,6 +2,8 @@ {% block headline %}{{ "MOD.leaflet_about.1"|trans({}, 'contao_modules') }}{% endblock %} +{% block error %}{% endblock %} + {% block main %}