Move bundle files to Bundle namespace.

composer.json

@@ -52,7 +52,7 @@
       "dev-develop": "2.1.x-dev",
       "dev-release/3.0.0": "3.0.x-dev"
     },
-    "contao-manager-plugin": "Netzmacht\\Contao\\Leaflet\\ContaoManager\\Plugin",
+    "contao-manager-plugin": "Netzmacht\\Contao\\Leaflet\\Bundle\\ContaoManager\\Plugin",
     "contao": {
       "transifex": {
         "project": "contao-leaflet-maps",

src/Bundle/ContaoManager/Plugin.php

@@ -10,13 +10,15 @@
  * @filesource
  */
 
-namespace Netzmacht\Contao\Leaflet\ContaoManager;
+declare(strict_types=1);
+
+namespace Netzmacht\Contao\Leaflet\Bundle\ContaoManager;
 
 use Contao\CoreBundle\ContaoCoreBundle;
 use Contao\ManagerPlugin\Bundle\BundlePluginInterface;
 use Contao\ManagerPlugin\Bundle\Config\BundleConfig;
 use Contao\ManagerPlugin\Bundle\Parser\ParserInterface;
-use Netzmacht\Contao\Leaflet\NetzmachtContaoLeafletBundle;
+use Netzmacht\Contao\Leaflet\Bundle\NetzmachtContaoLeafletBundle;
 use Netzmacht\Contao\Toolkit\Bundle\NetzmachtContaoToolkitBundle;
 
 /**

src/Bundle/DependencyInjection/NetzmachtContaoLeafletExtension.php

@@ -10,7 +10,9 @@
  * @filesource
  */
 
-namespace Netzmacht\Contao\Leaflet\DependencyInjection;
+declare(strict_types=1);
+
+namespace Netzmacht\Contao\Leaflet\Bundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;

src/Bundle/DependencyInjection/Pass/RegisterDefinitionMapperPass.php

@@ -12,7 +12,7 @@
 
 declare(strict_types=1);
 
-namespace Netzmacht\Contao\Leaflet\DependencyInjection\Pass;
+namespace Netzmacht\Contao\Leaflet\Bundle\DependencyInjection\Pass;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;

src/Bundle/DependencyInjection/Pass/RegisterEncodersPass.php

@@ -12,7 +12,7 @@
 
 declare(strict_types=1);
 
-namespace Netzmacht\Contao\Leaflet\DependencyInjection\Pass;
+namespace Netzmacht\Contao\Leaflet\Bundle\DependencyInjection\Pass;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;

src/Bundle/DependencyInjection/Pass/RegisterLibrariesPass.php

@@ -12,7 +12,7 @@
 
 declare(strict_types=1);
 
-namespace Netzmacht\Contao\Leaflet\DependencyInjection\Pass;
+namespace Netzmacht\Contao\Leaflet\Bundle\DependencyInjection\Pass;
 
 use Netzmacht\LeafletPHP\Assets;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

src/Bundle/NetzmachtContaoLeafletBundle.php

@@ -12,11 +12,11 @@
 
 declare(strict_types=1);
 
-namespace Netzmacht\Contao\Leaflet;
+namespace Netzmacht\Contao\Leaflet\Bundle;
 
-use Netzmacht\Contao\Leaflet\DependencyInjection\Pass\RegisterLibrariesPass;
-use Netzmacht\Contao\Leaflet\DependencyInjection\Pass\RegisterDefinitionMapperPass;
-use Netzmacht\Contao\Leaflet\DependencyInjection\Pass\RegisterEncodersPass;
+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\Toolkit\Bundle\DependencyInjection\Compiler\AddTaggedServicesAsArgumentPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;

src/DependencyInjection/LeafletServices.php

@@ -1,108 +0,0 @@
-<?php
-
-/**
- * Leaflet maps for Contao CMS.
- *
- * @package    contao-leaflet-maps
- * @author     David Molineus <david.molineus@netzmacht.de>
- * @copyright  2016-2017 netzmacht David Molineus. All rights reserved.
- * @license    LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE
- * @filesource
- */
-
-namespace Netzmacht\Contao\Leaflet\DependencyInjection;
-
-use Doctrine\Common\Cache\Cache;
-use Netzmacht\Contao\Leaflet\Boot;
-use Netzmacht\Contao\Leaflet\Frontend\ValueFilter;
-use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
-use Netzmacht\Contao\Leaflet\MapProvider;
-use Netzmacht\Contao\Toolkit\Data\Alias\AliasGenerator;
-use Netzmacht\LeafletPHP\Assets;
-use Netzmacht\LeafletPHP\Leaflet;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-
-/**
- * Class LeafletServices describes services provided by the leaflet package.
- *
- * @package Netzmacht\Contao\Leaflet\DependencyInjection
- */
-class LeafletServices
-{
-    /**
-     * Service name for the alias generator which creates valid js aliases.
-     *
-     * @return AliasGenerator
-     */
-    const ALIAS_GENERATOR = 'leaflet.alias-generator.default';
-
-    /**
-     * Service name of the boot handler.
-     *
-     * @return Boot
-     */
-    const BOOT = 'leaflet.boot';
-
-    /**
-     * Leaflet cache
-     *
-     * @return Cache
-     */
-    const CACHE = 'leaflet.cache';
-
-    /**
-     * Service name of the definition builder.
-     *
-     * @return Leaflet
-     */
-    const DEFINITION_BUILDER = 'leaflet.definition.builder';
-
-    /**
-     * Service name of the encoder factory used inside of the definition builder.
-     *
-     * @return \callable
-     */
-    const DEFINITION_ENCODER_FACTORY = 'leaflet.definition.builder.encoder-factory';
-
-    /**
-     * Service name of the internal used event dispatcher of the definition builder.
-     *
-     * @return EventDispatcherInterface
-     */
-    const DEFINITION_BUILDER_EVENT_DISPATCHER = 'leaflet.definition.builder.event-dispatcher';
-
-    /**
-     * Service name of the definition mapper.
-     *
-     * @return DefinitionMapper
-     */
-    const DEFINITION_MAPPER = 'leaflet.definition.mapper';
-
-    /**
-     * Service name of the leaflet map provider.
-     *
-     * @return MapProvider
-     */
-    const MAP_PROVIDER = 'leaflet.map.provider';
-
-    /**
-     * Service name of the map assets handler.
-     *
-     * @return Assets
-     */
-    const MAP_ASSETS = 'leaflet.map.assets';
-
-    /**
-     * Service name of the frontend value filter.
-     *
-     * @return ValueFilter
-     */
-    const FRONTEND_VALUE_FILTER = 'leaflet.frontend.value-filter';
-
-    /**
-     * Service name for the alias generator uses for rows being unique in the pid.
-     *
-     * @return AliasGenerator
-     */
-    const PARENT_ALIAS_GENERATOR = 'leaflet.alias-generator.parent';
-}