Use constructor injection in commands (#183)

* Use constructor injection

* cs

* Fixed tests

* Fixed tests

Author: Nyholm

Command/GeocodeCommand.php

@@ -12,6 +12,7 @@
 
 namespace Bazinga\GeocoderBundle\Command;
 
+use Geocoder\ProviderAggregator;
 use Geocoder\Query\GeocodeQuery;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputArgument;
@@ -26,6 +27,21 @@ class GeocodeCommand extends ContainerAwareCommand
 {
     protected static $defaultName = 'geocoder:geocode';
 
+    /**
+     * @var ProviderAggregator
+     */
+    private $geocoder;
+
+    /**
+     * @param ProviderAggregator $geocoder
+     */
+    public function __construct(ProviderAggregator $geocoder)
+    {
+        $this->geocoder = $geocoder;
+
+        parent::__construct();
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -52,14 +68,11 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        /** @var $geocoder \Geocoder\ProviderAggregator */
-        $geocoder = $this->getContainer()->get('Geocoder\ProviderAggregator');
-
         if ($input->getOption('provider')) {
-            $geocoder->using($input->getOption('provider'));
+            $this->geocoder->using($input->getOption('provider'));
         }
 
-        $results = $geocoder->geocodeQuery(GeocodeQuery::create($input->getArgument('address')));
+        $results = $this->geocoder->geocodeQuery(GeocodeQuery::create($input->getArgument('address')));
         $data = $results->first()->toArray();
 
         $max = 0;

ProviderFactory/ArcGISOnlineFactory.php

@@ -14,7 +14,6 @@
 
 use Geocoder\Provider\ArcGISOnline\ArcGISOnline;
 use Geocoder\Provider\Provider;
-use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

ProviderFactory/BingMapsFactory.php

@@ -14,7 +14,6 @@
 
 use Geocoder\Provider\BingMaps\BingMaps;
 use Geocoder\Provider\Provider;
-use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

ProviderFactory/FreeGeoIpFactory.php

@@ -14,7 +14,6 @@
 
 use Geocoder\Provider\FreeGeoIp\FreeGeoIp;
 use Geocoder\Provider\Provider;
-use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

ProviderFactory/GeoIP2Factory.php

@@ -16,7 +16,6 @@
 use Geocoder\Provider\GeoIP2\GeoIP2Adapter;
 use Geocoder\Provider\Provider;
 use GeoIp2\Database\Reader;
-use GeoIp2\ProviderInterface;
 use GeoIp2\WebService\Client;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

ProviderFactory/GeoIPsFactory.php

@@ -14,7 +14,6 @@
 
 use Geocoder\Provider\GeoIPs\GeoIPs;
 use Geocoder\Provider\Provider;
-use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

ProviderFactory/GeoPluginFactory.php

@@ -14,7 +14,6 @@
 
 use Geocoder\Provider\GeoPlugin\GeoPlugin;
 use Geocoder\Provider\Provider;
-use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

ProviderFactory/GeonamesFactory.php

@@ -14,7 +14,6 @@
 
 use Geocoder\Provider\Geonames\Geonames;
 use Geocoder\Provider\Provider;
-use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

ProviderFactory/GoogleMapsFactory.php

@@ -14,7 +14,6 @@
 
 use Geocoder\Provider\GoogleMaps\GoogleMaps;
 use Geocoder\Provider\Provider;
-use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

ProviderFactory/HostIpFactory.php

@@ -14,7 +14,6 @@
 
 use Geocoder\Provider\HostIp\HostIp;
 use Geocoder\Provider\Provider;
-use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

ProviderFactory/IpInfoDbFactory.php

@@ -14,7 +14,6 @@
 
 use Geocoder\Provider\IpInfoDb\IpInfoDb;
 use Geocoder\Provider\Provider;
-use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

ProviderFactory/IpInfoFactory.php

@@ -14,7 +14,6 @@
 
 use Geocoder\Provider\IpInfo\IpInfo;
 use Geocoder\Provider\Provider;
-use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

ProviderFactory/MapQuestFactory.php

@@ -14,7 +14,6 @@
 
 use Geocoder\Provider\MapQuest\MapQuest;
 use Geocoder\Provider\Provider;
-use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

ProviderFactory/MapzenFactory.php

@@ -14,7 +14,6 @@
 
 use Geocoder\Provider\Mapzen\Mapzen;
 use Geocoder\Provider\Provider;
-use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

ProviderFactory/MaxMindFactory.php

@@ -14,7 +14,6 @@
 
 use Geocoder\Provider\MaxMind\MaxMind;
 use Geocoder\Provider\Provider;
-use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

ProviderFactory/NominatimFactory.php

@@ -14,7 +14,6 @@
 
 use Geocoder\Provider\Nominatim\Nominatim;
 use Geocoder\Provider\Provider;
-use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

ProviderFactory/OpenCageFactory.php

@@ -14,7 +14,6 @@
 
 use Geocoder\Provider\OpenCage\OpenCage;
 use Geocoder\Provider\Provider;
-use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

ProviderFactory/PickPointFactory.php

@@ -14,7 +14,6 @@
 
 use Geocoder\Provider\PickPoint\PickPoint;
 use Geocoder\Provider\Provider;
-use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

ProviderFactory/TomTomFactory.php

@@ -14,7 +14,6 @@
 
 use Geocoder\Provider\Provider;
 use Geocoder\Provider\TomTom\TomTom;
-use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

ProviderFactory/YandexFactory.php

@@ -14,7 +14,6 @@
 
 use Geocoder\Provider\Provider;
 use Geocoder\Provider\Yandex\Yandex;
-use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

Resources/config/services.yml

@@ -16,6 +16,7 @@ services:
         arguments: ['127.0.0.1', ~]
 
     Bazinga\GeocoderBundle\Command\GeocodeCommand:
+        arguments: ['@Geocoder\ProviderAggregator']
         tags: [{ name: 'console.command' }]
 
     # Keep these aliases for BC purpose

Tests/Command/GeocodeCommandTest.php

@@ -52,10 +52,6 @@ public function testExecute()
             ->will($this->returnValue(new AddressCollection([$address])));
 
         $container = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\Container')->getMock();
-        $container->expects($this->once())
-            ->method('get')
-            ->with(ProviderAggregator::class)
-            ->will($this->returnValue($geocoder));
 
         $kernel = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Kernel')
             ->disableOriginalConstructor()
@@ -70,7 +66,7 @@ public function testExecute()
             ->will($this->returnValue([]));
 
         $app = new Application($kernel);
-        $app->add(new GeocodeCommand());
+        $app->add(new GeocodeCommand($geocoder));
 
         $command = $app->find('geocoder:geocode');