Minor tweaks

Author: willdurand

src/Geocoder/Provider/MaxMindBinaryProvider.php

@@ -31,7 +31,7 @@ class MaxMindBinaryProvider extends AbstractProvider implements ProviderInterfac
     /**
      * @param string   $datFile
      * @param int|null $openFlag
-     * 
+     *
      * @throws RuntimeException         if maxmind's lib not installed.
      * @throws InvalidArgumentException if dat file is not correct.
      */
@@ -40,18 +40,20 @@ public function __construct($datFile, $openFlag = null)
         if (false === function_exists('geoip_open')) {
             throw new RuntimeException('The MaxMindBinaryProvider requires maxmind\'s lib to be installed and loaded. Have you included geoip.inc file?');
         }
+
         if (false === function_exists('GeoIP_record_by_addr')) {
             throw new RuntimeException('The MaxMindBinaryProvider requires maxmind\'s lib to be installed and loaded. Have you included geoipcity.inc file?');
         }
-        
+
         if (false === is_file($datFile)) {
-            throw new InvalidArgumentException(sprintf('Given MaxMind dat file %s is not exist.', $this->datFile));
+            throw new InvalidArgumentException(sprintf('Given MaxMind dat file "%s" does not exist.', $this->datFile));
         }
+
         if (false === is_readable($datFile)) {
-            throw new InvalidArgumentException(sprintf('Given MaxMind dat file %s is not readable.', $this->datFile));
+            throw new InvalidArgumentException(sprintf('Given MaxMind dat file "%s" does not readable.', $this->datFile));
         }
-        $this->datFile = $datFile;
-        
+
+        $this->datFile  = $datFile;
         $this->openFlag = null === $openFlag ? GEOIP_STANDARD : $openFlag;
     }
 
@@ -64,23 +66,22 @@ public function getGeocodedData($address)
             throw new UnsupportedException('The MaxMindBinaryProvider does not support street addresses.');
         }
 
-        $geoIp = geoip_open($this->datFile, $this->openFlag);
-
+        $geoIp       = geoip_open($this->datFile, $this->openFlag);
         $geoIpRecord = GeoIP_record_by_addr($geoIp, $address);
 
         geoip_close($geoIp);
-        
+
         if (false === $geoIpRecord instanceof \geoiprecord) {
             throw new NoResultException(sprintf('No results found for IP address %s', $address));
         }
-        
+
         return array_merge($this->getDefaults(), array(
             'countryCode' => $geoIpRecord->country_code,
-            'country' => $geoIpRecord->country_name,
-            'region' => $geoIpRecord->region,
-            'city' => $geoIpRecord->city,
-            'latitude' => $geoIpRecord->latitude,
-            'longitude' => $geoIpRecord->longitude,
+            'country'     => $geoIpRecord->country_name,
+            'region'      => $geoIpRecord->region,
+            'city'        => $geoIpRecord->city,
+            'latitude'    => $geoIpRecord->latitude,
+            'longitude'   => $geoIpRecord->longitude,
         ));
     }
 
@@ -99,4 +100,4 @@ public function getName()
     {
         return 'maxmind_binary';
     }
-}
+}

tests/Geocoder/Tests/Provider/MaxMindBinaryProviderTest.php

@@ -1,15 +1,24 @@
 <?php
 namespace Geocoder\Tests\Provider;
 
+use Geocoder\Tests\TestCase;
 use Geocoder\Provider\MaxMindBinaryProvider;
 
-class MaxMindBinaryProviderTest extends \PHPUnit_Framework_TestCase
+class MaxMindBinaryProviderTest extends TestCase
 {
+    private $binaryFile;
+
+    public function setUp()
+    {
+        $this->binaryFile = __DIR__ . '/fixtures/GeoLiteCity.dat';
+    }
+
     public static function setUpBeforeClass()
     {
         if (false == function_exists('geoip_open')) {
             throw new \PHPUnit_Framework_SkippedTestError('The maxmind\'s official lib required to run these tests.');
         }
+
         if (false == function_exists('GeoIP_record_by_addr')) {
             throw new \PHPUnit_Framework_SkippedTestError('The maxmind\'s official lib required to run these tests.');
         }
@@ -37,11 +46,8 @@ public function testThrowIfNotExistBinaryFileGiven()
      */
     public function testLocationResultContainsExpectedFields($ip)
     {
-        $binaryFile = __DIR__.'/fixtures/GeoLiteCity.dat';
-
-        $provider = new MaxMindBinaryProvider($binaryFile);
-
-        $result = $provider->getGeocodedData($ip);
+        $provider = new MaxMindBinaryProvider($this->binaryFile);
+        $result   = $provider->getGeocodedData($ip);
 
         $this->assertInternalType('array', $result);
 
@@ -67,11 +73,8 @@ public function testLocationResultContainsExpectedFields($ip)
      */
     public function testFindLocationByIp($ip, $expectedCity, $expectedCountry)
     {
-        $binaryFile = __DIR__.'/fixtures/GeoLiteCity.dat';
-
-        $provider = new MaxMindBinaryProvider($binaryFile);
-
-        $result = $provider->getGeocodedData($ip);
+        $provider = new MaxMindBinaryProvider($this->binaryFile);
+        $result   = $provider->getGeocodedData($ip);
 
         $this->assertInternalType('array', $result);
 
@@ -84,9 +87,7 @@ public function testFindLocationByIp($ip, $expectedCity, $expectedCountry)
 
     public function testGetName()
     {
-        $binaryFile = __DIR__.'/fixtures/GeoLiteCity.dat';
-
-        $provider = new MaxMindBinaryProvider($binaryFile);
+        $provider = new MaxMindBinaryProvider($this->binaryFile);
 
         $this->assertEquals('maxmind_binary', $provider->getName());
     }
@@ -97,9 +98,7 @@ public function testGetName()
      */
     public function testThrowIfIpAddressCouldNotBeLocated()
     {
-        $binaryFile = __DIR__.'/fixtures/GeoLiteCity.dat';
-
-        $provider = new MaxMindBinaryProvider($binaryFile);
+        $provider = new MaxMindBinaryProvider($this->binaryFile);
 
         $provider->getGeocodedData('127.0.0.1');
     }
@@ -110,9 +109,7 @@ public function testThrowIfIpAddressCouldNotBeLocated()
      */
     public function testThrowIfInvalidIpAddressGiven()
     {
-        $binaryFile = __DIR__.'/fixtures/GeoLiteCity.dat';
-
-        $provider = new MaxMindBinaryProvider($binaryFile);
+        $provider = new MaxMindBinaryProvider($this->binaryFile);
 
         $provider->getGeocodedData('invalidIp');
     }
@@ -123,11 +120,8 @@ public function testThrowIfInvalidIpAddressGiven()
      */
     public function testThrowOnReversedDataMethodUsage()
     {
-        $binaryFile = __DIR__.'/fixtures/GeoLiteCity.dat';
-
-        $provider = new MaxMindBinaryProvider($binaryFile);
+        $provider = new MaxMindBinaryProvider($this->binaryFile);
 
         $provider->getReversedData(array());
     }
-    
-}
+}