From 01b3962b789d45b969e9f258f3b8b571ebf0bbdf Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 17 Oct 2017 17:11:35 +0200 Subject: [PATCH] Optimize use statements. --- src/Bundle/NetzmachtContaoLeafletBundle.php | 2 +- src/Listener/Dca/ControlDcaListener.php | 4 ++-- src/Listener/Dca/FrontendIntegrationListener.php | 2 +- src/Listener/Dca/LayerDcaListener.php | 2 +- src/Listener/Dca/MarkerDcaListener.php | 2 +- src/Listener/Dca/VectorDcaListener.php | 2 +- src/MapProvider.php | 2 +- src/Mapper/Layer/MarkersLayerMapper.php | 4 ++-- src/Mapper/Layer/VectorsLayerMapper.php | 4 ++-- src/Mapper/Vector/PolylineMapper.php | 2 +- src/Subscriber/GeoJsonSubscriber.php | 4 ++-- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Bundle/NetzmachtContaoLeafletBundle.php b/src/Bundle/NetzmachtContaoLeafletBundle.php index 8ed759e..305463c 100644 --- a/src/Bundle/NetzmachtContaoLeafletBundle.php +++ b/src/Bundle/NetzmachtContaoLeafletBundle.php @@ -14,9 +14,9 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet\Bundle; -use Netzmacht\Contao\Leaflet\Bundle\DependencyInjection\Pass\RegisterLibrariesPass; use Netzmacht\Contao\Leaflet\Bundle\DependencyInjection\Pass\RegisterDefinitionMapperPass; use Netzmacht\Contao\Leaflet\Bundle\DependencyInjection\Pass\RegisterEncodersPass; +use Netzmacht\Contao\Leaflet\Bundle\DependencyInjection\Pass\RegisterLibrariesPass; use Netzmacht\Contao\Toolkit\Bundle\DependencyInjection\Compiler\AddTaggedServicesAsArgumentPass; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Bundle\Bundle; diff --git a/src/Listener/Dca/ControlDcaListener.php b/src/Listener/Dca/ControlDcaListener.php index 8a48e71..f9f33f4 100644 --- a/src/Listener/Dca/ControlDcaListener.php +++ b/src/Listener/Dca/ControlDcaListener.php @@ -14,11 +14,11 @@ namespace Netzmacht\Contao\Leaflet\Listener\Dca; use Contao\StringUtil; use Doctrine\DBAL\Connection; +use Netzmacht\Contao\Leaflet\Model\ControlModel; +use Netzmacht\Contao\Leaflet\Model\LayerModel; use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener; use Netzmacht\Contao\Toolkit\Dca\Manager; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; -use Netzmacht\Contao\Leaflet\Model\ControlModel; -use Netzmacht\Contao\Leaflet\Model\LayerModel; /** * Class Control is the helper for the tl_leaflet_control dca. diff --git a/src/Listener/Dca/FrontendIntegrationListener.php b/src/Listener/Dca/FrontendIntegrationListener.php index 4d9685d..b47bc47 100644 --- a/src/Listener/Dca/FrontendIntegrationListener.php +++ b/src/Listener/Dca/FrontendIntegrationListener.php @@ -14,8 +14,8 @@ declare(strict_types=1); namespace Netzmacht\Contao\Leaflet\Listener\Dca; -use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; use Netzmacht\Contao\Leaflet\Model\MapModel; +use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; use Symfony\Component\Translation\TranslatorInterface as Translator; /** diff --git a/src/Listener/Dca/LayerDcaListener.php b/src/Listener/Dca/LayerDcaListener.php index 7df607e..d1ce1cd 100644 --- a/src/Listener/Dca/LayerDcaListener.php +++ b/src/Listener/Dca/LayerDcaListener.php @@ -19,10 +19,10 @@ use Contao\StringUtil; use Doctrine\DBAL\Connection; use Netzmacht\Contao\Leaflet\Backend\Renderer\Label\Layer\LayerLabelRenderer; use Netzmacht\Contao\Leaflet\Model\IconModel; +use Netzmacht\Contao\Leaflet\Model\LayerModel; use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener; use Netzmacht\Contao\Toolkit\Dca\Manager; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; -use Netzmacht\Contao\Leaflet\Model\LayerModel; use Symfony\Component\Translation\TranslatorInterface as Translator; /** diff --git a/src/Listener/Dca/MarkerDcaListener.php b/src/Listener/Dca/MarkerDcaListener.php index 5bf6593..4fa565b 100644 --- a/src/Listener/Dca/MarkerDcaListener.php +++ b/src/Listener/Dca/MarkerDcaListener.php @@ -14,9 +14,9 @@ namespace Netzmacht\Contao\Leaflet\Listener\Dca; use Contao\Controller; use Doctrine\DBAL\Connection; -use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; use Netzmacht\Contao\Leaflet\Model\IconModel; use Netzmacht\Contao\Leaflet\Model\PopupModel; +use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; /** * Class Marker is the dca helper class for the tl_leaflet_marker dca. diff --git a/src/Listener/Dca/VectorDcaListener.php b/src/Listener/Dca/VectorDcaListener.php index f88d082..a8aec5d 100644 --- a/src/Listener/Dca/VectorDcaListener.php +++ b/src/Listener/Dca/VectorDcaListener.php @@ -14,10 +14,10 @@ namespace Netzmacht\Contao\Leaflet\Listener\Dca; use Netzmacht\Contao\Leaflet\Model\IconModel; use Netzmacht\Contao\Leaflet\Model\PopupModel; +use Netzmacht\Contao\Leaflet\Model\StyleModel; use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener; use Netzmacht\Contao\Toolkit\Dca\Manager; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; -use Netzmacht\Contao\Leaflet\Model\StyleModel; /** * Helper class for the tl_leaflet_vector dca. diff --git a/src/MapProvider.php b/src/MapProvider.php index 2163c90..dd3b74a 100644 --- a/src/MapProvider.php +++ b/src/MapProvider.php @@ -22,9 +22,9 @@ use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Model\LayerModel; use Netzmacht\Contao\Leaflet\Model\MapModel; use Netzmacht\Contao\Leaflet\Request\Request; -use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection; use Netzmacht\LeafletPHP\Definition\Map; use Netzmacht\LeafletPHP\Leaflet; +use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection; use Symfony\Component\EventDispatcher\EventDispatcherInterface as EventDispatcher; /** diff --git a/src/Mapper/Layer/MarkersLayerMapper.php b/src/Mapper/Layer/MarkersLayerMapper.php index 453291f..9cde83c 100644 --- a/src/Mapper/Layer/MarkersLayerMapper.php +++ b/src/Mapper/Layer/MarkersLayerMapper.php @@ -13,16 +13,16 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Layer; use Contao\Model; +use Netzmacht\Contao\Leaflet\Frontend\RequestUrl; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Mapper\GeoJsonMapper; use Netzmacht\Contao\Leaflet\Model\MarkerModel; -use Netzmacht\Contao\Leaflet\Frontend\RequestUrl; use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\JavascriptBuilder\Type\Expression; use Netzmacht\LeafletPHP\Definition; +use Netzmacht\LeafletPHP\Definition\Group\GeoJson; use Netzmacht\LeafletPHP\Plugins\Omnivore\GeoJson as OmnivoreGeoJson; use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection; -use Netzmacht\LeafletPHP\Definition\Group\GeoJson; /** * Class MarkersLayerMapper maps the layer model to the markers definition. diff --git a/src/Mapper/Layer/VectorsLayerMapper.php b/src/Mapper/Layer/VectorsLayerMapper.php index b2d4697..9f632cc 100644 --- a/src/Mapper/Layer/VectorsLayerMapper.php +++ b/src/Mapper/Layer/VectorsLayerMapper.php @@ -14,16 +14,16 @@ namespace Netzmacht\Contao\Leaflet\Mapper\Layer; use Contao\Model; use Contao\Model\Collection; +use Netzmacht\Contao\Leaflet\Frontend\RequestUrl; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Mapper\GeoJsonMapper; use Netzmacht\Contao\Leaflet\Model\VectorModel; -use Netzmacht\Contao\Leaflet\Frontend\RequestUrl; use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\JavascriptBuilder\Type\Expression; use Netzmacht\LeafletPHP\Definition; +use Netzmacht\LeafletPHP\Definition\Group\GeoJson; use Netzmacht\LeafletPHP\Plugins\Omnivore\GeoJson as OmnivoreGeoJson; use Netzmacht\LeafletPHP\Value\GeoJson\FeatureCollection; -use Netzmacht\LeafletPHP\Definition\Group\GeoJson; /** * Class VectorsLayerMapper maps the layer model for the Vectors layer definition. diff --git a/src/Mapper/Vector/PolylineMapper.php b/src/Mapper/Vector/PolylineMapper.php index 7a5367f..f7ef6b3 100644 --- a/src/Mapper/Vector/PolylineMapper.php +++ b/src/Mapper/Vector/PolylineMapper.php @@ -16,8 +16,8 @@ use Contao\Model; use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper; use Netzmacht\Contao\Leaflet\Request\Request; use Netzmacht\LeafletPHP\Definition; -use Netzmacht\LeafletPHP\Value\LatLng; use Netzmacht\LeafletPHP\Definition\Vector\Polyline; +use Netzmacht\LeafletPHP\Value\LatLng; /** * Class PolylineMapper maps the database model to the polyline definition. diff --git a/src/Subscriber/GeoJsonSubscriber.php b/src/Subscriber/GeoJsonSubscriber.php index 30ce1d6..a478314 100644 --- a/src/Subscriber/GeoJsonSubscriber.php +++ b/src/Subscriber/GeoJsonSubscriber.php @@ -14,12 +14,12 @@ namespace Netzmacht\Contao\Leaflet\Subscriber; use Netzmacht\Contao\Leaflet\Event\ConvertToGeoJsonEvent; use Netzmacht\Contao\Leaflet\Model\LayerModel; -use Netzmacht\LeafletPHP\Definition\Vector; -use Netzmacht\LeafletPHP\Value\GeoJson\Feature; use Netzmacht\LeafletPHP\Definition\HasPopup; use Netzmacht\LeafletPHP\Definition\UI\Marker; +use Netzmacht\LeafletPHP\Definition\Vector; use Netzmacht\LeafletPHP\Definition\Vector\Circle; use Netzmacht\LeafletPHP\Definition\Vector\CircleMarker; +use Netzmacht\LeafletPHP\Value\GeoJson\Feature; use Symfony\Component\EventDispatcher\EventSubscriberInterface; /**