From dd23a1594ee750d061cb4b4bf5bd1111503595ad Mon Sep 17 00:00:00 2001 From: David Molineus Date: Mon, 20 Feb 2023 10:35:00 +0100 Subject: [PATCH] Fix coding standard violations --- composer.json | 22 ++++++++++++---------- src/MapProvider.php | 4 ++-- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 43e526e..3387a46 100644 --- a/composer.json +++ b/composer.json @@ -36,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 || ^6.2", + "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": { @@ -67,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": { diff --git a/src/MapProvider.php b/src/MapProvider.php index 465be27..8ed75df 100644 --- a/src/MapProvider.php +++ b/src/MapProvider.php @@ -215,7 +215,7 @@ class MapProvider $cacheKey = $this->getCacheKey($mapId, $filter, $elementId, $template, $style); if ($this->cache->hasItem($cacheKey)) { - $cached = $this->cache->getItem($cacheKey); + $cached = $this->cache->getItem($cacheKey); $cachedData = $cached->get(); $this->assets->fromArray($cachedData['assets']); @@ -229,7 +229,7 @@ class MapProvider if ($doCache) { $cached - ->expiresAfter((int)$model->cacheLifeTime) + ->expiresAfter((int) $model->cacheLifeTime) ->set( [ 'assets' => $this->assets->toArray(),