Updated namespace to Bazinga\GeocoderBundle (#139)

Nyholm · web-flow · commit f12a68975540 · 2017-07-16T11:18:07.000+02:00
* Updated namespace from Bazinga\Bundle\GeocoderBundle to Bazinga\GeocoderBundle

* Update all namespaces

* Use class constants

* Stylefix
diff --git a/BazingaGeocoderBundle.php b/BazingaGeocoderBundle.php
@@ -8,10 +8,10 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle;
+namespace Bazinga\GeocoderBundle;
 
-use Bazinga\Bundle\GeocoderBundle\DependencyInjection\Compiler\AddProvidersPass;
-use Bazinga\Bundle\GeocoderBundle\DependencyInjection\Compiler\ProfilerPass;
+use Bazinga\GeocoderBundle\DependencyInjection\Compiler\AddProvidersPass;
+use Bazinga\GeocoderBundle\DependencyInjection\Compiler\ProfilerPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
diff --git a/Command/GeocodeCommand.php b/Command/GeocodeCommand.php
@@ -8,7 +8,7 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\Command;
+namespace Bazinga\GeocoderBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputArgument;
diff --git a/DataCollector/GeocoderDataCollector.php b/DataCollector/GeocoderDataCollector.php
@@ -8,7 +8,7 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\DataCollector;
+namespace Bazinga\GeocoderBundle\DataCollector;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/DataCollector/ProfilingProvider.php b/DataCollector/ProfilingProvider.php
@@ -8,7 +8,7 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\DataCollector;
+namespace Bazinga\GeocoderBundle\DataCollector;
 
 use Geocoder\Collection;
 use Geocoder\Exception\LogicException;
diff --git a/DependencyInjection/BazingaGeocoderExtension.php b/DependencyInjection/BazingaGeocoderExtension.php
@@ -8,9 +8,9 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\DependencyInjection;
+namespace Bazinga\GeocoderBundle\DependencyInjection;
 
-use Bazinga\Bundle\GeocoderBundle\ProviderFactory\ProviderFactoryInterface;
+use Bazinga\GeocoderBundle\ProviderFactory\ProviderFactoryInterface;
 use Geocoder\Provider\Cache\ProviderCache;
 use Geocoder\Provider\Provider;
 use Symfony\Component\Config\Definition\Processor;
diff --git a/DependencyInjection/Compiler/AddProvidersPass.php b/DependencyInjection/Compiler/AddProvidersPass.php
@@ -8,7 +8,7 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\DependencyInjection\Compiler;
+namespace Bazinga\GeocoderBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
diff --git a/DependencyInjection/Compiler/ProfilerPass.php b/DependencyInjection/Compiler/ProfilerPass.php
@@ -8,10 +8,10 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\DependencyInjection\Compiler;
+namespace Bazinga\GeocoderBundle\DependencyInjection\Compiler;
 
-use Bazinga\Bundle\GeocoderBundle\DataCollector\GeocoderDataCollector;
-use Bazinga\Bundle\GeocoderBundle\DataCollector\ProfilingProvider;
+use Bazinga\GeocoderBundle\DataCollector\GeocoderDataCollector;
+use Bazinga\GeocoderBundle\DataCollector\ProfilingProvider;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -8,7 +8,7 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\DependencyInjection;
+namespace Bazinga\GeocoderBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
diff --git a/Doctrine/ORM/GeocoderListener.php b/Doctrine/ORM/GeocoderListener.php
@@ -8,9 +8,9 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\Doctrine\ORM;
+namespace Bazinga\GeocoderBundle\Doctrine\ORM;
 
-use Bazinga\Bundle\GeocoderBundle\Mapping\Driver\DriverInterface;
+use Bazinga\GeocoderBundle\Mapping\Driver\DriverInterface;
 use Doctrine\Common\EventSubscriber;
 use Doctrine\ORM\Event\OnFlushEventArgs;
 use Doctrine\ORM\Events;
diff --git a/EventListener/FakeRequestListener.php b/EventListener/FakeRequestListener.php
@@ -8,7 +8,7 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\EventListener;
+namespace Bazinga\GeocoderBundle\EventListener;
 
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
diff --git a/Mapping/Annotations/Address.php b/Mapping/Annotations/Address.php
@@ -8,7 +8,7 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\Mapping\Annotations;
+namespace Bazinga\GeocoderBundle\Mapping\Annotations;
 
 /**
  * @author Markus Bachmann <markus.bachmann@bachi.biz>
diff --git a/Mapping/Annotations/Geocodeable.php b/Mapping/Annotations/Geocodeable.php
@@ -8,7 +8,7 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\Mapping\Annotations;
+namespace Bazinga\GeocoderBundle\Mapping\Annotations;
 
 /**
  * @author Markus Bachmann <markus.bachmann@bachi.biz>
diff --git a/Mapping/Annotations/Latitude.php b/Mapping/Annotations/Latitude.php
@@ -8,7 +8,7 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\Mapping\Annotations;
+namespace Bazinga\GeocoderBundle\Mapping\Annotations;
 
 /**
  * @author Markus Bachmann <markus.bachmann@bachi.biz>
diff --git a/Mapping/Annotations/Longitude.php b/Mapping/Annotations/Longitude.php
@@ -8,7 +8,7 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\Mapping\Annotations;
+namespace Bazinga\GeocoderBundle\Mapping\Annotations;
 
 /**
  * @author Markus Bachmann <markus.bachmann@bachi.biz>
diff --git a/Mapping/ClassMetadata.php b/Mapping/ClassMetadata.php
@@ -8,7 +8,7 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\Mapping;
+namespace Bazinga\GeocoderBundle\Mapping;
 
 /**
  * @author Markus Bachmann <markus.bachmann@bachi.biz>
diff --git a/Mapping/Driver/AnnotationDriver.php b/Mapping/Driver/AnnotationDriver.php
@@ -8,11 +8,11 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\Mapping\Driver;
+namespace Bazinga\GeocoderBundle\Mapping\Driver;
 
-use Bazinga\Bundle\GeocoderBundle\Mapping\Annotations;
-use Bazinga\Bundle\GeocoderBundle\Mapping\ClassMetadata;
-use Bazinga\Bundle\GeocoderBundle\Mapping\Exception;
+use Bazinga\GeocoderBundle\Mapping\Annotations;
+use Bazinga\GeocoderBundle\Mapping\ClassMetadata;
+use Bazinga\GeocoderBundle\Mapping\Exception;
 use Doctrine\Common\Annotations\Reader;
 
 /**
@@ -31,13 +31,13 @@ public function isGeocodeable($object)
     {
         $reflection = new \ReflectionObject($object);
 
-        return (bool) $this->reader->getClassAnnotation($reflection, 'Bazinga\\Bundle\\GeocoderBundle\\Mapping\\Annotations\\Geocodeable');
+        return (bool) $this->reader->getClassAnnotation($reflection, Annotations\Geocodeable::class);
     }
 
     public function loadMetadataFromObject($object)
     {
         $reflection = new \ReflectionObject($object);
-        if (!$annotation = $this->reader->getClassAnnotation($reflection, 'Bazinga\\Bundle\\GeocoderBundle\\Mapping\\Annotations\\Geocodeable')) {
+        if (!$annotation = $this->reader->getClassAnnotation($reflection, Annotations\Geocodeable::class)) {
             throw new Exception\MappingException(sprintf(
                 'The class %s is not geocodeable', get_class($object)
             ));
diff --git a/Mapping/Driver/DriverInterface.php b/Mapping/Driver/DriverInterface.php
@@ -8,7 +8,7 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\Mapping\Driver;
+namespace Bazinga\GeocoderBundle\Mapping\Driver;
 
 interface DriverInterface
 {
diff --git a/Mapping/Exception/MappingException.php b/Mapping/Exception/MappingException.php
@@ -8,7 +8,7 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\Mapping\Exception;
+namespace Bazinga\GeocoderBundle\Mapping\Exception;
 
 /**
  * @author Markus Bachmann <markus.bachmann@bachi.biz>
diff --git a/ProviderFactory/AbstractFactory.php b/ProviderFactory/AbstractFactory.php
@@ -8,7 +8,7 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\ProviderFactory;
+namespace Bazinga\GeocoderBundle\ProviderFactory;
 
 use Geocoder\Provider\Provider;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
diff --git a/ProviderFactory/ChainFactory.php b/ProviderFactory/ChainFactory.php
@@ -8,7 +8,7 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\ProviderFactory;
+namespace Bazinga\GeocoderBundle\ProviderFactory;
 
 use Geocoder\Provider\Chain\Chain;
 use Symfony\Component\OptionsResolver\OptionsResolver;
diff --git a/ProviderFactory/GoogleMapsFactory.php b/ProviderFactory/GoogleMapsFactory.php
@@ -8,7 +8,7 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\ProviderFactory;
+namespace Bazinga\GeocoderBundle\ProviderFactory;
 
 use Geocoder\Provider\GoogleMaps\GoogleMaps;
 use Http\Client\HttpClient;
diff --git a/ProviderFactory/ProviderFactoryInterface.php b/ProviderFactory/ProviderFactoryInterface.php
@@ -8,7 +8,7 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\ProviderFactory;
+namespace Bazinga\GeocoderBundle\ProviderFactory;
 
 use Geocoder\Provider\Provider;
 
diff --git a/Resources/config/profiling.yml b/Resources/config/profiling.yml
@@ -1,6 +1,6 @@
 services:
-  Bazinga\Bundle\GeocoderBundle\DataCollector\GeocoderDataCollector:
-    class: Bazinga\Bundle\GeocoderBundle\DataCollector\GeocoderDataCollector
+  Bazinga\GeocoderBundle\DataCollector\GeocoderDataCollector:
+    class: Bazinga\GeocoderBundle\DataCollector\GeocoderDataCollector
     public: false
     tags:
       - { name: data_collector, template: "BazingaGeocoderBundle:Collector:geocoder", id: "geocoder"  }
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -4,15 +4,15 @@ services:
         public: true
         tags: ['bazinga_geocoder.dumper']
 
-    Bazinga\Bundle\GeocoderBundle\ProviderFactory\:
+    Bazinga\GeocoderBundle\ProviderFactory\:
         resource: '../../ProviderFactory'
         public: false
 
     Geocoder\ProviderAggregator:
         class: Geocoder\ProviderAggregator
 
-    Bazinga\Bundle\GeocoderBundle\EventListener\FakeRequestListener:
-      class: Bazinga\Bundle\GeocoderBundle\EventListener\FakeRequestListener
+    Bazinga\GeocoderBundle\EventListener\FakeRequestListener:
+      class: Bazinga\GeocoderBundle\EventListener\FakeRequestListener
       arguments: ['127.0.0.1']
       tags:
         - { name: kernel.event_listener, event: "kernel.request",  method: "onKernelRequest" }
diff --git a/Tests/Command/GeocodeCommandTest.php b/Tests/Command/GeocodeCommandTest.php
@@ -8,9 +8,9 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\Tests\Command;
+namespace Bazinga\GeocoderBundle\Tests\Command;
 
-use Bazinga\Bundle\GeocoderBundle\Command\GeocodeCommand;
+use Bazinga\GeocoderBundle\Command\GeocodeCommand;
 use Geocoder\Model\Address;
 use Geocoder\Model\AddressCollection;
 use Geocoder\Model\Coordinates;
diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
@@ -8,9 +8,9 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\Tests\DependencyInjection;
+namespace Bazinga\GeocoderBundle\Tests\DependencyInjection;
 
-use Bazinga\Bundle\GeocoderBundle\DependencyInjection\Configuration;
+use Bazinga\GeocoderBundle\DependencyInjection\Configuration;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\Yaml\Yaml;
diff --git a/Tests/DependencyInjection/EventListener/FakeRequestListenerTest.php b/Tests/DependencyInjection/EventListener/FakeRequestListenerTest.php
@@ -8,9 +8,9 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\Tests\EventListener;
+namespace Bazinga\GeocoderBundle\Tests\EventListener;
 
-use Bazinga\Bundle\GeocoderBundle\EventListener\FakeRequestListener;
+use Bazinga\GeocoderBundle\EventListener\FakeRequestListener;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
diff --git a/Tests/DependencyInjection/Fixtures/config.yml b/Tests/DependencyInjection/Fixtures/config.yml
@@ -3,7 +3,7 @@ bazinga_geocoder:
         ip: 33.33.33.11
     providers:
         bing_maps:
-          factory: Bazinga\Bundle\GeocoderBundle\ProviderFactory\GoogleMapsFactory
+          factory: Bazinga\GeocoderBundle\ProviderFactory\GoogleMapsFactory
           options:
             api_key: 123
             locale: en_US
diff --git a/Tests/Doctrine/ORM/GeocoderListenerTest.php b/Tests/Doctrine/ORM/GeocoderListenerTest.php
@@ -8,10 +8,10 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\Tests\Doctrine\ORM;
+namespace Bazinga\GeocoderBundle\Tests\Doctrine\ORM;
 
-use Bazinga\Bundle\GeocoderBundle\Doctrine\ORM\GeocoderListener;
-use Bazinga\Bundle\GeocoderBundle\Mapping\Driver\AnnotationDriver;
+use Bazinga\GeocoderBundle\Doctrine\ORM\GeocoderListener;
+use Bazinga\GeocoderBundle\Mapping\Driver\AnnotationDriver;
 use Doctrine\Common\Annotations\AnnotationRegistry;
 use Doctrine\Common\Annotations\SimpleAnnotationReader;
 use Doctrine\DBAL\DriverManager;
@@ -61,7 +61,7 @@ protected function setUp()
         $this->em = $this->_getTestEntityManager($conn);
 
         $reader = new SimpleAnnotationReader();
-        $reader->addNamespace('Bazinga\Bundle\GeocoderBundle\Mapping\Annotations');
+        $reader->addNamespace('Bazinga\GeocoderBundle\Mapping\Annotations');
         $reader->addNamespace('Doctrine\ORM\Mapping');
 
         $driver = new AnnotationDriver($reader);
@@ -74,7 +74,7 @@ protected function setUp()
 
         $sm = new SchemaTool($this->em);
         $sm->createSchema([
-            $this->em->getClassMetadata('Bazinga\Bundle\GeocoderBundle\Tests\Doctrine\ORM\Dummy'),
+            $this->em->getClassMetadata('Bazinga\GeocoderBundle\Tests\Doctrine\ORM\Dummy'),
         ]);
     }
 
diff --git a/Tests/Functional/BundleInitializationTest.php b/Tests/Functional/BundleInitializationTest.php
@@ -10,9 +10,9 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\Tests\Functional;
+namespace Bazinga\GeocoderBundle\Tests\Functional;
 
-use Bazinga\Bundle\GeocoderBundle\BazingaGeocoderBundle;
+use Bazinga\GeocoderBundle\BazingaGeocoderBundle;
 use Geocoder\Provider\Cache\ProviderCache;
 use Geocoder\Provider\GoogleMaps\GoogleMaps;
 use Geocoder\Provider\Provider;
diff --git a/Tests/Functional/Helper/CacheHelper.php b/Tests/Functional/Helper/CacheHelper.php
@@ -10,7 +10,7 @@
  * @license    MIT License
  */
 
-namespace Bazinga\Bundle\GeocoderBundle\Tests\Functional\Helper;
+namespace Bazinga\GeocoderBundle\Tests\Functional\Helper;
 
 use Psr\SimpleCache\CacheInterface;
 
diff --git a/Tests/Functional/config/cache.yml b/Tests/Functional/config/cache.yml
@@ -4,10 +4,10 @@ bazinga_geocoder:
     enabled: false
   providers:
     acme:
-      factory: Bazinga\Bundle\GeocoderBundle\ProviderFactory\GoogleMapsFactory
+      factory: Bazinga\GeocoderBundle\ProviderFactory\GoogleMapsFactory
       cache_lifetime: 10
       cache: acme.cache
 
 services:
   acme.cache:
-    class: Bazinga\Bundle\GeocoderBundle\Tests\Functional\Helper\CacheHelper
+    class: Bazinga\GeocoderBundle\Tests\Functional\Helper\CacheHelper
diff --git a/Tests/Functional/config/simple.yml b/Tests/Functional/config/simple.yml
@@ -4,4 +4,4 @@ bazinga_geocoder:
     enabled: false
   providers:
     acme:
-      factory: Bazinga\Bundle\GeocoderBundle\ProviderFactory\GoogleMapsFactory
+      factory: Bazinga\GeocoderBundle\ProviderFactory\GoogleMapsFactory
diff --git a/Tests/Mapping/Driver/AnnotationDriverTest.php b/Tests/Mapping/Driver/AnnotationDriverTest.php
diff --git a/composer.json b/composer.json
