From f12a68975540da663c3212ee38b814b795d317ef Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Sun, 16 Jul 2017 11:18:07 +0200 Subject: [PATCH] Updated namespace to Bazinga\GeocoderBundle (#139) * Updated namespace from Bazinga\Bundle\GeocoderBundle to Bazinga\GeocoderBundle * Update all namespaces * Use class constants * Stylefix --- BazingaGeocoderBundle.php | 6 +++--- Command/GeocodeCommand.php | 2 +- DataCollector/GeocoderDataCollector.php | 2 +- DataCollector/ProfilingProvider.php | 2 +- DependencyInjection/BazingaGeocoderExtension.php | 4 ++-- DependencyInjection/Compiler/AddProvidersPass.php | 2 +- DependencyInjection/Compiler/ProfilerPass.php | 6 +++--- DependencyInjection/Configuration.php | 2 +- Doctrine/ORM/GeocoderListener.php | 4 ++-- EventListener/FakeRequestListener.php | 2 +- Mapping/Annotations/Address.php | 2 +- Mapping/Annotations/Geocodeable.php | 2 +- Mapping/Annotations/Latitude.php | 2 +- Mapping/Annotations/Longitude.php | 2 +- Mapping/ClassMetadata.php | 2 +- Mapping/Driver/AnnotationDriver.php | 12 ++++++------ Mapping/Driver/DriverInterface.php | 2 +- Mapping/Exception/MappingException.php | 2 +- ProviderFactory/AbstractFactory.php | 2 +- ProviderFactory/ChainFactory.php | 2 +- ProviderFactory/GoogleMapsFactory.php | 2 +- ProviderFactory/ProviderFactoryInterface.php | 2 +- Resources/config/profiling.yml | 4 ++-- Resources/config/services.yml | 6 +++--- Tests/Command/GeocodeCommandTest.php | 4 ++-- Tests/DependencyInjection/ConfigurationTest.php | 4 ++-- .../EventListener/FakeRequestListenerTest.php | 4 ++-- Tests/DependencyInjection/Fixtures/config.yml | 2 +- Tests/Doctrine/ORM/GeocoderListenerTest.php | 10 +++++----- Tests/Functional/BundleInitializationTest.php | 4 ++-- Tests/Functional/Helper/CacheHelper.php | 2 +- Tests/Functional/config/cache.yml | 4 ++-- Tests/Functional/config/simple.yml | 2 +- Tests/Mapping/Driver/AnnotationDriverTest.php | 8 ++++---- composer.json | 2 +- 35 files changed, 61 insertions(+), 61 deletions(-) diff --git a/BazingaGeocoderBundle.php b/BazingaGeocoderBundle.php index 36a663ec..4745fa02 100644 --- 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 index f77f50b1..9934f0c2 100644 --- 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 index 59e88897..ba3a1276 100644 --- 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 index fbe2f77d..0d3c464e 100644 --- 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 index c8576878..b896fb47 100644 --- 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 index c69ad084..b3ae8883 100644 --- 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 index a82cf750..48b62df3 100644 --- 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 index dddc78b7..78bca2d2 100644 --- 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 index 8a7fdb38..9ff2e9fc 100644 --- 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 index 05accec9..3d49d190 100644 --- 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 index a7dfc81c..8f1be504 100644 --- 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 diff --git a/Mapping/Annotations/Geocodeable.php b/Mapping/Annotations/Geocodeable.php index fc0691fc..ac75ac5e 100644 --- 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 diff --git a/Mapping/Annotations/Latitude.php b/Mapping/Annotations/Latitude.php index 0792b1d3..ee2bcd50 100644 --- 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 diff --git a/Mapping/Annotations/Longitude.php b/Mapping/Annotations/Longitude.php index 8d50218a..deb5974e 100644 --- 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 diff --git a/Mapping/ClassMetadata.php b/Mapping/ClassMetadata.php index bccd2068..d1728843 100644 --- 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 diff --git a/Mapping/Driver/AnnotationDriver.php b/Mapping/Driver/AnnotationDriver.php index e76cd78e..42c1e1e3 100644 --- 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 index 6c6972a4..637da1b8 100644 --- 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 index 02cb456d..68871a63 100644 --- 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 diff --git a/ProviderFactory/AbstractFactory.php b/ProviderFactory/AbstractFactory.php index 1af456b7..f7829dbc 100644 --- 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 index 32d2d770..d178b84e 100644 --- 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 index 2ed1338e..1f2a65ed 100644 --- 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 index 7a412b1a..085ce4c7 100644 --- 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 index 4b60377a..81eb38de 100644 --- 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 index 72b8d7c8..ab4c1da5 100644 --- 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 index bca33a43..ea211652 100644 --- 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 index 3b130e99..01b4e095 100644 --- 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 index c65dd271..6221625c 100644 --- 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 index 8a98831e..d767fff9 100644 --- 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 index 8e3dc45c..75527794 100644 --- 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 index 23388357..78e37c0e 100644 --- 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 index 810242b4..3ff6d715 100644 --- 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 index 79943373..185ee12e 100644 --- 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 \ No newline at end of file + class: Bazinga\GeocoderBundle\Tests\Functional\Helper\CacheHelper diff --git a/Tests/Functional/config/simple.yml b/Tests/Functional/config/simple.yml index d232d640..f4fdd7b7 100644 --- 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 \ No newline at end of file + factory: Bazinga\GeocoderBundle\ProviderFactory\GoogleMapsFactory diff --git a/Tests/Mapping/Driver/AnnotationDriverTest.php b/Tests/Mapping/Driver/AnnotationDriverTest.php index e5e18c4c..bc2cbf66 100644 --- a/Tests/Mapping/Driver/AnnotationDriverTest.php +++ b/Tests/Mapping/Driver/AnnotationDriverTest.php @@ -8,9 +8,9 @@ * @license MIT License */ -namespace Bazinga\Bundle\GeocoderBundle\Tests\Mapping\Driver; +namespace Bazinga\GeocoderBundle\Tests\Mapping\Driver; -use Bazinga\Bundle\GeocoderBundle\Mapping\Driver\AnnotationDriver; +use Bazinga\GeocoderBundle\Mapping\Driver\AnnotationDriver; use Doctrine\Common\Annotations\AnnotationRegistry; use Doctrine\Common\Annotations\Reader; use Doctrine\Common\Annotations\SimpleAnnotationReader; @@ -36,7 +36,7 @@ protected function setUp() AnnotationRegistry::registerLoader('class_exists'); $this->reader = new SimpleAnnotationReader(); - $this->reader->addNamespace('Bazinga\Bundle\GeocoderBundle\Mapping\Annotations'); + $this->reader->addNamespace('Bazinga\GeocoderBundle\Mapping\Annotations'); $this->driver = new AnnotationDriver($this->reader); } @@ -52,7 +52,7 @@ public function testLoadMetadata() } /** - * @expectedException \Bazinga\Bundle\GeocoderBundle\Mapping\Exception\MappingException + * @expectedException \Bazinga\GeocoderBundle\Mapping\Exception\MappingException */ public function testLoadMetadataFromWrongObject() { diff --git a/composer.json b/composer.json index c7931c21..08e969e8 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ }, "autoload": { "psr-4": { - "Bazinga\\Bundle\\GeocoderBundle\\": "" + "Bazinga\\GeocoderBundle\\": "" } }, "scripts": {