Restore compatibility with contao-toolkit 3.0.

This commit is contained in:
David Molineus
2017-10-05 15:34:19 +02:00
parent f8aac5747c
commit dfc1fa49d9
4 changed files with 19 additions and 19 deletions

View File

@@ -9,15 +9,17 @@
* *
*/ */
declare(strict_types=1);
namespace Netzmacht\Contao\Leaflet\Frontend; namespace Netzmacht\Contao\Leaflet\Frontend;
use ContaoCommunityAlliance\Translator\TranslatorInterface as Translator;
use Database\Result; use Database\Result;
use Model\Collection; use Model\Collection;
use Netzmacht\Contao\Leaflet\MapProvider; use Netzmacht\Contao\Leaflet\MapProvider;
use Netzmacht\Contao\Leaflet\Model\MapModel; use Netzmacht\Contao\Leaflet\Model\MapModel;
use Netzmacht\Contao\Toolkit\Component\Hybrid\AbstractHybrid; use Netzmacht\Contao\Toolkit\Component\Hybrid\AbstractHybrid;
use Netzmacht\Contao\Toolkit\View\Template\TemplateFactory; use Netzmacht\Contao\Toolkit\View\Template\TemplateFactory;
use Symfony\Component\Translation\TranslatorInterface as Translator;
/** /**
* Class HybridTrait provides method required by the frontend module and content element the same time. * Class HybridTrait provides method required by the frontend module and content element the same time.
@@ -79,7 +81,7 @@ abstract class AbstractMapHybrid extends AbstractHybrid
* *
* @return string * @return string
*/ */
public function generate() public function generate(): string
{ {
$this->mapProvider->handleAjaxRequest($this->getIdentifier()); $this->mapProvider->handleAjaxRequest($this->getIdentifier());
@@ -113,7 +115,7 @@ abstract class AbstractMapHybrid extends AbstractHybrid
* *
* @SuppressWarnings(PHPMD.Superglobals) * @SuppressWarnings(PHPMD.Superglobals)
*/ */
protected function compile() protected function compile(): void
{ {
try { try {
$template = $this->get('leaflet_template') ?: 'leaflet_map_js'; $template = $this->get('leaflet_template') ?: 'leaflet_map_js';
@@ -146,5 +148,5 @@ abstract class AbstractMapHybrid extends AbstractHybrid
* *
* @return string * @return string
*/ */
abstract protected function getIdentifier(); abstract protected function getIdentifier(): string;
} }

View File

@@ -9,6 +9,8 @@
* *
*/ */
declare(strict_types=1);
namespace Netzmacht\Contao\Leaflet\Frontend\InsertTag; namespace Netzmacht\Contao\Leaflet\Frontend\InsertTag;
use Netzmacht\Contao\Leaflet\MapProvider; use Netzmacht\Contao\Leaflet\MapProvider;
@@ -57,28 +59,20 @@ class LeafletInsertTagParser implements Parser
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
public static function getTags() public function supports(string $tag): bool
{ {
return ['leaflet']; return $tag === 'leaflet';
} }
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
public function supports($tag) public function parse(string $raw, string $tag, string $params = null, bool $cache = true): string
{
return in_array($tag, static::getTags());
}
/**
* {@inheritDoc}
*/
public function parse($raw, $tag, $params = null, $cache = true)
{ {
$parts = explode('::', $params); $parts = explode('::', $params);
if (empty($parts[0])) { if (empty($parts[0])) {
return false; return '';
} }
$style = empty($parts[1]) ? 'width:400px;height:300px' : $parts[1]; $style = empty($parts[1]) ? 'width:400px;height:300px' : $parts[1];
@@ -98,7 +92,7 @@ class LeafletInsertTagParser implements Parser
* *
* @throws \Exception If debug mode is enabled and something went wrong. * @throws \Exception If debug mode is enabled and something went wrong.
*/ */
private function generateMap($mapId, $template, $style) private function generateMap($mapId, string $template, string $style)
{ {
try { try {
return $this->mapProvider->generate($mapId, null, $mapId, $template, $style); return $this->mapProvider->generate($mapId, null, $mapId, $template, $style);

View File

@@ -9,6 +9,8 @@
* *
*/ */
declare(strict_types=1);
namespace Netzmacht\Contao\Leaflet\Frontend; namespace Netzmacht\Contao\Leaflet\Frontend;
/** /**
@@ -30,7 +32,7 @@ class MapElement extends AbstractMapHybrid
* *
* @return string * @return string
*/ */
protected function getIdentifier() protected function getIdentifier(): string
{ {
if ($this->get('leaflet_mapId')) { if ($this->get('leaflet_mapId')) {
return $this->get('leaflet_mapId'); return $this->get('leaflet_mapId');

View File

@@ -9,6 +9,8 @@
* *
*/ */
declare(strict_types=1);
namespace Netzmacht\Contao\Leaflet\Frontend; namespace Netzmacht\Contao\Leaflet\Frontend;
/** /**
@@ -30,7 +32,7 @@ class MapModule extends AbstractMapHybrid
* *
* @return string * @return string
*/ */
protected function getIdentifier() protected function getIdentifier(): string
{ {
if ($this->get('leaflet_mapId')) { if ($this->get('leaflet_mapId')) {
return $this->get('leaflet_mapId'); return $this->get('leaflet_mapId');