Merge pull request #140 from geocoder-php/command

Updated the command to support geocoder 4.0

Author: Nyholm

Command/GeocodeCommand.php

@@ -10,6 +10,7 @@
 
 namespace Bazinga\GeocoderBundle\Command;
 
+use Geocoder\Query\GeocodeQuery;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -47,14 +48,14 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        /** @var $geocoder \Geocoder\Geocoder */
-        $geocoder = $this->getContainer()->get('bazinga_geocoder.geocoder');
+        /** @var $geocoder \Geocoder\ProviderAggregator */
+        $geocoder = $this->getContainer()->get('Geocoder\ProviderAggregator');
 
         if ($input->getOption('provider')) {
             $geocoder->using($input->getOption('provider'));
         }
 
-        $results = $geocoder->geocode($input->getArgument('address'));
+        $results = $geocoder->geocodeQuery(GeocodeQuery::create($input->getArgument('address')));
         $data = $results->first()->toArray();
 
         $max = 0;

Tests/Command/GeocodeCommandTest.php

@@ -15,6 +15,8 @@
 use Geocoder\Model\AddressCollection;
 use Geocoder\Model\Coordinates;
 use Geocoder\Model\Country;
+use Geocoder\ProviderAggregator;
+use Geocoder\Query\GeocodeQuery;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
@@ -40,16 +42,17 @@ public function testExecute()
             'countryCode' => $country->getCode(),
         ]);
 
-        $geocoder = $this->getMockBuilder('Geocoder\\ProviderAggregator')->getMock();
+        $geocoder = $this->getMockBuilder(ProviderAggregator::class)->getMock();
+        $query = GeocodeQuery::create(self::$address);
         $geocoder->expects($this->once())
-            ->method('geocode')
-            ->with(self::$address)
+            ->method('geocodeQuery')
+            ->with($query)
             ->will($this->returnValue(new AddressCollection([$address])));
 
         $container = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\Container')->getMock();
         $container->expects($this->once())
             ->method('get')
-            ->with('bazinga_geocoder.geocoder')
+            ->with(ProviderAggregator::class)
             ->will($this->returnValue($geocoder));
 
         $kernel = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Kernel')