Fix tests, fix CS

Author: willdurand

DependencyInjection/BazingaGeocoderExtension.php

@@ -152,8 +152,6 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         if (isset($config['providers']['maxmind_binary'])) {
-            $maxmindBinaryParams = $config['providers']['maxmind_binary'];
-            
             $provider = new Definition(
                 '%bazinga_geocoder.geocoder.provider.maxmind_binary.class%',
                 array(
@@ -170,24 +168,27 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         if (isset($config['providers']['cache'])) {
-            $params = $config['providers']['cache'];
-            $cache = new Reference($params['adapter']);
+            $params   = $config['providers']['cache'];
+            $cache    = new Reference($params['adapter']);
             $fallback = new Reference('bazinga_geocoder.provider.'.$params['provider']);
 
-            $provider = new Definition('%bazinga_geocoder.geocoder.provider.cache.class%');
-            $provider->setArguments(array($cache, $fallback, $params['lifetime']));
+            $provider = new Definition(
+                '%bazinga_geocoder.geocoder.provider.cache.class%',
+                array($cache, $fallback, $params['lifetime'])
+            );
 
             if (isset($params['locale'])) {
                 $provider->addArgument($params['locale']);
             }
 
-            $provider->setPublic(false)->addTag('bazinga_geocoder.provider');
+            $provider
+                ->setPublic(false)
+                ->addTag('bazinga_geocoder.provider');
 
             $container->setDefinition('bazinga_geocoder.provider.cache', $provider);
         }
 
         if (isset($config['providers']['chain'])) {
-
             $chainProvider = new Definition(
                 '%bazinga_geocoder.geocoder.provider.chain.class%'
             );

DependencyInjection/Compiler/AddProvidersPass.php

@@ -27,7 +27,7 @@ class AddProvidersPass implements CompilerPassInterface
     /**
      * Get all providers based on their tag ('geocoder.provider') and register them.
      *
-     * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container    The container.
+     * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container The container.
      */
     public function process(ContainerBuilder $container)
     {

DependencyInjection/Configuration.php

@@ -10,7 +10,6 @@
 
 namespace Bazinga\Bundle\GeocoderBundle\DependencyInjection;
 
-use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 

DumperManager.php

@@ -7,7 +7,6 @@
  * @license    MIT License
  */
 
-
 namespace Bazinga\Bundle\GeocoderBundle;
 
 use Geocoder\Dumper\DumperInterface;

Provider/CacheProvider.php

@@ -41,9 +41,9 @@ class CacheProvider implements ProviderInterface
     /**
      * Constructor
      *
-     * @param Cache             $cache     The cache interface
-     * @param ProviderInterface $provider  The fallback provider
-     * @param integer           $lifetime  The cache lifetime
+     * @param Cache             $cache    The cache interface
+     * @param ProviderInterface $provider The fallback provider
+     * @param integer           $lifetime The cache lifetime
      */
     public function __construct(Cache $cache, ProviderInterface $provider, $lifetime = 0, $locale = null)
     {

Tests/DependencyInjection/BazingaGeocoderExtensionTest.php

@@ -16,10 +16,12 @@ class BazingaGeocoderExtensionTest extends \PHPUnit_Framework_TestCase
 {
     public function testLoad()
     {
-        $configs = Yaml::parse(file_get_contents(__DIR__.'/Fixtures/config.yml'));
+        $configs   = Yaml::parse(file_get_contents(__DIR__.'/Fixtures/config.yml'));
         $container = new ContainerBuilder();
         $extension = new BazingaGeocoderExtension();
 
+        $container->setParameter('fixtures_dir', __DIR__ . '/Fixtures');
+
         $container->set('doctrine.apc.cache', new ArrayCache());
 
         $container->addCompilerPass(new AddDumperPass());
@@ -38,7 +40,7 @@ public function testLoad()
             $this->assertTrue($dumperManager->has($name));
         }
 
-        $geocoder = $container->get('bazinga_geocoder.geocoder');
+        $geocoder  = $container->get('bazinga_geocoder.geocoder');
         $providers = $geocoder->getProviders();
         foreach (array(
             'bing_maps'            => 'Geocoder\\Provider\\BingMapsProvider',
@@ -61,6 +63,7 @@ public function testLoad()
             'geo_plugin'           => 'Geocoder\\Provider\\GeoPluginProvider',
             'maxmind'              => 'Geocoder\\Provider\\MaxmindProvider',
             'chain'                => 'Geocoder\\Provider\\ChainProvider',
+            'maxmind_binary'       => 'Geocoder\\Provider\\MaxmindBinaryProvider',
         ) as $name => $class) {
             $this->assertInstanceOf($class, $providers[$name], sprintf('-> Assert that %s is instance of %s', $name, $class));
         }

Tests/DependencyInjection/Fixtures/config.yml

@@ -42,6 +42,6 @@ bazinga_geocoder:
         maxmind:
             api_key: 123
         maxmind_binary:
-            binary_file: /path/to/maxmind.dat
+            binary_file: %fixtures_dir%/maxmind.dat
         chain:
             providers: [free_geo_ip, host_ip]

Tests/DependencyInjection/Fixtures/maxmind.dat

@@ -16,7 +16,8 @@
     "symfony/console": ">=2.0,<2.4-dev"
   },
   "require-dev": {
-    "symfony/yaml": ">=2.0,<2.4-dev"
+    "symfony/yaml": ">=2.0,<2.4-dev",
+    "maxromanovsky/php-maxmind-geoip": "~1.12"
   },
   "autoload": {
     "psr-0": { "Bazinga\\Bundle\\GeocoderBundle": "" }