Fixed broken master (#125)

* Fixed broken master

* Travis fix

* Fixed typo

* Allow to fail on HHVM

Author: Nyholm

.travis.yml

@@ -4,18 +4,20 @@ php:
     - 5.4
     - 5.5
     - 5.6
-    - hhvm
 
 env:
     - SYMFONY_VERSION=2.3.*
     - SYMFONY_VERSION=2.5.*
     - SYMFONY_VERSION=2.7.*
+    - SYMFONY_VERSION=2.8.*
     - SYMFONY_VERSION=dev-master
 
 matrix:
     allow_failures:
         - env: SYMFONY_VERSION=dev-master
-
+        - php: hhvm
+          dist: trusty
+          env: SYMFONY_VERSION=2.7.*
 
 before_script:
     - composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update

Tests/Command/GeocodeCommandTest.php

@@ -32,13 +32,13 @@ public function testExecute()
         $country = new Country('France', 'FR');
         $address = new Address($coordinates, $bounds, '10', 'rue Gambetta', '75020', 'Paris', null, null, $country);
 
-        $geocoder = $this->getMock('Geocoder\\ProviderAggregator');
+        $geocoder = $this->getMockBuilder('Geocoder\\ProviderAggregator')->getMock();
         $geocoder->expects($this->once())
             ->method('geocode')
             ->with(self::$address)
             ->will($this->returnValue(new AddressCollection(array($address))));
 
-        $container = $this->getMock('Symfony\\Component\\DependencyInjection\\Container');
+        $container = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\Container')->getMock();
         $container->expects($this->once())
             ->method('get')
             ->with('bazinga_geocoder.geocoder')
@@ -48,10 +48,14 @@ public function testExecute()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $kernel->expects($this->once())
+        $kernel->expects($this->any())
             ->method('getContainer')
             ->will($this->returnValue($container));
 
+        $kernel->expects($this->any())
+            ->method('getBundles')
+            ->will($this->returnValue([]));
+
         $app = new Application($kernel);
         $app->add(new GeocodeCommand());
 

Tests/DependencyInjection/EventListener/FakeRequestListenerTest.php

@@ -16,7 +16,7 @@ public function testOnKernelRequest()
     {
         $listener = new FakeRequestListener('33.33.33.1');
 
-        $kernel = $this->getMock('Symfony\\Component\\HttpKernel\\HttpKernelInterface');
+        $kernel = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\HttpKernelInterface')->getMock();
         $request = new Request();
         $event = new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
 

Tests/DependencyInjection/Fixtures/config.yml

@@ -40,7 +40,7 @@ bazinga_geocoder:
         maxmind:
             api_key: 123
         maxmind_binary:
-            binary_file: %fixtures_dir%/maxmind.dat
+            binary_file: "%fixtures_dir%/maxmind.dat"
         opencage:
             locale: en_US
             api_key: 123

Tests/DumperManagerTest.php

@@ -21,12 +21,12 @@ protected function setup()
 
     public function testSet()
     {
-        $this->assertNull($this->manager->set('test', $this->getMock('Geocoder\\Dumper\\Dumper')));
+        $this->assertNull($this->manager->set('test', $this->getMockBuilder('Geocoder\\Dumper\\Dumper')->getMock()));
     }
 
     public function testGet()
     {
-        $dumper = $this->getMock('Geocoder\\Dumper\\Dumper');
+        $dumper = $this->getMockBuilder('Geocoder\\Dumper\\Dumper')->getMock();
         $this->manager->set('test', $dumper);
 
         $this->assertEquals($dumper, $this->manager->get('test'));
@@ -43,13 +43,13 @@ public function testGetNotExistDumper()
     public function testHas()
     {
         $this->assertFalse($this->manager->has('test'));
-        $this->manager->set('test', $this->getMock('Geocoder\\Dumper\\Dumper'));
+        $this->manager->set('test', $this->getMockBuilder('Geocoder\\Dumper\\Dumper')->getMock());
         $this->assertTrue($this->manager->has('test'));
     }
 
     public function testRemove()
     {
-        $this->manager->set('test', $this->getMock('Geocoder\\Dumper\\Dumper'));
+        $this->manager->set('test', $this->getMockBuilder('Geocoder\\Dumper\\Dumper')->getMock());
         $this->manager->remove('test');
         $this->assertFalse($this->manager->has('test'));
     }

Tests/Logger/GeocoderLoggerTest.php

@@ -27,7 +27,7 @@ class GeocoderLoggerTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $logger = $this->getMock('Psr\\Log\\LoggerInterface');
+        $logger = $this->getMockBuilder('Psr\\Log\\LoggerInterface')->getMock();
         $logger
             ->expects($this->any())
             ->method('info')

Tests/Provider/CacheProviderTest.php

@@ -16,13 +16,13 @@ public function testGeocode()
         $coordinates = array('lat' => 48.857049,'lng' => 2.35223);
         $cacheKey = 'geocoder_'.sha1($address);
 
-        $delegate = $this->getMock('Geocoder\\Provider\\Provider');
+        $delegate = $this->getMockBuilder('Geocoder\\Provider\\Provider')->getMock();
         $delegate->expects($this->once())
             ->method('geocode')
             ->with($address)
             ->will($this->returnValue($coordinates));
 
-        $cache = $this->getMock('Doctrine\\Common\\Cache\\Cache');
+        $cache = $this->getMockBuilder('Doctrine\\Common\\Cache\\Cache')->getMock();
         $cache->expects($this->once())
             ->method('fetch')
             ->with($cacheKey)
@@ -42,7 +42,7 @@ public function testCachedGeocode()
         $coordinates = array('lat' => 48.857049,'lng' => 2.35223);
         $cacheKey = 'geocoder_'.sha1($address);
 
-        $delegate = $this->getMock('Geocoder\\Provider\\Provider');
+        $delegate = $this->getMockBuilder('Geocoder\\Provider\\Provider')->getMock();
         $delegate->expects($this->once())
             ->method('geocode')
             ->with($address)
@@ -60,7 +60,7 @@ public function testReverse()
     {
         $coordinates = array('lat' => 48.857049, 'lon' => 2.35223);
 
-        $delegate = $this->getMock('Geocoder\\Provider\\Provider');
+        $delegate = $this->getMockBuilder('Geocoder\\Provider\\Provider')->getMock();
         $delegate->expects($this->once())
             ->method('reverse')
             ->with($coordinates['lat'], $coordinates['lon'])
@@ -76,8 +76,8 @@ public function testReverse()
 
     public function testGetName()
     {
-        $delegate = $this->getMock('Geocoder\\Provider\\Provider');
-        $cache = $this->getMock('Doctrine\\Common\\Cache\\Cache');
+        $delegate = $this->getMockBuilder('Geocoder\\Provider\\Provider')->getMock();
+        $cache = $this->getMockBuilder('Doctrine\\Common\\Cache\\Cache')->getMock();
 
         $provider = new Cache($cache, $delegate);
 

Tests/bootstrap.php

@@ -7,7 +7,7 @@
 ');
 }
 
-require_once __DIR__.'/../vendor/maxromanovsky/php-maxmind-geoip/geoip.inc';
-require_once __DIR__.'/../vendor/maxromanovsky/php-maxmind-geoip/geoipcity.inc';
+require_once __DIR__.'/../vendor/geoip/geoip/src/geoip.inc';
+require_once __DIR__.'/../vendor/geoip/geoip/src/geoipcity.inc';
 
 $loader->add('Doctrine\Tests', __DIR__.'/../vendor/doctrine/orm/tests');

composer.json

@@ -18,10 +18,13 @@
   "require-dev": {
     "php": ">=5.4",
     "symfony/yaml": "~2.1|~3.0",
-    "maxromanovsky/php-maxmind-geoip": "~1.12",
+    "geoip/geoip": "~1.17",
     "doctrine/cache": "~1.3",
     "doctrine/orm": "~2.3"
   },
+  "conflict":  {
+    "willdurand/geocoder": "3.2"
+  },
   "autoload": {
     "psr-0": { "Bazinga\\Bundle\\GeocoderBundle": "" }
   },