Prepare release 3.2.4

Fix removal of template debug markers (#114 )
Merge branch 'support-mm-2-3'
2023-02-20 12:08:07 +01:00 · 2023-02-20 12:03:20 +01:00 · 2023-02-20 10:37:20 +01:00 · 2023-02-20 10:36:01 +01:00 · 2023-02-20 10:35:00 +01:00 · 2023-02-20 10:28:21 +01:00
17 changed files with 123 additions and 71 deletions
--- a/.phpcq.lock
+++ b/.phpcq.lock
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [Unreleased]

+## [3.2.4] - 2023-02-20
+
+### Fixed
+
+ - Load after `netzmacht-contao-leaflet-libraries` ([#116](https://github.com/netzmacht/contao-leaflet-maps/pull/116, [#120](https://github.com/netzmacht/contao-leaflet-maps/pull/120, [#121](https://github.com/netzmacht/contao-leaflet-maps/issues/121), [#122](https://github.com/netzmacht/contao-leaflet-maps/issues/122))
+ - Do not use `doctrine/cache` anymore ([#118](https://github.com/netzmacht/contao-leaflet-maps/pull/118))
+ - Fix issues of js generation in debug mode ([#114](https://github.com/netzmacht/contao-leaflet-maps/issues/114))
+
 ## [3.2.3] - 2022-02-22

 ### Changed
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,6 @@
    "ext-pdo": "*",
    "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-bundle": "^3.4",
    "netzmacht/contao-leaflet-geocode-widget": "^1.2",
@@ -37,17 +36,18 @@
    "netzmacht/contao-toolkit": "^3.7",
    "netzmacht/php-javascript-builder": "^1.0",
    "netzmacht/php-leaflet": "^1.1.0",
-    "symfony/config": "~4.4 || ^5.1",
-    "symfony/dependency-injection": "~4.4 || ^5.1",
-    "symfony/event-dispatcher": "~4.4 || ^5.1",
+    "symfony/cache-contracts": "^1.1 || ^2.0",
+    "symfony/config": "^4.4 || ^5.1",
+    "symfony/dependency-injection": "^4.4 || ^5.1",
+    "symfony/event-dispatcher": "^4.4 || ^5.1",
    "symfony/event-dispatcher-contracts": "^1.1 || ^2.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/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 || ^6.2",
    "symfony/translation-contracts": "^1.1 || ^2.0",
-    "symfony/twig-bundle": "~4.4 || ^5.1",
+    "symfony/twig-bundle": "^4.4 || ^5.1",
    "twig/twig": "^2.0 || ^3.0"
  },
  "require-dev": {
@@ -68,7 +68,8 @@
    "allow-plugins": {
      "contao-components/installer": true,
      "contao/manager-plugin": true,
-      "contao-community-alliance/composer-plugin": true
+      "contao-community-alliance/composer-plugin": true,
+      "php-http/discovery": true
    }
  },
  "extra": {
--- a/package-lock.json
+++ b/package-lock.json
@@ -519,12 +519,19 @@
      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
    },
    "copy-props": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
-      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz",
+      "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==",
      "requires": {
-        "each-props": "^1.3.0",
-        "is-plain-object": "^2.0.1"
+        "each-props": "^1.3.2",
+        "is-plain-object": "^5.0.0"
+      },
+      "dependencies": {
+        "is-plain-object": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+          "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
+        }
      }
    },
    "core-util-is": {
--- a/phpcq.yaml.dist
+++ b/phpcq.yaml.dist
@@ -39,7 +39,7 @@ phpcq:
    # Composer normalize
    - C00543248C87FB13
    # phpmd
-    - 0F9684B8B16B7AB0
+    - A4E55EA12C7C085C

 tasks:
  fix:
--- a/src/Bundle/ContaoManager/Plugin.php
+++ b/src/Bundle/ContaoManager/Plugin.php
@@ -44,7 +44,8 @@ class Plugin implements BundlePluginInterface, RoutingPluginInterface
                    [
                        ContaoCoreBundle::class,
                        NetzmachtContaoToolkitBundle::class,
-                        NetzmachtContaoPageContextBundle::class
+                        NetzmachtContaoPageContextBundle::class,
+                        'leaflet-libs',
                    ]
                )
                ->setReplace(['leaflet']),
--- a/src/Bundle/Resources/config/services.yml
+++ b/src/Bundle/Resources/config/services.yml
@@ -29,12 +29,14 @@ services:
      - '%netzmacht.contao_leaflet.filters%'

  netzmacht.contao_leaflet.cache.default:
-    class: Doctrine\Common\Cache\FilesystemCache
+    class: Symfony\Component\Cache\Adapter\FilesystemAdapter
    arguments:
+      - 'netzmacht.contao_leaflet'
+      - 0
      - '%netzmacht.contao_leaflet.cache_dir%'

  netzmacht.contao_leaflet.cache.debug:
-    class: Doctrine\Common\Cache\ArrayCache
+    class: Symfony\Component\Cache\Adapter\ArrayAdapter

  netzmacht.contao_leaflet.frontend.value_filter:
    class: Netzmacht\Contao\Leaflet\Frontend\ValueFilter
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_control.php
+++ b/src/Bundle/Resources/contao/dca/tl_leaflet_control.php
@@ -5,7 +5,8 @@
 *
 * @package    contao-leaflet-maps
 * @author     David Molineus <david.molineus@netzmacht.de>
- * @copyright  2014-2017 netzmacht David Molineus. All rights reserved.
+ * @author     Sven Baumann <baumann.sv@gmail.com>
+ * @copyright  2014-2022 netzmacht David Molineus. All rights reserved.
 * @license    LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
 * @filesource
 */
@@ -67,7 +68,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = [
                'label'      => &$GLOBALS['TL_LANG']['tl_leaflet_control']['delete'],
                'href'       => 'act=delete',
                'icon'       => 'delete.gif',
-                'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm']
+                'attributes' => 'onclick="if(!confirm(\'' . ($GLOBALS['TL_LANG']['MSC']['deleteConfirm'] ?? '')
                    . '\'))return false;Backend.getScrollOffset()"',
            ],
            'toggle' => [
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_icon.php
+++ b/src/Bundle/Resources/contao/dca/tl_leaflet_icon.php
@@ -5,7 +5,8 @@
 *
 * @package    contao-leaflet-maps
 * @author     David Molineus <david.molineus@netzmacht.de>
- * @copyright  2014-2017 netzmacht David Molineus. All rights reserved.
+ * @author     Sven Baumann <baumann.sv@gmail.com>
+ * @copyright  2014-2022 netzmacht David Molineus. All rights reserved.
 * @license    LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
 * @filesource
 */
@@ -78,7 +79,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = [
                'label'      => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['delete'],
                'href'       => 'act=delete',
                'icon'       => 'delete.gif',
-                'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm']
+                'attributes' => 'onclick="if(!confirm(\'' . ($GLOBALS['TL_LANG']['MSC']['deleteConfirm'] ?? '')
                    . '\'))return false;Backend.getScrollOffset()"',
            ],
            'toggle' => [
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php
+++ b/src/Bundle/Resources/contao/dca/tl_leaflet_layer.php
@@ -5,7 +5,8 @@
 *
 * @package    contao-leaflet-maps
 * @author     David Molineus <david.molineus@netzmacht.de>
- * @copyright  2014-2017 netzmacht David Molineus. All rights reserved.
+ * @author     Sven Baumann <baumann.sv@gmail.com>
+ * @copyright  2014-2022 netzmacht David Molineus. All rights reserved.
 * @license    LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
 * @filesource
 */
@@ -112,7 +113,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = [
                'label'      => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['delete'],
                'href'       => 'act=delete',
                'icon'       => 'delete.gif',
-                'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm']
+                'attributes' => 'onclick="if(!confirm(\'' . ($GLOBALS['TL_LANG']['MSC']['deleteConfirm'] ?? '')
                    . '\'))return false;Backend.getScrollOffset()"',
            ],
            'toggle'  => [
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_map.php
+++ b/src/Bundle/Resources/contao/dca/tl_leaflet_map.php
@@ -5,7 +5,9 @@
 *
 * @package    contao-leaflet-maps
 * @author     David Molineus <david.molineus@netzmacht.de>
- * @copyright  2014-2017 netzmacht David Molineus. All rights reserved.
+ * @author     Sven Baumann <baumann.sv@gmail.com>
+ * @author     Stefan Heimes <stefan_heimes@hotmail.com>
+ * @copyright  2014-2022 netzmacht David Molineus. All rights reserved.
 * @license    LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
 * @filesource
 */
@@ -73,7 +75,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [
                'label'      => &$GLOBALS['TL_LANG']['tl_leaflet_map']['delete'],
                'href'       => 'act=delete',
                'icon'       => 'delete.gif',
-                'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm']
+                'attributes' => 'onclick="if(!confirm(\'' . ($GLOBALS['TL_LANG']['MSC']['deleteConfirm'] ?? '')
                    . '\'))return false;Backend.getScrollOffset()"',
            ],
            'show'     => [
@@ -426,10 +428,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = [
            'exclude'   => true,
            'inputType' => 'textarea',
            'eval'      => [
-                'tl_class'  => 'clr lng',
-                'allowHtml' => true,
-                'style'     => 'min-height: 40px;',
-                'rte'       => 'ace|json',
+                'tl_class'       => 'clr lng',
+                'preserveTags'   => true,
+                'decodeEntities' => true,
+                'allowHtml'      => true,
+                'style'          => 'min-height: 40px;',
+                'rte'            => 'ace|json',
            ],
            'sql'       => 'text NULL',
        ],
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_marker.php
+++ b/src/Bundle/Resources/contao/dca/tl_leaflet_marker.php
@@ -5,7 +5,9 @@
 *
 * @package    contao-leaflet-maps
 * @author     David Molineus <david.molineus@netzmacht.de>
- * @copyright  2014-2017 netzmacht David Molineus. All rights reserved.
+ * @author     Sven Baumann <baumann.sv@gmail.com>
+ * @author     Stefan Heimes <stefan_heimes@hotmail.com>
+ * @copyright  2014-2022 netzmacht David Molineus. All rights reserved.
 * @license    LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
 * @filesource
 */
@@ -78,7 +80,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [
                'label'      => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['delete'],
                'href'       => 'act=delete',
                'icon'       => 'delete.gif',
-                'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm']
+                'attributes' => 'onclick="if(!confirm(\'' . ($GLOBALS['TL_LANG']['MSC']['deleteConfirm'] ?? '')
                    . '\'))return false;Backend.getScrollOffset()"',
            ],
            'toggle' => [
@@ -339,9 +341,11 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = [
            'inputType' => 'textarea',
            'eval'      => [
                'tl_class'  => 'clr lng',
-                'allowHtml' => true,
-                'style'     => 'min-height: 40px;',
-                'rte'       => 'ace|json',
+                'preserveTags'   => true,
+                'decodeEntities' => true,
+                'allowHtml'      => true,
+                'style'          => 'min-height: 40px;',
+                'rte'            => 'ace|json',
            ],
            'sql'       => 'text NULL',
        ],
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_popup.php
+++ b/src/Bundle/Resources/contao/dca/tl_leaflet_popup.php
@@ -5,7 +5,8 @@
 *
 * @package    contao-leaflet-maps
 * @author     David Molineus <david.molineus@netzmacht.de>
- * @copyright  2014-2017 netzmacht David Molineus. All rights reserved.
+ * @author     Sven Baumann <baumann.sv@gmail.com>
+ * @copyright  2014-2022 netzmacht David Molineus. All rights reserved.
 * @license    LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
 * @filesource
 */
@@ -78,7 +79,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = [
                'label'      => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['delete'],
                'href'       => 'act=delete',
                'icon'       => 'delete.gif',
-                'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm']
+                'attributes' => 'onclick="if(!confirm(\'' . ($GLOBALS['TL_LANG']['MSC']['deleteConfirm'] ?? '')
                    . '\'))return false;Backend.getScrollOffset()"',
            ],
            'toggle' => [
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_style.php
+++ b/src/Bundle/Resources/contao/dca/tl_leaflet_style.php
@@ -5,7 +5,8 @@
 *
 * @package    contao-leaflet-maps
 * @author     David Molineus <david.molineus@netzmacht.de>
- * @copyright  2014-2017 netzmacht David Molineus. All rights reserved.
+ * @author     Sven Baumann <baumann.sv@gmail.com>
+ * @copyright  2014-2022 netzmacht David Molineus. All rights reserved.
 * @license    LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
 * @filesource
 */
@@ -78,7 +79,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = [
                'label'      => &$GLOBALS['TL_LANG']['tl_leaflet_style']['delete'],
                'href'       => 'act=delete',
                'icon'       => 'delete.gif',
-                'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm']
+                'attributes' => 'onclick="if(!confirm(\'' . ($GLOBALS['TL_LANG']['MSC']['deleteConfirm'] ?? '')
                    . '\'))return false;Backend.getScrollOffset()"',
            ],
            'toggle' => [
--- a/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php
+++ b/src/Bundle/Resources/contao/dca/tl_leaflet_vector.php
@@ -5,7 +5,9 @@
 *
 * @package    contao-leaflet-maps
 * @author     David Molineus <david.molineus@netzmacht.de>
- * @copyright  2014-2017 netzmacht David Molineus. All rights reserved.
+ * @author     Sven Baumann <baumann.sv@gmail.com>
+ * @author     Stefan Heimes <stefan_heimes@hotmail.com>
+ * @copyright  2014-2022 netzmacht David Molineus. All rights reserved.
 * @license    LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
 * @filesource
 */
@@ -84,7 +86,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [
                'label'      => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['delete'],
                'href'       => 'act=delete',
                'icon'       => 'delete.gif',
-                'attributes' => 'onclick="if(!confirm(\'' . $GLOBALS['TL_LANG']['MSC']['deleteConfirm']
+                'attributes' => 'onclick="if(!confirm(\'' . ($GLOBALS['TL_LANG']['MSC']['deleteConfirm'] ?? '')
                    . '\'))return false;Backend.getScrollOffset()"',
            ],
            'toggle' => [
@@ -378,10 +380,12 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = [
            'exclude'   => true,
            'inputType' => 'textarea',
            'eval'      => [
-                'tl_class'  => 'clr lng',
-                'allowHtml' => true,
-                'style'     => 'min-height: 40px;',
-                'rte'       => 'ace|json',
+                'tl_class'       => 'clr lng',
+                'preserveTags'   => true,
+                'decodeEntities' => true,
+                'allowHtml'      => true,
+                'style'          => 'min-height: 40px;',
+                'rte'            => 'ace|json',
            ],
            'sql'       => 'text NULL',
        ],
--- a/src/Frontend/Assets/LibrariesConfiguration.php
+++ b/src/Frontend/Assets/LibrariesConfiguration.php
@@ -5,7 +5,8 @@
 *
 * @package    contao-leaflet-maps
 * @author     David Molineus <david.molineus@netzmacht.de>
- * @copyright  2014-2017 netzmacht David Molineus. All rights reserved.
+ * @author     Sven Baumnn <baumann.sv@gmail.com>
+ * @copyright  2014-2022 netzmacht David Molineus. All rights reserved.
 * @license    LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
 * @filesource
 */
@@ -15,6 +16,7 @@ declare(strict_types=1);
 namespace Netzmacht\Contao\Leaflet\Frontend\Assets;

 use Contao\CoreBundle\Framework\ContaoFrameworkInterface as ContaoFramework;
+use Traversable;

 /**
 * Class LibrariesConfiguration.
@@ -45,7 +47,7 @@ class LibrariesConfiguration implements \IteratorAggregate, \ArrayAccess
     *
     * @SuppressWarnings(PHPMD.Superglobals)
     */
-    public function getIterator()
+    public function getIterator(): Traversable
    {
        $this->framework->initialize();

@@ -57,7 +59,7 @@ class LibrariesConfiguration implements \IteratorAggregate, \ArrayAccess
     *
     * @SuppressWarnings(PHPMD.Superglobals)
     */
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
    {
        $this->framework->initialize();

@@ -81,7 +83,7 @@ class LibrariesConfiguration implements \IteratorAggregate, \ArrayAccess
     *
     * @SuppressWarnings(PHPMD.Superglobals)
     */
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
    {
        $this->framework->initialize();

@@ -93,7 +95,7 @@ class LibrariesConfiguration implements \IteratorAggregate, \ArrayAccess
     *
     * @SuppressWarnings(PHPMD.Superglobals)
     */
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
    {
        $this->framework->initialize();

--- a/src/MapProvider.php
+++ b/src/MapProvider.php
@@ -5,6 +5,7 @@
 *
 * @package    contao-leaflet-maps
 * @author     David Molineus <david.molineus@netzmacht.de>
+ * @author     Stefan Heimes <stefan_heimes@hotmail.com>
 * @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,6 @@
 namespace Netzmacht\Contao\Leaflet;

 use Contao\Input;
-use Doctrine\Common\Cache\Cache;
 use Netzmacht\Contao\Leaflet\Encoder\ContaoAssets;
 use Netzmacht\Contao\Leaflet\Event\GetJavascriptEvent;
 use Netzmacht\Contao\Leaflet\Filter\Filter;
@@ -28,7 +28,10 @@ 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\Cache\CacheItem;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface as EventDispatcher;
+use Symfony\Contracts\Cache\CacheInterface as Cache;
+use function dd;

 /**
 * Class MapProvider.
@@ -212,25 +215,29 @@ class MapProvider
        if ($doCache) {
            $cacheKey = $this->getCacheKey($mapId, $filter, $elementId, $template, $style);

-            if ($this->cache->contains($cacheKey)) {
-                $cached = $this->cache->fetch($cacheKey);
-                $this->assets->fromArray($cached['assets']);
+            if ($this->cache->hasItem($cacheKey)) {
+                $cached     = $this->cache->getItem($cacheKey);
+                $cachedData = $cached->get();
+                $this->assets->fromArray($cachedData['assets']);

-                return $cached['javascript'];
+                return $cachedData['javascript'];
+            } else {
+                $cached = $this->cache->getItem($cacheKey);
            }
        }

        $buffer = $this->doGenerate($model, $filter, $elementId, $template, $style);

        if ($doCache) {
-            $this->cache->save(
-                $cacheKey,
-                [
-                    'assets'     => $this->assets->toArray(),
-                    'javascript' => $buffer,
-                ],
-                (int) $model->cacheLifeTime
-            );
+            $cached
+                ->expiresAfter((int) $model->cacheLifeTime)
+                ->set(
+                    [
+                        'assets'     => $this->assets->toArray(),
+                        'javascript' => $buffer,
+                    ]
+                );
+            $this->cache->save($cached);
        }

        return $buffer;
@@ -270,12 +277,19 @@ class MapProvider
            $cacheKey .= '.filter_' . md5($filter->toRequest());
        }

-        if ($this->cache->contains($cacheKey)) {
-            return $this->cache->fetch($cacheKey);
+        if ($this->cache->hasItem($cacheKey)) {
+            $cachedItem = $this->cache->getItem($cacheKey);
+
+            return $cachedItem->get();
+        } else {
+            $cachedItem = $this->cache->getItem($cacheKey);
        }

        $collection = $this->mapper->handleGeoJson($model, $request);
-        $this->cache->save($cacheKey, $collection, $model->cacheLifeTime);
+        $cachedItem
+            ->expiresAfter($model->cacheLifeTime)
+            ->set($collection);
+        $this->cache->save($cachedItem);

        return $collection;
    }
@@ -386,8 +400,8 @@ class MapProvider

        $content = $this->templateRenderer->render($templateReference, $parameters);
        $content = preg_replace(
-            ['/^<!-- TEMPLATE (START): .+ -->\n*/', '/\n*<!-- TEMPLATE (END): .+ -->$/'],
-            '',
+            ['/^(\s*)<!-- TEMPLATE \(?START\)?: .+ -->\n*/', '/\n*<!-- TEMPLATE \(?END\)?: .+ -->$/'],
+            ['$1', ''],
            $content
        );
Author	SHA1	Message	Date
David Molineus	2d47186d26	Prepare release 3.2.4	2023-02-20 12:08:07 +01:00
David Molineus	512ecef899	Fix removal of template debug markers (#114 )	2023-02-20 12:03:20 +01:00
David Molineus	06400f9d1a	Merge branch 'support-mm-2-3'	2023-02-20 10:37:20 +01:00
David Molineus	b346efeb0a	Update phpcq tools	2023-02-20 10:36:01 +01:00
David Molineus	dd23a1594e	Fix coding standard violations	2023-02-20 10:35:00 +01:00
David Molineus	ae800257d8	Do not silence warnings with `@`	2023-02-20 10:28:21 +01:00
David Molineus	35e86ec1b9	Remove dependency of doctrine/cache	2023-02-20 09:58:43 +01:00
David Molineus	a2d1ae683d	Load after leaflet-libs (See #120 )	2023-02-20 09:11:07 +01:00
Stefan Heimes	91ba3ebf04	Correct a misspelled variable name	2023-01-11 12:15:30 +01:00
Stefan Heimes	8ab3cf286c	Change the required minimum version of "doctrine/cache" Remove the version 1.0 'cause of API changes.	2023-01-11 12:10:57 +01:00
Stefan Heimes	ec30f4b4b9	Correct PHP doc and add missing author	2023-01-11 12:10:18 +01:00
Stefan Heimes	fd54d739d7	Code styling	2023-01-11 12:09:58 +01:00
Sven Baumann	44546e4952	Added missing evaluation flags, for save not encoded json in the database	2022-12-10 11:18:57 +01:00
Sven Baumann	9814ed31ad	Suppress warnings for undefined array key	2022-12-08 20:02:46 +01:00
Sven Baumann	bfa70d9f21	Fixed issue for deprecated missing return type	2022-12-08 19:40:02 +01:00
Sven Baumann	ff6aae3a6e	Allow symfony/templating ^6.2	2022-12-08 19:26:54 +01:00
Stefan Heimes	c4980c481d	Update for PHP 8.1 and MetaModels 2.3	2022-11-25 17:53:28 +01:00
Stefan Heimes	d0b9e7cf10	Update for metamodels - MetaModels need doctrine/cache in the version ^2.1	2022-11-16 16:56:46 +01:00
David Molineus	097cd5c31f	Merge pull request #113 from netzmacht/dependabot/npm_and_yarn/copy-props-2.0.5 Bump copy-props from 2.0.4 to 2.0.5	2022-02-22 10:52:33 +01:00
dependabot[bot]	c01610271c	Bump copy-props from 2.0.4 to 2.0.5 Bumps [copy-props](https://github.com/gulpjs/copy-props) from 2.0.4 to 2.0.5. - [Release notes](https://github.com/gulpjs/copy-props/releases) - [Changelog](https://github.com/gulpjs/copy-props/blob/master/CHANGELOG.md) - [Commits](https://github.com/gulpjs/copy-props/compare/2.0.4...2.0.5) --- updated-dependencies: - dependency-name: copy-props dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-02-22 09:49:57 +00:00
David Molineus	bcb68af234	Merge tag '3.2.3'	2022-02-22 10:49:14 +01:00