Public-Repositories/contao-leaflet-maps
1
0
Fork 0
forked from Snck3rs/contao-leaflet-maps
Code Pull Requests Activity

Update service setup following the new chain encoder syntax.

Browse Source
This commit is contained in:
David Molineus
2015-01-18 23:19:23 +01:00
parent 8da943dd9d
commit 05d3ddb870
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
module/config/services.php
View File

@@ -14,8 +14,10 @@ use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
use Netzmacht\Contao\Leaflet\MapService; use Netzmacht\Contao\Leaflet\MapService;
use Netzmacht\JavascriptBuilder\Builder; use Netzmacht\JavascriptBuilder\Builder;
use Netzmacht\JavascriptBuilder\Encoder; use Netzmacht\JavascriptBuilder\Encoder;
use Netzmacht\JavascriptBuilder\Encoder\Chain\MultipleChain;
use Netzmacht\JavascriptBuilder\Encoder\ChainEncoder;
use Netzmacht\JavascriptBuilder\Encoder\JavascriptEncoder; use Netzmacht\JavascriptBuilder\Encoder\JavascriptEncoder;
use Netzmacht\JavascriptBuilder\Encoder\ResultCacheEncoder; use Netzmacht\JavascriptBuilder\Encoder\MultipleObjectsEncoder;
use Netzmacht\JavascriptBuilder\Output; use Netzmacht\JavascriptBuilder\Output;
use Netzmacht\JavascriptBuilder\Symfony\EventDispatchingEncoder; use Netzmacht\JavascriptBuilder\Symfony\EventDispatchingEncoder;
use Netzmacht\LeafletPHP\Leaflet; use Netzmacht\LeafletPHP\Leaflet;
@@ -74,12 +76,13 @@ $container['leaflet.definition.builder.encoder-factory'] = function ($container)
$dispatcher = $container['leaflet.definition.builder.event-dispatcher']; $dispatcher = $container['leaflet.definition.builder.event-dispatcher'];
return function (Output $output) use ($dispatcher) { return function (Output $output) use ($dispatcher) {
return new ResultCacheEncoder( $encoder = new ChainEncoder();
new EventDispatchingEncoder( $encoder
new JavascriptEncoder($output, JSON_UNESCAPED_SLASHES), ->register(new MultipleObjectsEncoder())
$dispatcher ->register(new EventDispatchingEncoder($dispatcher))
) ->register(new JavascriptEncoder($output, JSON_UNESCAPED_SLASHES));
);
return $encoder;
}; };
}; };
@@ -93,7 +96,7 @@ $container['leaflet.definition.builder'] = $container->share(function($container
$factory = $container['leaflet.definition.builder.encoder-factory']; $factory = $container['leaflet.definition.builder.encoder-factory'];
$builder = new Builder($factory); $builder = new Builder($factory);
$leaflet = new Leaflet($builder, $dispatcher, array(), JSON_UNESCAPED_SLASHES); $leaflet = new Leaflet($builder, $dispatcher, array(), JSON_UNESCAPED_SLASHES ^ Encoder::BUILD_STACK);
return $boot->initializeLeafletBuilder($leaflet); return $boot->initializeLeafletBuilder($leaflet);
}); });