Snck3rs/contao-leaflet-maps
1
0
Fork 1
mirror of https://github.com/netzmacht/contao-leaflet-maps.git synced 2025-12-02 04:53:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of ServiceContainerTrait. Use dependency injection where possible.

Browse Source
This commit is contained in:
David Molineus
2015-02-02 08:44:17 +01:00
parent 64b0aa5389
commit f703b27a6b
6 changed files with 95 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/Netzmacht/Contao/Leaflet/Subscriber/BootSubscriber.php
View File

@@ -17,6 +17,7 @@ use Netzmacht\Contao\Leaflet\Event\InitializeDefinitionMapperEvent;
use Netzmacht\Contao\Leaflet\Event\InitializeEventDispatcherEvent;
use Netzmacht\Contao\Leaflet\Event\InitializeLeafletBuilderEvent;
use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
use Netzmacht\Contao\Leaflet\Mapper\Mapper;
use Netzmacht\Contao\Leaflet\Model\IconModel;
use Netzmacht\LeafletPHP\Assets;
use Netzmacht\LeafletPHP\Definition\Type\ImageIcon;
@@ -53,14 +54,13 @@ class BootSubscriber implements EventSubscriberInterface
*/
public function initializeDefinitionMapper(InitializeDefinitionMapperEvent $event)
{
$mapper = $event->getDefinitionMapper();
$container = $GLOBALS['container']['leaflet.service-container'];
$mapper = $event->getDefinitionMapper();
foreach ($GLOBALS['LEAFLET_MAPPERS'] as $className) {
if (is_array($className)) {
$mapper->register(new $className[0], $className[1]);
$mapper->register($this->createMapper($className[0]), $className[1]);
} else {
$mapper->register(new $className($container));
$mapper->register($this->createMapper($className));
}
}
}
@@ -162,6 +162,11 @@ class BootSubscriber implements EventSubscriberInterface
}
}
/**
* Set the static flag.
*
* @return string
*/
private function staticFlag()
{
if (\Config::get('debugMode') || TL_MODE !== 'FE') {
@@ -170,4 +175,24 @@ class BootSubscriber implements EventSubscriberInterface
return '|static';
}
/**
* Create a new mapper.
*
* @param mixed $mapper The mapper class or callable factory.
*
* @return Mapper
*
* @SuppressWarnings(PHPMD.Superglobals)
*/
private function createMapper($mapper)
{
if (is_callable($mapper)) {
$container = $GLOBALS['container']['leaflet.service-container'];
return $mapper($container);
}
return new $mapper;
}
}